Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-revert.out @ 4359:2e3c54fb79a3
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
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | da6b14877195 |
children | bfd73b567b3d |
line wrap: on
line source
%% should show b unknown ? b %% should show b unknown and c modified M c ? b %% should show b added and c modified M c A b %% should show a removed, b added and c modified M c A b R a %% should show b added, copy saved, and c modified M c A b %% should show b unknown, and c modified M c ? b %% should show unknown: b ? b %% should show a b c e a b c e %% should verbosely save backup to e.orig saving current version of e as e.orig reverting e resolving manifests getting e %% should say no changes needed no changes needed to a %% should say file not managed file not managed: q %% should say file not found notfound: No such file in rev 095eacd0c0d7 A z ? b ? e.orig %% should add a, forget z adding a forgetting z %% should forget a forgetting a %% should silently add a A a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved reverting c %% should print non-executable non-executable reverting c %% should print executable executable %% issue 241 adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail - no arguments abort: no files or directories specified; use --all to revert the whole repo % should succeed reverting a %% issue332 adding b/b reverting b/b forgetting newdir/newfile reverting b/b