Mercurial > hg
annotate tests/test-convert-svn-branches.out @ 10274:04207f5e7344 stable
mq: Do not translate import message that are appended to commits.
We should not translate the "imported patch" message. The translated message
confuses the detection whether the user has not updated the commit message yet.
We try to avoid to translate generated commit messages.
author | David Soria Parra <dsp@php.net> |
---|---|
date | Wed, 20 Jan 2010 23:23:18 +0100 |
parents | d80a251baf9a |
children | 45885e8f5704 |
rev | line source |
---|---|
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 % convert trunk and branches |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 initializing destination A-hg repository |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 scanning source... |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 sorting... |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 converting... |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
6 10 init projA |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
7 9 hello |
8884
8b603c7c808e
convert/svn: remove dead code from entry deletion code path
Patrick Mezard <pmezard@gmail.com>
parents:
8377
diff
changeset
|
8 8 branch trunk, remove c and dir |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
9 7 change a |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
10 6 change b |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
11 5 move and update c |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
12 4 move and update c |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
13 3 change b again |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
14 2 move to old2 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
15 1 move back to old |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
16 0 last change to a |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
17 % convert again |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
18 scanning source... |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
19 sorting... |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
20 converting... |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
21 0 branch trunk@1 into old3 |
8377
29f4f0d66cd5
convert: adding branchmap functionality to convert extension
Michael J. Pedersen <m.pedersen@icelus.org>
parents:
7476
diff
changeset
|
22 o branch=newbranch 11 branch trunk@1 into old3 files: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
23 | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
24 | o branch= 10 last change to a files: a |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
25 | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
26 | | o branch=old 9 move back to old files: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
27 | | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
28 | | o branch=old2 8 move to old2 files: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
29 | | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
30 | | o branch=old 7 change b again files: b |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
31 | | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
32 | o | branch= 6 move and update c files: b |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
33 | | | |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
34 | | o branch=old 5 move and update c files: c |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
35 | | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
36 | | o branch=old 4 change b files: b |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
37 | | | |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
38 | o | branch= 3 change a files: a |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
39 | | | |
8884
8b603c7c808e
convert/svn: remove dead code from entry deletion code path
Patrick Mezard <pmezard@gmail.com>
parents:
8377
diff
changeset
|
40 | | o branch=old 2 branch trunk, remove c and dir files: c |
8b603c7c808e
convert/svn: remove dead code from entry deletion code path
Patrick Mezard <pmezard@gmail.com>
parents:
8377
diff
changeset
|
41 | |/ |
8b603c7c808e
convert/svn: remove dead code from entry deletion code path
Patrick Mezard <pmezard@gmail.com>
parents:
8377
diff
changeset
|
42 | o branch= 1 hello files: a b c dir/e |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
43 |/ |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
44 o branch= 0 init projA files: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
45 |
8377
29f4f0d66cd5
convert: adding branchmap functionality to convert extension
Michael J. Pedersen <m.pedersen@icelus.org>
parents:
7476
diff
changeset
|
46 newbranch 11: |
6631
a2b13cac0922
Active branches fix (issue1104)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6546
diff
changeset
|
47 default 10: |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
48 old 9: |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
49 old2 8: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
50 tip |
9587
d80a251baf9a
convert/svn: better error when hg cannot call itself (issue1838)
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
51 % test hg failing to call itself |
d80a251baf9a
convert/svn: better error when hg cannot call itself (issue1838)
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
52 initializing destination B-hg repository |
d80a251baf9a
convert/svn: better error when hg cannot call itself (issue1838)
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
53 abort: Mercurial failed to run itself, check hg executable is in PATH |