view tests/test-merge5.out @ 700:d01b93efecd6

Removed extra spaces for default parameters according to PEP8. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed extra spaces for default parameters according to PEP8. manifest hash: 0f6bcc95adf406c8f6dafd92b7c7d3523b6dfe2c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1oNhW7P1GVgWeRoRAn76AJ4m8rFUeeUDRC0qVEmjjmPClmAFsQCdE3rN Juv2dSoGteRm0DBXz7xnF4c= =PMki -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 16:23:13 +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