1 created new head |
|
2 created new head |
|
3 @ 8 "8: change foo" files: foo |
|
4 | |
|
5 o 7 "7: second merge; change bar" files: bar baz |
|
6 |\ |
|
7 | o 6 "6: change foo baz" files: baz foo |
|
8 | | |
|
9 o | 5 "5: change bar baz quux" files: bar baz quux |
|
10 |/ |
|
11 o 4 "4: first merge; change bar baz" files: bar baz |
|
12 |\ |
|
13 | o 3 "3: change bar quux" files: bar quux |
|
14 | | |
|
15 o | 2 "2: change foo" files: foo |
|
16 |/ |
|
17 o 1 "1: add bar quux; copy foo to copied" files: bar copied quux |
|
18 | |
|
19 o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/subdir/file3 dir/subdir/file4 foo |
|
20 |
|
21 % final file versions in this repo: |
|
22 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
|
23 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
|
24 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied |
|
25 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file |
|
26 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2 |
|
27 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3 |
|
28 57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4 |
|
29 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
30 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
|
31 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
|
32 |
|
33 % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd |
|
34 @ 3 "8: change foo" files: foo |
|
35 | |
|
36 o 2 "6: change foo baz" files: foo |
|
37 | |
|
38 o 1 "2: change foo" files: foo |
|
39 | |
|
40 o 0 "0: add foo baz dir/" files: foo |
|
41 |
|
42 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
43 % bar: merges are not merges anymore |
|
44 @ 4 "7: second merge; change bar" files: bar |
|
45 | |
|
46 o 3 "5: change bar baz quux" files: bar |
|
47 | |
|
48 o 2 "4: first merge; change bar baz" files: bar |
|
49 | |
|
50 o 1 "3: change bar quux" files: bar |
|
51 | |
|
52 o 0 "1: add bar quux; copy foo to copied" files: bar |
|
53 |
|
54 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
|
55 % baz: 1st merge is not a merge anymore; 2nd still is |
|
56 @ 4 "7: second merge; change bar" files: baz |
|
57 |\ |
|
58 | o 3 "6: change foo baz" files: baz |
|
59 | | |
|
60 o | 2 "5: change bar baz quux" files: baz |
|
61 |/ |
|
62 o 1 "4: first merge; change bar baz" files: baz |
|
63 | |
|
64 o 0 "0: add foo baz dir/" files: baz |
|
65 |
|
66 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
|
67 % foo quux: we add additional merges when they are interesting |
|
68 @ 8 "8: change foo" files: foo |
|
69 | |
|
70 o 7 "7: second merge; change bar" files: |
|
71 |\ |
|
72 | o 6 "6: change foo baz" files: foo |
|
73 | | |
|
74 o | 5 "5: change bar baz quux" files: quux |
|
75 |/ |
|
76 o 4 "4: first merge; change bar baz" files: |
|
77 |\ |
|
78 | o 3 "3: change bar quux" files: quux |
|
79 | | |
|
80 o | 2 "2: change foo" files: foo |
|
81 |/ |
|
82 o 1 "1: add bar quux; copy foo to copied" files: quux |
|
83 | |
|
84 o 0 "0: add foo baz dir/" files: foo |
|
85 |
|
86 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
87 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
|
88 % bar quux: partial conversion |
|
89 @ 1 "3: change bar quux" files: bar quux |
|
90 | |
|
91 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
|
92 |
|
93 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar |
|
94 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux |
|
95 % bar quux: complete the partial conversion |
|
96 @ 4 "7: second merge; change bar" files: bar |
|
97 | |
|
98 o 3 "5: change bar baz quux" files: bar quux |
|
99 | |
|
100 o 2 "4: first merge; change bar baz" files: bar |
|
101 | |
|
102 o 1 "3: change bar quux" files: bar quux |
|
103 | |
|
104 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
|
105 |
|
106 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
|
107 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
|
108 % foo: partial conversion |
|
109 @ 0 "0: add foo baz dir/" files: foo |
|
110 |
|
111 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
|
112 % foo: complete the partial conversion |
|
113 @ 3 "8: change foo" files: foo |
|
114 | |
|
115 o 2 "6: change foo baz" files: foo |
|
116 | |
|
117 o 1 "2: change foo" files: foo |
|
118 | |
|
119 o 0 "0: add foo baz dir/" files: foo |
|
120 |
|
121 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
122 % copied: copied file; source not included in new repo |
|
123 @ 0 "1: add bar quux; copy foo to copied" files: copied |
|
124 |
|
125 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied |
|
126 copied not renamed |
|
127 % foo copied: copied file; source included in new repo |
|
128 @ 4 "8: change foo" files: foo |
|
129 | |
|
130 o 3 "6: change foo baz" files: foo |
|
131 | |
|
132 o 2 "2: change foo" files: foo |
|
133 | |
|
134 o 1 "1: add bar quux; copy foo to copied" files: copied |
|
135 | |
|
136 o 0 "0: add foo baz dir/" files: foo |
|
137 |
|
138 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied |
|
139 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
140 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
|
141 @ 4 "8: change foo" files: foo2 |
|
142 | |
|
143 o 3 "6: change foo baz" files: foo2 |
|
144 | |
|
145 o 2 "2: change foo" files: foo2 |
|
146 | |
|
147 o 1 "1: add bar quux; copy foo to copied" files: copied2 |
|
148 | |
|
149 o 0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2 |
|
150 |
|
151 d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2 |
|
152 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file |
|
153 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3 |
|
154 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2 |
|
155 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
|
156 copied: |
|
157 foo |
|
158 copied2: |
|
159 foo |
|
160 % filemap errors |
|
161 errors.fmap:1: superfluous / in exclude 'dir/' |
|
162 errors.fmap:3: superfluous / in include '/dir' |
|
163 errors.fmap:3: superfluous / in rename '/dir' |
|
164 errors.fmap:3: superfluous / in exclude 'dir//dir' |
|
165 errors.fmap:4: unknown directive 'out of sync' |
|
166 errors.fmap:5: path to exclude is missing |
|
167 abort: errors in filemap |
|