tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 26 Jun 2005 11:33:16 +0100
changeset 475 ab53998b9dcd
parent 415 c2b9502a4e96
child 616 d45d1c90032e
permissions -rw-r--r--
Fixed diff generation in hgeditor if a list of files is given to hg commit. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed diff generation in hgeditor if a list of files is given to hg commit. manifest hash: 3eadc3637963778a35000fa75f229eb6b44ffc3d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvoRsW7P1GVgWeRoRArNpAJ4p5NQBkv1X+eHwWU7+aqoGkcqwlACgklk2 e/vr9qiIPcOVrbYViapZD9E= =3fRb -----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