view tests/test-merge2.out @ 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-----

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ rm b
+ hg update 0
+ echo This is file b2
+ hg add b
+ hg commit -t 'commit #2' -d '0 0' -u user
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ rm b
+ hg update 0
+ echo This is file b2
+ hg commit -A -t 'commit #2' -d '0 0' -u user
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ rm b
+ hg remove b
+ hg update 0
+ echo This is file b2
+ hg commit -A -t 'commit #2' -d '0 0' -u user
+ cd ..
+ /bin/rm -rf t