annotate tests/test-conflict @ 499:81c563a254be
Add exception class for repository errors
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add exception class for repository errors
This gives friendlier errors for repo exceptions
manifest hash:
f3bef1ddb0c3911b9866ebdafa1fe72df48c8ecd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwRCfywK+sNU5EO8RAg7fAJ9PMka8pJCy7mMTqFFJ5aQFemHpxwCfezPR
cZRAXmbWTTI+/WnVFDjpfM0=
=8crk
-----END PGP SIGNATURE-----
| author |
mpm@selenic.com |
| date |
Tue, 28 Jun 2005 00:55:59 -0800 |
| parents |
ee4c80d294e5 |
| 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
|
