##// END OF EJS Templates
rebase: clear updatestate during rebase --abort in more cases...
rebase: clear updatestate during rebase --abort in more cases Previously, rebase --abort would only call update if you were on a node that had already been rebased. This meant that if the rebase failed during the rebase of the first commit, the working copy would be left dirty (with a .hg/updatestate file) and rebase --abort would not have update to clean it up. The fix is to also perform an update if you're still on the target node or on the original working copy node (since the working copy may be dirty, we still need to do the update). We don't want to perform an update in all cases though because of issue4009. A subsequent patch makes this case much more common, since it causes the entire rebase transaction to rollback during unexpected exceptions. This causes the existing test-rebase-abort.t to cover this case.

File last commit:

r19617:ba89c387 default
r31222:56d3e0b4 default
Show More
9diff.rc
7 lines | 192 B | text/x-stsrc | TextLexer
Steven Stallion
plan9: finalize documentation for next release
r16442 # The 9diff extdiff command generates diff(1) compatible output
# suitable for use with the plumber(4).
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 [extensions]
extdiff =
[extdiff]
Jeff Sickel
hgrc.d: separate namespace for mercurial scripts 9diff and 9mail
r19617 9diff = /bin/mercurial/9diff -cm $parent $child $root