view tests/test-merge5.out @ 702:a1099c50a622

Fix default values and add interactive setting to [ui] section of hgrc docs. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix default values and add interactive setting to [ui] section of hgrc docs. manifest hash: 211eea218970b45b2a0cdc822d5b6610a89ffbd7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pE8W7P1GVgWeRoRAof+AJ4mpm3DCRqh+9To3Gn4bpC7UGcTnQCfVIWN 5VT9pqdP6/06tH8nYgW55f4= =uNyy -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 17:22:20 +0100
parents d45d1c90032e
children 7e4843b7efd2
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:
 b
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0