##// END OF EJS Templates
Fix typo in merging new files...
Fix typo in merging new files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix typo in merging new files manifest hash: 4a6fee1e54c5c465a74f4d756a1ac549b15fdb2f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuOvVywK+sNU5EO8RArovAJ4ua9EhnO8wWfKRZ36E6F4Wrv5JPACghCXn sHr/TSkxdy48OUVkhTbhhhQ= =poww -----END PGP SIGNATURE-----

File last commit:

r415:c2b9502a default
r428:183c87d4 default
Show More
test-merge5.out
18 lines | 432 B | text/plain | TextLexer
+ 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