49 working directory parent is obsolete! (c41c793e0ef1) |
49 working directory parent is obsolete! (c41c793e0ef1) |
50 (use 'hg evolve' to update to its successor: e49523854bc8) |
50 (use 'hg evolve' to update to its successor: e49523854bc8) |
51 |
51 |
52 $ echo foobar > d |
52 $ echo foobar > d |
53 $ hg amend |
53 $ hg amend |
54 2 new content-divergent changesets |
54 2 new divergent changesets |
55 $ hg glog --hidden |
55 $ hg glog --hidden |
56 @ 6:9c1631e352d9 added d |
56 @ 8:9c1631e352d9 added d |
57 | () draft |
57 | () draft |
58 | o 5:e49523854bc8 added d |
58 | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1 |
59 |/ () draft |
59 | | () draft |
|
60 +---o 6:e49523854bc8 added d |
|
61 | | () draft |
|
62 | | x 5:14721514d41c temporary amend commit for c41c793e0ef1 |
|
63 | |/ () draft |
60 | x 4:c41c793e0ef1 added d |
64 | x 4:c41c793e0ef1 added d |
61 |/ () draft |
65 |/ () draft |
62 o 3:ca1b80f7960a added c |
66 o 3:ca1b80f7960a added c |
63 | () draft |
67 | () draft |
64 o 2:b1661037fa25 added b |
68 o 2:b1661037fa25 added b |
67 | () draft |
71 | () draft |
68 o 0:8fa14d15e168 added hgignore |
72 o 0:8fa14d15e168 added hgignore |
69 () draft |
73 () draft |
70 |
74 |
71 $ hg evolve --content-divergent |
75 $ hg evolve --content-divergent |
72 merge:[6] added d |
76 merge:[8] added d |
73 with: [5] added d |
77 with: [6] added d |
74 base: [4] added d |
78 base: [4] added d |
75 merging "other" content-divergent changeset 'e49523854bc8' |
79 merging "other" divergent changeset 'e49523854bc8' |
76 merging d |
80 merging d |
77 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
81 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
78 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
82 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
79 fix conflicts and see `hg help evolve.interrupted` |
83 fix conflicts and see `hg help evolve.interrupted` |
80 [1] |
84 [1] |
81 |
85 |
82 $ hg status -v |
86 $ hg status -v |
83 M d |
87 M d |
84 # The repository is in an unfinished *evolve* state. |
|
85 |
|
86 # Unresolved merge conflicts: |
|
87 # |
|
88 # d |
|
89 # |
|
90 # To mark files as resolved: hg resolve --mark FILE |
|
91 |
|
92 # To continue: hg evolve --continue |
|
93 # To abort: hg evolve --abort |
|
94 # To stop: hg evolve --stop |
|
95 # (also see `hg help evolve.interrupted`) |
|
96 |
|
97 $ hg parents |
|
98 changeset: 6:9c1631e352d9 |
|
99 tag: tip |
|
100 parent: 3:ca1b80f7960a |
|
101 user: test |
|
102 date: Thu Jan 01 00:00:00 1970 +0000 |
|
103 instability: content-divergent |
|
104 summary: added d |
|
105 |
|
106 changeset: 5:e49523854bc8 |
|
107 parent: 3:ca1b80f7960a |
|
108 user: test |
|
109 date: Thu Jan 01 00:00:00 1970 +0000 |
|
110 instability: content-divergent |
|
111 summary: added d |
|
112 |
|
113 |
88 |
114 $ hg evolve --abort |
89 $ hg evolve --abort |
115 evolve aborted |
90 evolve aborted |
116 working directory is now at 9c1631e352d9 |
91 working directory is now at 9c1631e352d9 |
117 |
92 |
118 $ hg glog --hidden |
93 $ hg glog --hidden |
119 @ 6:9c1631e352d9 added d |
94 @ 8:9c1631e352d9 added d |
120 | () draft |
95 | () draft |
121 | o 5:e49523854bc8 added d |
96 | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1 |
122 |/ () draft |
97 | | () draft |
|
98 +---o 6:e49523854bc8 added d |
|
99 | | () draft |
|
100 | | x 5:14721514d41c temporary amend commit for c41c793e0ef1 |
|
101 | |/ () draft |
123 | x 4:c41c793e0ef1 added d |
102 | x 4:c41c793e0ef1 added d |
124 |/ () draft |
103 |/ () draft |
125 o 3:ca1b80f7960a added c |
104 o 3:ca1b80f7960a added c |
126 | () draft |
105 | () draft |
127 o 2:b1661037fa25 added b |
106 o 2:b1661037fa25 added b |
139 $ hg amend |
118 $ hg amend |
140 $ hg up .^ |
119 $ hg up .^ |
141 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
120 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
142 $ echo bar > c |
121 $ echo bar > c |
143 $ hg amend |
122 $ hg amend |
144 2 new orphan changesets |
123 2 new unstable changesets |
145 $ hg up ca1b80f7960a --hidden |
124 $ hg up ca1b80f7960a --hidden |
146 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
125 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
147 working directory parent is obsolete! (ca1b80f7960a) |
126 working directory parent is obsolete! (ca1b80f7960a) |
148 (use 'hg evolve' to update to its successor: 2ba73e31f264) |
127 (use 'hg evolve' to update to its successor: 2ba73e31f264) |
149 $ echo foobar > c |
128 $ echo foobar > c |
150 $ hg amend |
129 $ hg amend |
151 2 new content-divergent changesets |
130 2 new divergent changesets |
152 $ echo bar > c |
131 $ echo bar > c |
153 $ hg amend |
132 $ hg amend |
154 |
133 |
155 $ hg glog --hidden |
134 $ hg glog --hidden |
156 @ 10:491e10505bae added c |
135 @ 16:491e10505bae added c |
157 | () draft |
136 | () draft |
158 | x 9:7398f702a162 added c |
137 | x 15:b2451992ec73 temporary amend commit for 7398f702a162 |
159 |/ () draft |
138 | | () draft |
160 | o 8:2ba73e31f264 added c |
139 | x 14:7398f702a162 added c |
161 |/ () draft |
140 |/ () draft |
162 | o 7:f0f1694f123e added d |
141 | x 13:1c0d5c8e745f temporary amend commit for ca1b80f7960a |
163 | | () draft |
142 | | () draft |
164 | | x 6:9c1631e352d9 added d |
143 +---o 12:2ba73e31f264 added c |
165 | |/ () draft |
144 | | () draft |
166 | | o 5:e49523854bc8 added d |
145 | | x 11:277fdfc7d90c temporary amend commit for ca1b80f7960a |
167 | |/ () draft |
146 | |/ () draft |
|
147 | | o 10:f0f1694f123e added d |
|
148 | |/ () draft |
|
149 | | x 9:36f1dead57ef temporary amend commit for 9c1631e352d9 |
|
150 | | | () draft |
|
151 | | x 8:9c1631e352d9 added d |
|
152 | |/ () draft |
|
153 | | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1 |
|
154 | | | () draft |
|
155 | +---o 6:e49523854bc8 added d |
|
156 | | | () draft |
|
157 | | | x 5:14721514d41c temporary amend commit for c41c793e0ef1 |
|
158 | | |/ () draft |
168 | | x 4:c41c793e0ef1 added d |
159 | | x 4:c41c793e0ef1 added d |
169 | |/ () draft |
160 | |/ () draft |
170 | x 3:ca1b80f7960a added c |
161 | x 3:ca1b80f7960a added c |
171 |/ () draft |
162 |/ () draft |
172 o 2:b1661037fa25 added b |
163 o 2:b1661037fa25 added b |
175 | () draft |
166 | () draft |
176 o 0:8fa14d15e168 added hgignore |
167 o 0:8fa14d15e168 added hgignore |
177 () draft |
168 () draft |
178 |
169 |
179 $ hg evolve --all --content-divergent |
170 $ hg evolve --all --content-divergent |
180 merge:[8] added c |
171 merge:[12] added c |
181 with: [10] added c |
172 with: [16] added c |
182 base: [3] added c |
173 base: [3] added c |
183 updating to "local" side of the conflict: 2ba73e31f264 |
174 updating to "local" side of the conflict: 2ba73e31f264 |
184 merging "other" content-divergent changeset '491e10505bae' |
175 merging "other" divergent changeset '491e10505bae' |
185 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
176 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
186 merge:[5] added d |
177 merge:[6] added d |
187 with: [7] added d |
178 with: [10] added d |
188 base: [4] added d |
179 base: [4] added d |
189 updating to "local" side of the conflict: e49523854bc8 |
180 updating to "local" side of the conflict: e49523854bc8 |
190 merging "other" content-divergent changeset 'f0f1694f123e' |
181 merging "other" divergent changeset 'f0f1694f123e' |
191 merging d |
182 merging d |
192 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
183 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
193 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
184 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
194 fix conflicts and see `hg help evolve.interrupted` |
185 fix conflicts and see `hg help evolve.interrupted` |
195 [1] |
186 [1] |
197 $ hg evolve --abort |
188 $ hg evolve --abort |
198 evolve aborted |
189 evolve aborted |
199 working directory is now at 491e10505bae |
190 working directory is now at 491e10505bae |
200 |
191 |
201 $ hg glog --hidden |
192 $ hg glog --hidden |
202 @ 10:491e10505bae added c |
193 @ 16:491e10505bae added c |
203 | () draft |
194 | () draft |
204 | x 9:7398f702a162 added c |
195 | x 15:b2451992ec73 temporary amend commit for 7398f702a162 |
205 |/ () draft |
196 | | () draft |
206 | o 8:2ba73e31f264 added c |
197 | x 14:7398f702a162 added c |
207 |/ () draft |
198 |/ () draft |
208 | o 7:f0f1694f123e added d |
199 | x 13:1c0d5c8e745f temporary amend commit for ca1b80f7960a |
209 | | () draft |
200 | | () draft |
210 | | x 6:9c1631e352d9 added d |
201 +---o 12:2ba73e31f264 added c |
211 | |/ () draft |
202 | | () draft |
212 | | o 5:e49523854bc8 added d |
203 | | x 11:277fdfc7d90c temporary amend commit for ca1b80f7960a |
213 | |/ () draft |
204 | |/ () draft |
|
205 | | o 10:f0f1694f123e added d |
|
206 | |/ () draft |
|
207 | | x 9:36f1dead57ef temporary amend commit for 9c1631e352d9 |
|
208 | | | () draft |
|
209 | | x 8:9c1631e352d9 added d |
|
210 | |/ () draft |
|
211 | | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1 |
|
212 | | | () draft |
|
213 | +---o 6:e49523854bc8 added d |
|
214 | | | () draft |
|
215 | | | x 5:14721514d41c temporary amend commit for c41c793e0ef1 |
|
216 | | |/ () draft |
214 | | x 4:c41c793e0ef1 added d |
217 | | x 4:c41c793e0ef1 added d |
215 | |/ () draft |
218 | |/ () draft |
216 | x 3:ca1b80f7960a added c |
219 | x 3:ca1b80f7960a added c |
217 |/ () draft |
220 |/ () draft |
218 o 2:b1661037fa25 added b |
221 o 2:b1661037fa25 added b |
221 | () draft |
224 | () draft |
222 o 0:8fa14d15e168 added hgignore |
225 o 0:8fa14d15e168 added hgignore |
223 () draft |
226 () draft |
224 |
227 |
225 $ hg obslog -r . --all |
228 $ hg obslog -r . --all |
226 o 2ba73e31f264 (8) added c |
229 o 2ba73e31f264 (12) added c |
227 | |
230 | |
228 | @ 491e10505bae (10) added c |
231 | @ 491e10505bae (16) added c |
229 | | |
232 | | |
230 | x 7398f702a162 (9) added c |
233 | x 7398f702a162 (14) added c |
231 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
234 |/ rewritten(content) as 491e10505bae by test (Thu Jan 01 00:00:00 1970 +0000) |
232 | |
235 | |
233 x ca1b80f7960a (3) added c |
236 x ca1b80f7960a (3) added c |
234 rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
237 rewritten(content) as 2ba73e31f264 by test (Thu Jan 01 00:00:00 1970 +0000) |
235 rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
238 rewritten(content) as 7398f702a162 by test (Thu Jan 01 00:00:00 1970 +0000) |
236 |
239 |
237 $ cd .. |
240 $ cd .. |
238 |
241 |
239 Creating content-divergence on multiple parents when gca of divergent changesets |
242 Creating content-divergence on multiple parents when gca of divergent changesets |
240 is parent of one of the divergents and relocating leads to conflicts |
243 is parent of one of the divergents and relocating leads to conflicts |
269 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
272 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
270 working directory parent is obsolete! (c41c793e0ef1) |
273 working directory parent is obsolete! (c41c793e0ef1) |
271 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
274 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
272 $ echo bar > d |
275 $ echo bar > d |
273 $ hg amend |
276 $ hg amend |
274 2 new content-divergent changesets |
277 2 new divergent changesets |
275 |
278 |
276 $ hg glog |
279 $ hg glog |
277 @ 7:e49523854bc8 added d |
280 @ 9:e49523854bc8 added d |
278 | () draft |
281 | () draft |
279 | o 6:69bdd23a9b0d added d |
282 | o 7:69bdd23a9b0d added d |
280 | | () draft |
283 | | () draft |
281 o | 3:ca1b80f7960a added c |
284 o | 3:ca1b80f7960a added c |
282 | | () draft |
285 | | () draft |
283 o | 2:b1661037fa25 added b |
286 o | 2:b1661037fa25 added b |
284 |/ () draft |
287 |/ () draft |
286 | () draft |
289 | () draft |
287 o 0:8fa14d15e168 added hgignore |
290 o 0:8fa14d15e168 added hgignore |
288 () draft |
291 () draft |
289 |
292 |
290 $ hg evolve --content-divergent |
293 $ hg evolve --content-divergent |
291 merge:[7] added d |
294 merge:[9] added d |
292 with: [6] added d |
295 with: [7] added d |
293 base: [4] added d |
296 base: [4] added d |
294 rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a |
297 rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a |
295 merging c |
298 merging c |
296 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
299 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
297 fix conflicts and see `hg help evolve.interrupted` |
300 fix conflicts and see `hg help evolve.interrupted` |
300 $ hg evolve --abort |
303 $ hg evolve --abort |
301 evolve aborted |
304 evolve aborted |
302 working directory is now at e49523854bc8 |
305 working directory is now at e49523854bc8 |
303 |
306 |
304 $ hg glog |
307 $ hg glog |
305 @ 7:e49523854bc8 added d |
308 @ 9:e49523854bc8 added d |
306 | () draft |
309 | () draft |
307 | o 6:69bdd23a9b0d added d |
310 | o 7:69bdd23a9b0d added d |
308 | | () draft |
311 | | () draft |
309 o | 3:ca1b80f7960a added c |
312 o | 3:ca1b80f7960a added c |
310 | | () draft |
313 | | () draft |
311 o | 2:b1661037fa25 added b |
314 o | 2:b1661037fa25 added b |
312 |/ () draft |
315 |/ () draft |
338 | () draft |
341 | () draft |
339 o 0:8fa14d15e168 added hgignore |
342 o 0:8fa14d15e168 added hgignore |
340 () draft |
343 () draft |
341 |
344 |
342 $ hg evolve --content-divergent |
345 $ hg evolve --content-divergent |
343 merge:[7] added d |
346 merge:[9] added d |
344 with: [8] added d |
347 with: [11] added d |
345 base: [4] added d |
348 base: [4] added d |
346 rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a |
349 rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a |
347 updating to "local" side of the conflict: e49523854bc8 |
350 updating to "local" side of the conflict: e49523854bc8 |
348 merging "other" content-divergent changeset 'a663d1567f0b' |
351 merging "other" divergent changeset 'a663d1567f0b' |
349 merging d |
352 merging d |
350 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
353 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
351 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
354 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
352 fix conflicts and see `hg help evolve.interrupted` |
355 fix conflicts and see `hg help evolve.interrupted` |
353 [1] |
356 [1] |
355 $ hg evolve --abort |
358 $ hg evolve --abort |
356 evolve aborted |
359 evolve aborted |
357 working directory is now at 33e4442acf98 |
360 working directory is now at 33e4442acf98 |
358 |
361 |
359 $ hg glog |
362 $ hg glog |
360 @ 8:33e4442acf98 added d |
363 @ 11:33e4442acf98 added d |
361 | () draft |
364 | () draft |
362 | o 7:e49523854bc8 added d |
365 | o 9:e49523854bc8 added d |
363 | | () draft |
366 | | () draft |
364 | o 3:ca1b80f7960a added c |
367 | o 3:ca1b80f7960a added c |
365 | | () draft |
368 | | () draft |
366 | o 2:b1661037fa25 added b |
369 | o 2:b1661037fa25 added b |
367 |/ () draft |
370 |/ () draft |