Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge5.out @ 916:fe094cca9915

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add bash_completion to contrib Contributed by "Alexis S. L. Carvalho" <alexis@cecm.usp.br> Attached is a file that implements bash completion for hg. Just reading it from your .bashrc should be enough to use it - I think: I'm using the /etc/bash_completion from debian and I'm not sure whether it sets some important option. It gets the list of commands, aliases and options from the output of hg help and then adds some specific stuff - e.g. completing update with tags; pull and push with path aliases and directories, etc.
author mpm@selenic.com
date Tue, 16 Aug 2005 14:17:27 -0800
parents 9c918287d10b
children 5a034646e472
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset
1 + hg init
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset
2 + hg add a b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset
3 + hg commit -m commit #0 -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset
4 + hg commit -mcomment #1 -d 0 0
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset
5 + hg update 0
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset
6 + hg commit -A -mcomment #2 -d 0 0
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
7 removing b
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset
8 + hg update 1
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset
9 this update spans a branch affecting the following files:
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 415
diff changeset
10 b
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset
11 aborting update spanning branches!
819
77e121a0d870 Update output for test-merge5.
Bryan O'Sullivan <bos@serpentine.com>
parents: 814
diff changeset
12 (use update -m to merge across branches or -C to lose changes)