annotate tests/test-simple-update.out @ 9827:4fe9ca519637

mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 11 Nov 2009 18:31:42 +0100
parents a3d73b3e1f8a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
7 updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
8 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
9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
10 pulling from ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
11 searching for changes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12 adding changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
13 adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
14 adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
15 added 1 changesets with 1 changes to 1 files
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
16 (run 'hg update' to get a working copy)
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
20 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 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
22 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
23 foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
24 bar
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 2955
diff changeset
25 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo