Show More
@@ -2619,15 +2619,15 b' def amend(ui, repo, commitfunc, old, ext' | |||||
2619 | (marks, old.hex(), hex(newid))) |
|
2619 | (marks, old.hex(), hex(newid))) | |
2620 | marks[bm] = newid |
|
2620 | marks[bm] = newid | |
2621 | marks.recordchange(tr) |
|
2621 | marks.recordchange(tr) | |
2622 | #commit the whole amend process |
|
2622 | #commit the whole amend process | |
2623 |
if createmarkers |
|
2623 | if createmarkers: | |
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] | |
2626 | obs = [(old, (new,))] |
|
2626 | obs = [(old, (new,))] | |
2627 | if node: |
|
2627 | if node: | |
2628 | obs.append((ctx, ())) |
|
2628 | obs.append((ctx, ())) | |
2629 |
|
2629 | |||
2630 | obsolete.createmarkers(repo, obs) |
|
2630 | obsolete.createmarkers(repo, obs) | |
2631 | tr.close() |
|
2631 | tr.close() | |
2632 | finally: |
|
2632 | finally: | |
2633 | tr.release() |
|
2633 | tr.release() |
General Comments 0
You need to be logged in to leave comments.
Login now