15 o 1 "1: add bar quux; copy foo to copied" files: bar copied quux |
15 o 1 "1: add bar quux; copy foo to copied" files: bar copied quux |
16 | |
16 | |
17 o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 foo |
17 o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 foo |
18 |
18 |
19 % final file versions in this repo: |
19 % final file versions in this repo: |
20 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
20 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
21 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
21 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
22 6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied |
22 6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied |
23 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file |
23 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file |
24 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2 |
24 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2 |
25 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
25 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
26 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
26 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
27 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
27 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
28 |
28 |
29 % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd |
29 % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd |
30 o 3 "8: change foo" files: foo |
30 o 3 "8: change foo" files: foo |
31 | |
31 | |
33 | |
33 | |
34 o 1 "2: change foo" files: foo |
34 o 1 "2: change foo" files: foo |
35 | |
35 | |
36 o 0 "0: add foo baz dir/" files: foo |
36 o 0 "0: add foo baz dir/" files: foo |
37 |
37 |
38 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
38 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
39 % bar: merges are not merges anymore |
39 % bar: merges are not merges anymore |
40 o 4 "7: second merge; change bar" files: bar |
40 o 4 "7: second merge; change bar" files: bar |
41 | |
41 | |
42 o 3 "5: change bar baz quux" files: bar |
42 o 3 "5: change bar baz quux" files: bar |
43 | |
43 | |
45 | |
45 | |
46 o 1 "3: change bar quux" files: bar |
46 o 1 "3: change bar quux" files: bar |
47 | |
47 | |
48 o 0 "1: add bar quux; copy foo to copied" files: bar |
48 o 0 "1: add bar quux; copy foo to copied" files: bar |
49 |
49 |
50 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
50 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
51 % baz: 1st merge is not a merge anymore; 2nd still is |
51 % baz: 1st merge is not a merge anymore; 2nd still is |
52 o 4 "7: second merge; change bar" files: baz |
52 o 4 "7: second merge; change bar" files: baz |
53 |\ |
53 |\ |
54 | o 3 "6: change foo baz" files: baz |
54 | o 3 "6: change foo baz" files: baz |
55 | | |
55 | | |
57 |/ |
57 |/ |
58 o 1 "4: first merge; change bar baz" files: baz |
58 o 1 "4: first merge; change bar baz" files: baz |
59 | |
59 | |
60 o 0 "0: add foo baz dir/" files: baz |
60 o 0 "0: add foo baz dir/" files: baz |
61 |
61 |
62 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
62 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
63 % foo quux: we add additional merges when they are interesting |
63 % foo quux: we add additional merges when they are interesting |
64 o 8 "8: change foo" files: foo |
64 o 8 "8: change foo" files: foo |
65 | |
65 | |
66 o 7 "7: second merge; change bar" files: |
66 o 7 "7: second merge; change bar" files: |
67 |\ |
67 |\ |
77 |/ |
77 |/ |
78 o 1 "1: add bar quux; copy foo to copied" files: quux |
78 o 1 "1: add bar quux; copy foo to copied" files: quux |
79 | |
79 | |
80 o 0 "0: add foo baz dir/" files: foo |
80 o 0 "0: add foo baz dir/" files: foo |
81 |
81 |
82 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
82 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
83 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
83 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
84 % bar quux: partial conversion |
84 % bar quux: partial conversion |
85 o 1 "3: change bar quux" files: bar quux |
85 o 1 "3: change bar quux" files: bar quux |
86 | |
86 | |
87 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
87 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
88 |
88 |
89 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar |
89 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar |
90 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux |
90 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux |
91 % bar quux: complete the partial conversion |
91 % bar quux: complete the partial conversion |
92 o 4 "7: second merge; change bar" files: bar |
92 o 4 "7: second merge; change bar" files: bar |
93 | |
93 | |
94 o 3 "5: change bar baz quux" files: bar quux |
94 o 3 "5: change bar baz quux" files: bar quux |
95 | |
95 | |
97 | |
97 | |
98 o 1 "3: change bar quux" files: bar quux |
98 o 1 "3: change bar quux" files: bar quux |
99 | |
99 | |
100 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
100 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
101 |
101 |
102 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
102 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
103 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
103 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
104 % foo: partial conversion |
104 % foo: partial conversion |
105 o 0 "0: add foo baz dir/" files: foo |
105 o 0 "0: add foo baz dir/" files: foo |
106 |
106 |
107 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
107 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
108 % foo: complete the partial conversion |
108 % foo: complete the partial conversion |
109 o 3 "8: change foo" files: foo |
109 o 3 "8: change foo" files: foo |
110 | |
110 | |
111 o 2 "6: change foo baz" files: foo |
111 o 2 "6: change foo baz" files: foo |
112 | |
112 | |
113 o 1 "2: change foo" files: foo |
113 o 1 "2: change foo" files: foo |
114 | |
114 | |
115 o 0 "0: add foo baz dir/" files: foo |
115 o 0 "0: add foo baz dir/" files: foo |
116 |
116 |
117 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
117 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
118 % copied: copied file; source not included in new repo |
118 % copied: copied file; source not included in new repo |
119 o 0 "1: add bar quux; copy foo to copied" files: copied |
119 o 0 "1: add bar quux; copy foo to copied" files: copied |
120 |
120 |
121 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied |
121 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied |
122 copied not renamed |
122 copied not renamed |
123 % foo copied: copied file; source included in new repo |
123 % foo copied: copied file; source included in new repo |
124 o 4 "8: change foo" files: foo |
124 o 4 "8: change foo" files: foo |
125 | |
125 | |
126 o 3 "6: change foo baz" files: foo |
126 o 3 "6: change foo baz" files: foo |
129 | |
129 | |
130 o 1 "1: add bar quux; copy foo to copied" files: copied |
130 o 1 "1: add bar quux; copy foo to copied" files: copied |
131 | |
131 | |
132 o 0 "0: add foo baz dir/" files: foo |
132 o 0 "0: add foo baz dir/" files: foo |
133 |
133 |
134 6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied |
134 6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied |
135 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
135 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
136 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
136 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
137 o 4 "8: change foo" files: foo2 |
137 o 4 "8: change foo" files: foo2 |
138 | |
138 | |
139 o 3 "6: change foo baz" files: foo2 |
139 o 3 "6: change foo baz" files: foo2 |
140 | |
140 | |
142 | |
142 | |
143 o 1 "1: add bar quux; copy foo to copied" files: copied2 |
143 o 1 "1: add bar quux; copy foo to copied" files: copied2 |
144 | |
144 | |
145 o 0 "0: add foo baz dir/" files: dir2/file foo2 |
145 o 0 "0: add foo baz dir/" files: dir2/file foo2 |
146 |
146 |
147 e5e3d520be9be45937d0b06b004fadcd6c221fa2 644 copied2 |
147 e5e3d520be9be45937d0b06b004fadcd6c221fa2 644 copied2 |
148 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file |
148 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file |
149 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2 |
149 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2 |
150 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
150 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
151 copied: |
151 copied: |
152 foo |
152 foo |
153 copied2: |
153 copied2: |
154 foo |
154 foo |