Mercurial > hg
annotate tests/test-convert-authormap.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 | 62154415821f |
children |
rev | line source |
---|---|
7961
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
1 initializing destination new repository |
7962
62154415821f
convert: fix authormap handling of lines without '='
Marti Raudsepp <marti@juffo.org>
parents:
7961
diff
changeset
|
2 Ignoring bad line in author map file authormap.txt: this line is ignored |
7961
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
3 scanning source... |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
4 sorting... |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
5 converting... |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
6 0 foo |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
7 Writing author map file new/.hg/authormap |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
8 0 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
9 user name=Long User Name |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
10 changeset: 0:d89716e88087 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
11 tag: tip |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
12 user: Long User Name |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
13 date: Thu Jan 01 00:00:00 1970 +0000 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
14 summary: foo |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
15 |
7962
62154415821f
convert: fix authormap handling of lines without '='
Marti Raudsepp <marti@juffo.org>
parents:
7961
diff
changeset
|
16 Ignoring bad line in author map file new/.hg/authormap: this line is ignored |
7961
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
17 scanning source... |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
18 sorting... |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
19 converting... |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
20 0 foo |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
21 0 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
22 changeset: 0:d89716e88087 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
23 tag: tip |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
24 user: Long User Name |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
25 date: Thu Jan 01 00:00:00 1970 +0000 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
26 summary: foo |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
27 |