equal
deleted
inserted
replaced
425 |
425 |
426 def abort(repo, originalwd, target, state): |
426 def abort(repo, originalwd, target, state): |
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 "not stripping\n")) |
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) |
434 rebased = filter(lambda x: x > -1, state.values()) |
434 rebased = filter(lambda x: x > -1, state.values()) |
435 if rebased: |
435 if rebased: |