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-simple-update.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 16 Apr 2007 20:17:39 -0300
changeset 4359 2e3c54fb79a3
parent 2955 9d1c3529ebbc
child 5405 8feb33c2d153
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:
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset 
     1
 
adding foo
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     2
 
checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     3
 
checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     4
 
crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     5
 
checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     6
 
1 files, 1 changesets, 1 total revisions
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset 
     7
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset 
     8
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset 
     9
 
pulling from ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    10
 
searching for changes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    11
 
adding changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    12
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset 
    13
 
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset 
    14
 
added 1 changesets with 1 changes to 1 files
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset 
    15
 
(run 'hg update' to get a working copy)
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    16
 
checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    17
 
checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    18
 
crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    19
 
checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    20
 
1 files, 2 changesets, 2 total revisions
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset 
    21
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    22
 
foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    23
 
bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    24
 
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo
mercurial-crew-with-dirclash