Show More
@@ -427,7 +427,7 b' def abort(repo, originalwd, target, stat' | |||||
427 | 'Restore the repository to its original state' |
|
427 | 'Restore the repository to its original state' | |
428 | if set(repo.changelog.descendants(target)) - set(state.values()): |
|
428 | if set(repo.changelog.descendants(target)) - set(state.values()): | |
429 | repo.ui.warn(_("warning: new changesets detected on target branch, " |
|
429 | repo.ui.warn(_("warning: new changesets detected on target branch, " | |
430 |
" |
|
430 | "can't abort\n")) | |
431 | else: |
|
431 | else: | |
432 | # Strip from the first rebased revision |
|
432 | # Strip from the first rebased revision | |
433 | merge.update(repo, repo[originalwd].rev(), False, True, False) |
|
433 | merge.update(repo, repo[originalwd].rev(), False, True, False) |
General Comments 0
You need to be logged in to leave comments.
Login now