annotate tests/test-conflict @ 388:398737777644
Fixed tests for displaying tags in hg history and hg parents.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fixed tests for displaying tags in hg history and hg parents.
manifest hash: 1ff138f68590e11a20e1f375c0c7293bdfb9f1fb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCsp/XW7P1GVgWeRoRAtS1AJ90tbAlt89jZr//nYMEgoVv2UL6GwCgih7L
yFwVR4cWpSGyrl0zvYM3AiU=
=6OjG
-----END PGP SIGNATURE-----
| author |
Thomas Arendsen Hein <thomas@intevation.de> |
| date |
Fri, 17 Jun 2005 11:03:03 +0100 |
| parents |
f69a5d2d4fe1 |
| children |
ee4c80d294e5 |
| rev |
line source |
|
346
|
1 #!/bin/bash
|
|
|
2
|
|
|
3 set -x
|
|
|
4 hg init
|
|
|
5 echo "nothing" > a
|
|
|
6 hg add a
|
|
|
7 hg commit -t ancestor -u test -d "0 0"
|
|
|
8 echo "something" > a
|
|
|
9 hg commit -t branch1 -u test -d "0 0"
|
|
|
10 hg co 0
|
|
|
11 echo "something else" > a
|
|
|
12 hg commit -t branch2 -u test -d "0 0"
|
|
|
13 export HGMERGE=merge
|
|
|
14 hg -d up -m 1
|
|
|
15 hg id
|
|
|
16 cat a | grep -v ">>>" | grep -v "<<<"
|
|
|
17 hg status
|
