Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-tag.out
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 4913 f0c25ed40ec6
permissions -rw-r--r--
merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1662
diff changeset 
     1
 
changeset:   0:0acdaf898367
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1662
diff changeset 
     4
 
date:        Mon Jan 12 13:46:40 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
 







2974






eef469259745
tag: shorten hash in default commit message



Matt Mackall <mpm@selenic.com>


parents: 
2641

diff
changeset




     7


changeset:   1:3ecf002a1c57








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








1933






7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1662

diff
changeset




    10


date:        Mon Jan 12 13:46:40 1970 +0000








2974






eef469259745
tag: shorten hash in default commit message



Matt Mackall <mpm@selenic.com>


parents: 
2641

diff
changeset




    11


summary:     Added tag bleah for changeset 0acdaf898367








401






af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>



mpm@selenic.com


parents: 

diff
changeset




    12









1933






7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1662

diff
changeset




    13


changeset:   0:0acdaf898367








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








1933






7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1662

diff
changeset




    16


date:        Mon Jan 12 13:46:40 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








1933






7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1662

diff
changeset




    25


0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah













7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1662

diff
changeset




    26


0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0








2974






eef469259745
tag: shorten hash in default commit message



Matt Mackall <mpm@selenic.com>


parents: 
2641

diff
changeset




    27


3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1








2641






46182568b4ce
change 'hg tag' to tag the parent rev instead of tip



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2036

diff
changeset




    28


0 files updated, 0 files merged, 1 files removed, 0 files unresolved













46182568b4ce
change 'hg tag' to tag the parent rev instead of tip



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2036

diff
changeset




    29


0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar








2974






eef469259745
tag: shorten hash in default commit message



Matt Mackall <mpm@selenic.com>


parents: 
2641

diff
changeset




    30


3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1








1561






9c6d0abdb94e
disallow '\n' and '\r' in tag names



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
1235

diff
changeset




    31


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




    32


abort: ':' cannot be used in a tag name








4913






f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)



Bryan O'Sullivan <bos@serpentine.com>


parents: 
2974

diff
changeset




    33


% issue 601













f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)



Bryan O'Sullivan <bos@serpentine.com>


parents: 
2974

diff
changeset




    34


3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah13ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1













f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)



Bryan O'Sullivan <bos@serpentine.com>


parents: 
2974

diff
changeset




    35


f68b039e72eacbb2e68b0543e1f6e50990aa2bb5 localnewline













f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)



Bryan O'Sullivan <bos@serpentine.com>


parents: 
2974

diff
changeset




    36


0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar













f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)



Bryan O'Sullivan <bos@serpentine.com>


parents: 
2974

diff
changeset




    37


6ae703d793c8b1f097116869275ecd97b2977a2b newline















mercurial-crew-with-dirclash