Mercurial > hg
view contrib/chg/chg.1 @ 31174:842489d18118
tests: fix test-update-branches to remove non-conflicting file
I was clearly very sloppy when I wrote the test case for
experimental.updatecheck=noconflict. The test case that checks that
one can move between commits with a removed file was deleting a file
that was modified between the source and target commits, which
resulted in a "change/delete" conflict. Since that is a conlict, the
update correctly failed. Let's fix the test by removing a file that is
not modified between the two commits.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 06 Mar 2017 23:19:57 -0800 |
parents | 8062869860b8 |
children | 283828850c56 |
line wrap: on
line source
.\" 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>.