view tests/test-merge5.out @ 493:30752b14f759

Make show_changeset show added/deleted files only in debug mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make show_changeset show added/deleted files only in debug mode. This was necessary due to performance reasons. manifest hash: 35af5e8ff88a8706406fc8c42251ada79c7c9549 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCwOUkW7P1GVgWeRoRAvB5AKCJ9x/P3XOJVlQnCoh8cblnye+9RgCgkXLW 7Bt8/5yhPnsejYIGUMnppgo= =DNsf -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 28 Jun 2005 06:50:28 +0100
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