Mercurial > hg > pyhgsh

annotate tests/test-conflict @ 547:4fc63e22b1fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 1742d7ba2093dc643b57e45167cb2d794212cbb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV 3WexPDsJldMAr3V5vc9eowA= =pJYu -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 23:28:16 -0800
parents ee4c80d294e5 3d4d5f2aba9a
children eb46971fc57f
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 set -x
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
4 hg init
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
5 echo "nothing" > a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
6 hg add a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
7 hg commit -t ancestor -u test -d "0 0"
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
8 echo "something" > a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
9 hg commit -t branch1 -u test -d "0 0"
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
10 hg co 0
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
11 echo "something else" > a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
12 hg commit -t branch2 -u test -d "0 0"
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
13 export HGMERGE=merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
14 hg -d up -m 1
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
15 hg id
392
ee4c80d294e5 Tidy up conflict and pull tests
mpm@selenic.com
parents: 346
diff changeset
16 grep -Ev ">>>|<<<" a
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
17 hg status