Show More
@@ -2750,7 +2750,7 b' def amend(ui, repo, commitfunc, old, ext' | |||||
2750 | base = old.p1() |
|
2750 | base = old.p1() | |
2751 |
|
2751 | |||
2752 | newid = None |
|
2752 | newid = None | |
2753 |
with repo.wlock(), repo.lock(), repo.transaction('amend') |
|
2753 | with repo.wlock(), repo.lock(), repo.transaction('amend'): | |
2754 | # See if we got a message from -m or -l, if not, open the editor |
|
2754 | # See if we got a message from -m or -l, if not, open the editor | |
2755 | # with the message of the changeset to amend |
|
2755 | # with the message of the changeset to amend | |
2756 | message = logmessage(ui, opts) |
|
2756 | message = logmessage(ui, opts) | |
@@ -2768,7 +2768,6 b' def amend(ui, repo, commitfunc, old, ext' | |||||
2768 | node = commit(ui, repo, commitfunc, pats, opts) |
|
2768 | node = commit(ui, repo, commitfunc, pats, opts) | |
2769 | finally: |
|
2769 | finally: | |
2770 | repo._bookmarks.active = activebookmark |
|
2770 | repo._bookmarks.active = activebookmark | |
2771 | repo._bookmarks.recordchange(tr) |
|
|||
2772 | ui.callhooks = True |
|
2771 | ui.callhooks = True | |
2773 | ctx = repo[node] |
|
2772 | ctx = repo[node] | |
2774 |
|
2773 |
General Comments 0
You need to be logged in to leave comments.
Login now