##// END OF EJS Templates
amend: move createmarkers evaluation earlier...
Pierre-Yves David -
r25709:c8737317 default
parent child Browse files
Show More
@@ -2454,6 +2454,7 b' def amend(ui, repo, commitfunc, old, ext'
2454
2454
2455 ui.note(_('amending changeset %s\n') % old)
2455 ui.note(_('amending changeset %s\n') % old)
2456 base = old.p1()
2456 base = old.p1()
2457 createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
2457
2458
2458 wlock = dsguard = lock = newid = None
2459 wlock = dsguard = lock = newid = None
2459 try:
2460 try:
@@ -2619,7 +2620,6 b' def amend(ui, repo, commitfunc, old, ext'
2619 marks[bm] = newid
2620 marks[bm] = newid
2620 marks.recordchange(tr)
2621 marks.recordchange(tr)
2621 #commit the whole amend process
2622 #commit the whole amend process
2622 createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
2623 if createmarkers and newid != old.node():
2623 if createmarkers and newid != old.node():
2624 # mark the new changeset as successor of the rewritten one
2624 # mark the new changeset as successor of the rewritten one
2625 new = repo[newid]
2625 new = repo[newid]
General Comments 0
You need to be logged in to leave comments. Login now