Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-conflict @ 2049:f70952384ae7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make completion for debugindex<tab><tab> show debugindexdot, too. The special handling for commands with names that are substrings of other commands (e.g. with st and strip) wasn't used with debug commands before.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 05 Apr 2006 19:07:50 +0200
parents 7544700fd931
children e506c14382fd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 392
diff changeset
1 #!/bin/sh
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
2
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
3 hg init
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
4 echo "nothing" > a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
5 hg add a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1925
diff changeset
6 hg commit -m ancestor -d "1000000 0"
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
7 echo "something" > a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1925
diff changeset
8 hg commit -m branch1 -d "1000000 0"
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
9 hg co 0
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
10 echo "something else" > a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1925
diff changeset
11 hg commit -m branch2 -d "1000000 0"
800
ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
12 HGMERGE=merge; export HGMERGE
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
13 hg up -m 1
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
14 hg id
1925
c71420b186b0 small solaris portability fixes from John Levon <levon@movementarian.org>
Peter van Dijk <peter@dataloss.nl>
parents: 814
diff changeset
15 egrep -v ">>>|<<<" a
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
16 hg status