Mercurial Mercurial > mercurial / 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-update-reverse.out
author Paul Moore <p.f.moore@gmail.com>
Tue, 01 Jul 2008 17:59:31 +0100
changeset 6805 482581431dcd
parent 6336 4b0c9c674707
child 8734 60fa3371aa75
permissions -rw-r--r--
Sort removes first when applying updates (fixes issues 750 and 912) This change ensures that removes happen first in applyupdates(). This avoids issues where we try to make a case-only rename of a file on a case insensitive system. Without this patch, the add of the new name happens before the remove of the old one - which results in the file not existing, as the two names are effectively the same. With the patch, the old name gets removed then the new one gets added, which is always safe.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset 
     1
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     2
 
Main should be gone
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     3
 
a
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 3314
diff changeset 
     4
 
created new head
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset 
     5
 
changeset:   3:ded32b0db104
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     6
 
tag:         tip
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     7
 
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: 1922
diff changeset 
     8
 
date:        Mon Jan 12 13:46:40 1970 +0000
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     9
 
summary:     Added side2
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
    10
 







1933






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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1922

diff
changeset




    11


changeset:   2:92a816cea698












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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1922

diff
changeset




    12


parent:      0:537353581d3d







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    13


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: 
1922

diff
changeset




    14


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







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    15


summary:     Added side1












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    16









1933






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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1922

diff
changeset




    17


changeset:   1:221226fb2bd8







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    18


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: 
1922

diff
changeset




    19


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







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    20


summary:     Added main












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    21









1933






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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1922

diff
changeset




    22


changeset:   0:537353581d3d







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    23


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: 
1922

diff
changeset




    24


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







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    25


summary:     Added a












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    26














67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    27


Should have two heads, side2 and main







1933






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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1922

diff
changeset




    28


changeset:   3:ded32b0db104







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    29


tag:         tip












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    30


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: 
1922

diff
changeset




    31


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







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    32


summary:     Added side2












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    33









1933






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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1922

diff
changeset




    34


changeset:   1:221226fb2bd8







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    35


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: 
1922

diff
changeset




    36


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







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    37


summary:     Added main












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    38














67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    39


Should show a side1 side2












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    40


a












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    41


side1












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    42


side2












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    43


resolving manifests







3314






b16456909a0a
merge: various tidying



Matt Mackall <mpm@selenic.com>


parents: 
3121

diff
changeset




    44


 overwrite True partial False












b16456909a0a
merge: various tidying



Matt Mackall <mpm@selenic.com>


parents: 
3121

diff
changeset




    45


 ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8







3121






2ef0b3aae186
merge: simplify actions with helper function



Matt Mackall <mpm@selenic.com>


parents: 
3110

diff
changeset




    46


 side2: remote deleted -> r












2ef0b3aae186
merge: simplify actions with helper function



Matt Mackall <mpm@selenic.com>


parents: 
3110

diff
changeset




    47


 side1: remote deleted -> r












2ef0b3aae186
merge: simplify actions with helper function



Matt Mackall <mpm@selenic.com>


parents: 
3110

diff
changeset




    48


 main: remote created -> g







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    49


removing side1












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    50


removing side2







6805






482581431dcd
Sort removes first when applying updates (fixes issues 750 and 912)



Paul Moore <p.f.moore@gmail.com>


parents: 
6336

diff
changeset




    51


getting main







1922






6d50d6189269
ui: output the number of file updated/merged/removed/... on update



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


parents: 
1443

diff
changeset




    52


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







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    53


Should only show a main












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    54


a












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    55


main














mercurial