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-update-reverse.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 20 May 2006 15:34:19 -0300
changeset 2328 f789602ba840
parent 2175 b2ae81a7df29
child 2822 30f59f4a327e
permissions -rw-r--r--
hgweb.manifest: revno of manifest and changelog aren't always the same In the v4l-dvb repo, the manifest revno and the changelog revno are not in sync. This happened because the same patch was applied to the same revision in two different branches, resulting in the same manifest text, with the same parents and so the first revision was reused. Since hgweb.manifest was assuming the revnos of the manifest and of the changelog were always the same, clicking on manifest -> bz2 in the v4l-dvb site would download the wrong revision. Use the linkrev to go from manifest revision to changelog revision. This still won't be perfect since the page will still talk about "manifest for changeset XYZ", where XYZ was the first changeset to have this manifest, which is not necessarily the same changeset that the user clicked to get to this page - but at least the contents will be the same.
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
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 
     4
 
changeset:   3:ded32b0db104
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     5
 
tag:         tip
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     6
 
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 
     7
 
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 
     8
 
summary:     Added side2
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     9
 







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




    10


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




    11


parent:      0:537353581d3d








1236






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



mpm@selenic.com


parents: 

diff
changeset




    12


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




    13


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




    14


summary:     Added side1













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



mpm@selenic.com


parents: 

diff
changeset




    15









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




    16


changeset:   1:221226fb2bd8








1236






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



mpm@selenic.com


parents: 

diff
changeset




    17


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




    18


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




    19


summary:     Added main













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



mpm@selenic.com


parents: 

diff
changeset




    20









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




    21


changeset:   0:537353581d3d








1236






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



mpm@selenic.com


parents: 

diff
changeset




    22


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




    23


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




    24


summary:     Added a













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



mpm@selenic.com


parents: 

diff
changeset




    25














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



mpm@selenic.com


parents: 

diff
changeset




    26


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




    27


changeset:   3:ded32b0db104








1236






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



mpm@selenic.com


parents: 

diff
changeset




    28


tag:         tip













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



mpm@selenic.com


parents: 

diff
changeset




    29


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




    30


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




    31


summary:     Added side2













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



mpm@selenic.com


parents: 

diff
changeset




    32









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




    33


changeset:   1:221226fb2bd8








1236






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



mpm@selenic.com


parents: 

diff
changeset




    34


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




    35


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




    36


summary:     Added main













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



mpm@selenic.com


parents: 

diff
changeset




    37














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



mpm@selenic.com


parents: 

diff
changeset




    38


Should show a side1 side2













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



mpm@selenic.com


parents: 

diff
changeset




    39


a













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



mpm@selenic.com


parents: 

diff
changeset




    40


side1













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



mpm@selenic.com


parents: 

diff
changeset




    41


side2













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



mpm@selenic.com


parents: 

diff
changeset




    42


resolving manifests













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



mpm@selenic.com


parents: 

diff
changeset




    43


 force 1 allow None moddirstate True linear False













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



mpm@selenic.com


parents: 

diff
changeset




    44


 ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae













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



mpm@selenic.com


parents: 

diff
changeset




    45


remote deleted side2, clobbering













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



mpm@selenic.com


parents: 

diff
changeset




    46


remote deleted side1, clobbering













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



mpm@selenic.com


parents: 

diff
changeset




    47


remote created main













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



mpm@selenic.com


parents: 

diff
changeset




    48


getting main













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








1922






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



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


parents: 
1443

diff
changeset




    51


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




    52


Should only show a main













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



mpm@selenic.com


parents: 

diff
changeset




    53


a













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



mpm@selenic.com


parents: 

diff
changeset




    54


main















mercurial-crew-with-dirclash