Mercurial > hg
annotate tests/test-convert-darcs.out @ 12515:b6a784e39ad4
tests: unify test-convert-bzr-ghosts
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 26 Sep 2010 14:36:49 -0500 |
parents | 84ceedcfeb6a |
children | 89df79b3c011 |
rev | line source |
---|---|
12393
84ceedcfeb6a
convert/darcs: improve unsupported format detection (issue2172)
Patrick Mezard <pmezard@gmail.com>
parents:
12252
diff
changeset
|
1 % try converting darcs1 repository |
84ceedcfeb6a
convert/darcs: improve unsupported format detection (issue2172)
Patrick Mezard <pmezard@gmail.com>
parents:
12252
diff
changeset
|
2 darcs-1.0 repository format is unsupported, please upgrade |
5413 | 3 % initialize darcs repo |
4 Finished recording patch 'p0' | |
5 % branch and update | |
6 Finished recording patch 'p1.1' | |
7 % update source | |
8 Finished recording patch 'p1.2' | |
9 % merge branch | |
9326
b236f34ec1e9
Fix failing darcs test
Bryan O'Sullivan <bos@serpentine.com>
parents:
5667
diff
changeset
|
10 Backing up ./a(-darcs-backup0) |
5413 | 11 We have conflicts in the following files: |
12 ./a | |
13 Finished pulling and applying. | |
14 Finished recording patch 'p2' | |
9526
457a30ed8ffb
convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents:
9326
diff
changeset
|
15 % test file and directory move |
457a30ed8ffb
convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents:
9326
diff
changeset
|
16 Finished recording patch 'p3' |
12252
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
17 % test utf-8 commit message and author |
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
18 Finished recording patch 'p4: desc ñ' |
5413 | 19 initializing destination darcs-repo-hg repository |
20 scanning source... | |
21 sorting... | |
22 converting... | |
12252
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
23 5 p0 |
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
24 4 p1.2 |
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
25 3 p1.1 |
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
26 2 p2 |
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
27 1 p3 |
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
28 0 p4: desc ? |
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
29 o 5 "p4: desc ñ" (author ñ) files: g |
9526
457a30ed8ffb
convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents:
9326
diff
changeset
|
30 | |
12252
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
31 o 4 "p3" (test@example.org) files: dir/d dir/d2 dir2/d f ff |
5413 | 32 | |
12252
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
33 o 3 "p2" (test@example.org) files: a dir/d dir/d2 f |
5413 | 34 | |
12252
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
35 o 2 "p1.1" (test@example.org) files: |
5413 | 36 | |
12252
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
37 o 1 "p1.2" (test@example.org) files: a b |
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
38 | |
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
39 o 0 "p0" (test@example.org) files: a |
5413 | 40 |
41 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a | |
42 1e88685f5ddec574a34c70af492f95b6debc8741 644 b | |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
9527
diff
changeset
|
43 37406831adc447ec2385014019599dfec953c806 644 dir2/d |
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
9527
diff
changeset
|
44 b783a337463792a5c7d548ad85a7d3253c16ba8c 644 ff |
12252
4481f8a93c7a
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Brodie Rao <brodie@bitheap.org>
parents:
10490
diff
changeset
|
45 0973eb1b2ecc4de7fafe7447ce1b7462108b4848 644 g |