##// 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:

r28454:80628698 default
r31222:56d3e0b4 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>.