view tests/test-merge5.out @ 574:af7e21f3b2d9

Update test-diffdir output -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update test-diffdir output manifest hash: cd0fb3a3708897fe959852c48de1804fb0b74bf4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxwmcywK+sNU5EO8RAlRCAJ9SBrMQLSRVY1j3V1YO25dGbIN18QCfTbHJ 6/4+xEBX2j3VxUf1g3ayce8= =kcDR -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 13:39:40 -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