comparison tests/test-convert-hg-startrev.out @ 6885:6e253aa04ff7

convert: implement startrev for hg source
author Patrick Mezard <pmezard@gmail.com>
date Wed, 13 Aug 2008 23:31:10 +0200
parents
children bcd364b247ba
comparison
equal deleted inserted replaced
6884:11229144aa01 6885:6e253aa04ff7
1 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
2 merging a and e to e
3 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)
5 % convert from null revision
6 initializing destination empty repository
7 scanning source...
8 sorting...
9 converting...
10 % convert from zero revision
11 initializing destination full repository
12 scanning source...
13 sorting...
14 converting...
15 5 0: add a b
16 4 1: add c
17 3 2: copy e from a, change b
18 2 3: change a
19 1 4: merge 2 and 3, copy d from b
20 0 5: change a
21 o 5 "5: change a" files: a
22 |
23 o 4 "4: merge 2 and 3, copy d from b" files: d e
24 |\
25 | o 3 "3: change a" files: a
26 | |
27 o | 2 "2: copy e from a, change b" files: b e
28 | |
29 o | 1 "1: add c" files: c
30 |/
31 o 0 "0: add a b" files: a b
32
33 % convert from merge parent
34 initializing destination conv1 repository
35 scanning source...
36 sorting...
37 converting...
38 3 1: add c
39 2 2: copy e from a, change b
40 1 4: merge 2 and 3, copy d from b
41 0 5: change a
42 o 3 "5: change a" files: a
43 |
44 o 2 "4: merge 2 and 3, copy d from b" files: a d e
45 |
46 o 1 "2: copy e from a, change b" files: b e
47 |
48 o 0 "1: add c" files: a b c
49
50 % check copy preservation
51 changeset: 2:cb71f8e79b45
52 user: test
53 date: Thu Jan 01 00:00:04 1970 +0000
54 summary: 4: merge 2 and 3, copy d from b
55
56 changeset: 1:3334790240a8
57 user: test
58 date: Thu Jan 01 00:00:02 1970 +0000
59 summary: 2: copy e from a, change b
60
61 % check copy removal on missing parent
62 changeset: 2:cb71f8e79b45
63 user: test
64 date: Thu Jan 01 00:00:04 1970 +0000
65 summary: 4: merge 2 and 3, copy d from b
66
67 a
68 a
69 a
70 b
71 b
72 % convert from merge
73 initializing destination conv4 repository
74 scanning source...
75 sorting...
76 converting...
77 1 4: merge 2 and 3, copy d from b
78 0 5: change a
79 o 1 "5: change a" files: a
80 |
81 o 0 "4: merge 2 and 3, copy d from b" files: a b c d e
82
83 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
84 a
85 a
86 a
87 b
88 b