tests/test-merge5.out
author mpm@selenic.com
Tue, 28 Jun 2005 02:03:25 -0800
changeset 501 7ea1c88792bf
parent 415 c2b9502a4e96
child 616 d45d1c90032e
permissions -rw-r--r--
Better messages for rollback and undo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Better messages for rollback and undo manifest hash: 22eeb8848b0e07e1f23a896b03c37f7d6f4bd82d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSBtywK+sNU5EO8RAhNEAJ9MGJxgZjIKegh1TA7++wGbAzkovACgqL3I k1ii4X5PEWEDcoyOp0VqJn4= =wzlT -----END PGP SIGNATURE-----

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b22
+ hg commit '-tcomment #1' -d '0 0' -u user
+ hg update 0
+ rm b
+ hg commit -A '-tcomment #2' -d '0 0' -u user
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0