view tests/test-merge5.out @ 520:12b4b5612fe4

Add some TODO items -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add some TODO items manifest hash: d188abf3c84b6ca98279b4bf053ce2844da83a03 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwvKyywK+sNU5EO8RAh9ZAJ9kYA0a/R7XynWqZGGr6JqUvXa37wCfd2a2 F9fCY85bSZgErvdrklP29bQ= =FtlU -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 29 Jun 2005 11:12:50 -0800
parents c2b9502a4e96
children d45d1c90032e
line wrap: on
line source

+ 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