tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 10 Jul 2005 14:06:30 -0800
changeset 659 3662e3d6b690
parent 616 d45d1c90032e
child 749 7e4843b7efd2
permissions -rw-r--r--
Whitespace cleanup -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Whitespace cleanup manifest hash: 7abcbe23247dd5b7dea6fa44fb80d9f909cf6829 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0ZvmywK+sNU5EO8RAhhDAJ0YXOx5B2F/3NjFB+5YcUtkHqVyuQCgnNyp tWbRrjDz/SbKz/tFAsxJDqo= =xB66 -----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:
 b
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0