equal
deleted
inserted
replaced
74 |
74 |
75 $ hg evolve --all --any --content-divergent --update |
75 $ hg evolve --all --any --content-divergent --update |
76 merge:[2] divergent |
76 merge:[2] divergent |
77 with: [3] divergent |
77 with: [3] divergent |
78 base: [1] added b |
78 base: [1] added b |
79 updating to "local" side of the conflict: 593c57f2117e |
|
80 merging "other" content-divergent changeset '8374d2ddc3a4' |
|
81 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82 working directory is now at 45bf1312f454 |
80 working directory is now at 45bf1312f454 |
83 $ hg log -G |
81 $ hg log -G |
84 @ 4:45bf1312f454@default(draft) divergent [] |
82 @ 4:45bf1312f454@default(draft) divergent [] |
85 | |
83 | |
135 |
133 |
136 $ hg evolve --all --any --content-divergent |
134 $ hg evolve --all --any --content-divergent |
137 merge:[6] add cdivergent1 |
135 merge:[6] add cdivergent1 |
138 with: [7] add _c |
136 with: [7] add _c |
139 base: [5] add _c |
137 base: [5] add _c |
140 updating to "local" side of the conflict: e3ff64ce8d4c |
|
141 merging "other" content-divergent changeset 'b2ae71172042' |
|
142 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
138 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
143 nothing changed |
139 nothing changed |
144 working directory is now at e3ff64ce8d4c |
140 working directory is now at e3ff64ce8d4c |
145 |
141 |
146 $ cd .. |
142 $ cd .. |
205 [2] |
201 [2] |
206 $ hg evolve --content-divergent |
202 $ hg evolve --content-divergent |
207 merge:[2] bdivergent |
203 merge:[2] bdivergent |
208 with: [3] bdivergent |
204 with: [3] bdivergent |
209 base: [1] add _b |
205 base: [1] add _b |
210 updating to "local" side of the conflict: 05a6b6a9e633 |
|
211 merging "other" content-divergent changeset '6b096fb45070' |
|
212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
206 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
213 working directory is now at 73ff357d3975 |
207 working directory is now at 73ff357d3975 |
214 |
208 |
215 $ cd .. |
209 $ cd .. |
216 |
210 |
307 (no more unresolved files) |
301 (no more unresolved files) |
308 continue: hg evolve --continue |
302 continue: hg evolve --continue |
309 |
303 |
310 $ hg evolve --continue |
304 $ hg evolve --continue |
311 evolving 6:de4ea3103326 "updated e" |
305 evolving 6:de4ea3103326 "updated e" |
312 updating to "local" side of the conflict: ff6f7cd76a7c |
|
313 merging "other" content-divergent changeset 'e504bd82de7e' |
|
314 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
315 working directory is now at 83b1664a580f |
307 working directory is now at 83b1664a580f |
316 |
308 |
317 $ hg glog -l1 |
309 $ hg glog -l1 |
318 @ 8:83b1664a580f updated e |
310 @ 8:83b1664a580f updated e |
366 |
358 |
367 $ hg evolve --content-divergent --update |
359 $ hg evolve --content-divergent --update |
368 merge:[2] delete a |
360 merge:[2] delete a |
369 with: [3] delete a |
361 with: [3] delete a |
370 base: [1] delete a |
362 base: [1] delete a |
371 updating to "local" side of the conflict: 0825dcee2670 |
|
372 merging "other" content-divergent changeset '92ecd58f9b05' |
|
373 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
363 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
374 working directory is now at 7ca6a9fafcf6 |
364 working directory is now at 7ca6a9fafcf6 |
375 $ hg glog |
365 $ hg glog |
376 @ 4:7ca6a9fafcf6 delete a |
366 @ 4:7ca6a9fafcf6 delete a |
377 | () [default] draft |
367 | () [default] draft |