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>
Mon, 16 Apr 2007 20:17:39 -0300
changeset 4359 2e3c54fb79a3
parent 3320 b16456909a0a
permissions -rw-r--r--
actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header
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








3320






b16456909a0a
merge: various tidying



Matt Mackall <mpm@selenic.com>


parents: 
3122

diff
changeset




    43


 overwrite True partial False













b16456909a0a
merge: various tidying



Matt Mackall <mpm@selenic.com>


parents: 
3122

diff
changeset




    44


 ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8








3122






2ef0b3aae186
merge: simplify actions with helper function



Matt Mackall <mpm@selenic.com>


parents: 
3111

diff
changeset




    45


 side2: remote deleted -> r













2ef0b3aae186
merge: simplify actions with helper function



Matt Mackall <mpm@selenic.com>


parents: 
3111

diff
changeset




    46


 side1: remote deleted -> r













2ef0b3aae186
merge: simplify actions with helper function



Matt Mackall <mpm@selenic.com>


parents: 
3111

diff
changeset




    47


 main: remote created -> g








1236






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