##// END OF EJS Templates
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.

File last commit:

r28454:80628698 default
r31225:749b057b default
Show More
chg.1
41 lines | 1.2 KiB | application/x-troff | GroffLexer
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH CHG 1 "March 3, 2013"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
chg \- a fast client for Mercurial command server
.SH SYNOPSIS
.B chg
.IR command " [" options "] [" arguments "]..."
.br
.SH DESCRIPTION
The
.B chg
command is the wrapper for
.B hg
command.
It uses the Mercurial command server to reduce start-up overhead.
.SH OPTIONS
This program accepts the same command line syntax as the
.B hg
command. Additionally it accepts the following options.
.TP
.B \-\-kill\-chg\-daemon
Terminate the background command servers.
.SH SEE ALSO
.BR hg (1),
.SH AUTHOR
Written by Yuya Nishihara <yuya@tcha.org>.