equal
deleted
inserted
replaced
197 > EOF |
197 > EOF |
198 $ cat >> $HGRCPATH << EOF |
198 $ cat >> $HGRCPATH << EOF |
199 > [extensions] |
199 > [extensions] |
200 > testextension=$TESTTMP/test_extension.py |
200 > testextension=$TESTTMP/test_extension.py |
201 > EOF |
201 > EOF |
202 $ hg evolve --all |
202 $ hg evolve |
203 nothing to evolve on current working copy parent |
203 nothing to evolve on current working copy parent |
204 (do you want to use --content-divergent) |
204 (do you want to use --content-divergent) |
205 [2] |
205 [2] |
206 $ hg evolve --content-divergent |
206 $ hg evolve --content-divergent |
207 merge:[3] bdivergent |
207 merge:[2] bdivergent |
208 with: [2] bdivergent |
208 with: [3] bdivergent |
209 base: [1] add _b |
209 base: [1] add _b |
210 merging "other" content-divergent changeset '05a6b6a9e633' |
210 updating to "local" side of the conflict: 05a6b6a9e633 |
|
211 merging "other" content-divergent changeset '6b096fb45070' |
211 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
212 working directory is now at 73ff357d3975 |
213 working directory is now at 73ff357d3975 |
213 |
214 |
214 $ cd .. |
215 $ cd .. |
215 |
216 |
362 () [default] draft |
363 () [default] draft |
363 |
364 |
364 Resolve the divergence, only "a" should be removed |
365 Resolve the divergence, only "a" should be removed |
365 |
366 |
366 $ hg evolve --content-divergent --update |
367 $ hg evolve --content-divergent --update |
367 merge:[3] delete a |
368 merge:[2] delete a |
368 with: [2] delete a |
369 with: [3] delete a |
369 base: [1] delete a |
370 base: [1] delete a |
370 merging "other" content-divergent changeset '0825dcee2670' |
371 updating to "local" side of the conflict: 0825dcee2670 |
|
372 merging "other" content-divergent changeset '92ecd58f9b05' |
371 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
373 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
372 working directory is now at 7ca6a9fafcf6 |
374 working directory is now at 7ca6a9fafcf6 |
373 $ hg glog |
375 $ hg glog |
374 @ 4:7ca6a9fafcf6 delete a |
376 @ 4:7ca6a9fafcf6 delete a |
375 | () [default] draft |
377 | () [default] draft |