--- a/hgext/evolve.py Wed Sep 30 23:33:00 2015 +0900
+++ b/hgext/evolve.py Tue Sep 29 15:40:28 2015 -0400
@@ -857,7 +857,7 @@
user = commitopts.get('user') or old.user()
date = commitopts.get('date') or None # old.date()
- extra = dict(commitopts.get('extra', {}))
+ extra = dict(commitopts.get('extra', old.extra()))
extra['branch'] = head.branch()
new = context.memctx(repo,
@@ -943,7 +943,10 @@
'unresolved merge conflicts (see hg help resolve)')
if commitmsg is None:
commitmsg = orig.description()
- extra = {'rebase_source': orig.hex()}
+ extra = dict(orig.extra())
+ if 'branch' in extra:
+ del extra['branch']
+ extra['rebase_source'] = orig.hex()
backup = repo.ui.backupconfig('phases', 'new-commit')
try: