--- a/mercurial/cmdutil.py Wed Feb 03 11:01:11 2016 -0200
+++ b/mercurial/cmdutil.py Wed Feb 03 08:59:46 2016 -0800
@@ -2623,11 +2623,6 @@
message = old.description()
pureextra = extra.copy()
- if 'amend_source' in pureextra:
- del pureextra['amend_source']
- pureoldextra = old.extra()
- if 'amend_source' in pureoldextra:
- del pureoldextra['amend_source']
extra['amend_source'] = old.hex()
new = context.memctx(repo,
@@ -2645,7 +2640,7 @@
and newdesc == old.description()
and user == old.user()
and date == old.date()
- and pureextra == pureoldextra):
+ and pureextra == old.extra()):
# nothing changed. continuing here would create a new node
# anyway because of the amend_source noise.
#