view tests/test-merge5.out @ 513:2ab152e45de4

hg clone: don't try to delete "." -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg clone: don't try to delete "." manifest hash: 7e7bd5375f7729812b7188b7a53287b3c6049823 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZvlywK+sNU5EO8RAjn6AKCaBNWdLSNXIDqQZ3vMcN5ie5ZZaQCfaG37 hAN32PbYoQh8UC88AeOKOk4= =kBOD -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 28 Jun 2005 10:50:13 -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