tests/test-tag.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Thu, 23 Feb 2006 18:10:04 +0100
changeset 1798 d610fe0e6893
parent 1662 2d8dc84c9323
child 1933 7544700fd931
permissions -rw-r--r--
hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
     1
changeset:   0:acb14030fe0a
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
     2
tag:         tip
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
     3
user:        test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
     4
date:        Thu Jan  1 00:00:00 1970 +0000
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
     5
summary:     test
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
     6
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
     7
changeset:   1:863197ef0378
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
     8
tag:         tip
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
     9
user:        test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
    10
date:        Thu Jan  1 00:00:00 1970 +0000
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
    11
summary:     Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
    12
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
    13
changeset:   0:acb14030fe0a
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
    14
tag:         bleah
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
    15
user:        test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
    16
date:        Thu Jan  1 00:00:00 1970 +0000
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
    17
summary:     test
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
    18
1235
5c0bd13bd771 Fix test-tag output for new abort message
mpm@selenic.com
parents: 1234
diff changeset
    19
abort: working copy of .hgtags is changed (please commit .hgtags manually)
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff changeset
    20
failed
1662
2d8dc84c9323 Added missing quote in warning text to tests, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1654
diff changeset
    21
use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead
1654
b7fc961507db deprecate the use of 'hg tag NAME [REV]'
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1596
diff changeset
    22
abort: use only one form to specify the revision
b7fc961507db deprecate the use of 'hg tag NAME [REV]'
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1596
diff changeset
    23
failed
1662
2d8dc84c9323 Added missing quote in warning text to tests, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1654
diff changeset
    24
use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead
1596
41366b7d6709 fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1561
diff changeset
    25
acb14030fe0a21b60322c440ad2d20cf7685a376 bleah
41366b7d6709 fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1561
diff changeset
    26
acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0
41366b7d6709 fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1561
diff changeset
    27
863197ef03781c4fc00276d83eb66c4cb9cd91df bleah1
1561
9c6d0abdb94e disallow '\n' and '\r' in tag names
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1235
diff changeset
    28
abort: '\n' cannot be used in a tag name
9c6d0abdb94e disallow '\n' and '\r' in tag names
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1235
diff changeset
    29
abort: ':' cannot be used in a tag name