##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

rebase: allow aborting if last-message.txt is missing...
rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.
Steven Stallion - - Load All Authors

File last commit:

r16489:cf137319 stable
r31225:749b057b default
Show More
proto
24 lines | 478 B | text/plain | ProtoBufLexer
/ contrib / plan9 / proto
History | Source | Raw |Copy content |Copy permalink
Steven Stallion
plan9: initial support for plan 9 from bell labs...
 r16383 lib - sys sys
mercurial - sys sys
hgrc.d - sys sys
9diff.rc - sys sys
factotum.rc - sys sys
rc - sys sys
bin - sys sys
9diff - sys sys
hg - sys sys
sys - sys sys
lib - sys sys
python - sys sys
lib - sys sys
python2.5 - sys sys
site-packages - sys sys
hgext - sys sys
+ - sys sys
mercurial - sys sys
+ - sys sys
Steven Stallion
plan9: finalize documentation for next release
 r16442 mercurial-VERSION-py2.5.egg-info - sys sys
src - sys sys
cmd - sys sys
Steven Stallion
plan9: add missing source entries to proto
 r16489 hg - sys sys
+ - sys sys