annotate tests/test-conflict @ 392:ee4c80d294e5
Tidy up conflict and pull tests
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Tidy up conflict and pull tests
Fix failure to kill hg serve process and pipeline ordering with set -e
manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg
pI3IH2BvqUlckdLwx3M5jcQ=
=s/QA
-----END PGP SIGNATURE-----
| author |
mpm@selenic.com |
| date |
Fri, 17 Jun 2005 08:50:55 -0800 |
| parents |
f69a5d2d4fe1 |
| children |
3d4d5f2aba9a 4fc63e22b1fe |
| 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
|
|
392
|
16 grep -Ev ">>>|<<<" a
|
|
346
|
17 hg status
|
