author | Patrick Mezard <pmezard@gmail.com> |
Wed, 08 Apr 2009 23:17:33 +0200 | |
changeset 8036 | dbcf5d52fcf5 |
parent 7053 | 209ef5f3534c |
child 8045 | e09a2f2ef85d |
permissions | -rw-r--r-- |
7053 | 1 |
% create and rename on the same file in the same step |
2 |
a => b |
|
8036
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
3 |
c => d |
7053 | 4 |
initializing destination source-hg repository |
5 |
scanning source... |
|
6 |
sorting... |
|
7 |
converting... |
|
8036
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
8 |
1 Initial add: a, c |
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
9 |
0 rename a into b, create a, rename c into d |
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
10 |
o 1 "rename a into b, create a, rename c into d" files: a b c d |
7053 | 11 |
| |
8036
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
12 |
o 0 "Initial add: a, c" files: a c |
7053 | 13 |
|
8036
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
14 |
% manifest |
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
15 |
a |
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
16 |
b |
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
17 |
d |
7053 | 18 |
% test --rev option |
19 |
initializing destination source-1-hg repository |
|
20 |
scanning source... |
|
21 |
sorting... |
|
22 |
converting... |
|
8036
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
23 |
0 Initial add: a, c |
dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents:
7053
diff
changeset
|
24 |
o 0 "Initial add: a, c" files: a c |
7053 | 25 |
|
26 |
% merge |
|
27 |
initializing destination source-hg repository |
|
28 |
scanning source... |
|
29 |
sorting... |
|
30 |
converting... |
|
31 |
3 Initial add |
|
32 |
2 Editing a |
|
33 |
1 Editing b |
|
34 |
0 Merged improve branch |
|
35 |
o 3 "Merged improve branch" files: |
|
36 |
|\ |
|
37 |
| o 2 "Editing b" files: b |
|
38 |
| | |
|
39 |
o | 1 "Editing a" files: a |
|
40 |
|/ |
|
41 |
o 0 "Initial add" files: a b |
|
42 |
||
43 |
% symlinks and executable files |
|
44 |
initializing destination source-hg repository |
|
45 |
scanning source... |
|
46 |
sorting... |
|
47 |
converting... |
|
48 |
1 Initial setup |
|
49 |
0 Symlink changed, x bits changed |
|
50 |
% manifest of 0 |
|
51 |
644 altname |
|
52 |
755 * program |
|
53 |
% manifest of tip |
|
54 |
644 altname |
|
55 |
755 * newprog |
|
56 |
644 program |