Mercurial > evolve
changeset 1967:c5d4e856ad0e
destination: add an XXX about handling destspace in destmerge
This that we hopefully do not forget about this.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Wed, 11 May 2016 16:22:52 +0200 |
parents | e67c526c0a25 |
children | 08cbfeb15a1a |
files | hgext3rd/topic/destination.py |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/destination.py Mon Apr 25 21:24:20 2016 -0700 +++ b/hgext3rd/topic/destination.py Wed May 11 16:22:52 2016 +0200 @@ -11,6 +11,7 @@ def _destmergebranch(orig, repo, action='merge', sourceset=None, onheadcheck=True, destspace=None): + # XXX: take destspace into account p1 = repo['.'] top = p1.topic() if top: