view tests/test-tag.out @ 703:fb6f85ecc863

merge program setting from hgrc wasn't used. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge program setting from hgrc wasn't used. manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd Xr+Tb86zo+xFhHq7YkDvLak= =+BY9 -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 17:28:19 +0100
parents b266e92bcd0b
children 574869103985
line wrap: on
line source

+ hg init
+ echo a
+ hg add a
+ hg commit -t test -u test -d '0 0'
+ hg history
changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     test

+ hg tag -u test -d '0 0' bleah
+ hg history
changeset:   1:863197ef03781c4fc00276d83eb66c4cb9cd91df
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376

changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag:         bleah
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     test

+ echo foo
+ hg tag -u test -d '0 0' bleah2
abort: working copy of .hgtags is changed!
(please commit .hgtags manually)
+ echo failed
failed