--- a/hgext/rebase.py Fri May 09 18:15:02 2014 -0700
+++ b/hgext/rebase.py Thu May 08 16:55:56 2014 -0700
@@ -531,7 +531,8 @@
repo.ui.debug(" detach base %d:%s\n" % (repo[base].rev(), repo[base]))
# When collapsing in-place, the parent is the common ancestor, we
# have to allow merging with it.
- return merge.update(repo, rev, True, True, False, base, collapse)
+ return merge.update(repo, rev, True, True, False, base, collapse,
+ labels=['dest', 'source'])
def nearestrebased(repo, rev, state):
"""return the nearest ancestors of rev in the rebase result"""