11 > publish = False |
11 > publish = False |
12 > [extensions] |
12 > [extensions] |
13 > rebase = |
13 > rebase = |
14 > EOF |
14 > EOF |
15 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
15 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
16 |
|
17 |
16 |
18 Testing resolution of content-divergent changesets when they are on different |
17 Testing resolution of content-divergent changesets when they are on different |
19 parents and resolution and relocation wont result in conflicts |
18 parents and resolution and relocation wont result in conflicts |
20 ------------------------------------------------------------------------------ |
19 ------------------------------------------------------------------------------ |
21 |
20 |
133 marked working directory as branch bar |
132 marked working directory as branch bar |
134 (branches are permanent and global, did you want a bookmark?) |
133 (branches are permanent and global, did you want a bookmark?) |
135 $ hg amend -m "added foo to x" |
134 $ hg amend -m "added foo to x" |
136 |
135 |
137 $ hg up 71a392c714b5 --hidden |
136 $ hg up 71a392c714b5 --hidden |
|
137 updating to a hidden changeset 71a392c714b5 |
|
138 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) |
138 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
139 updated to hidden changeset 71a392c714b5 |
|
140 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) |
|
141 working directory parent is obsolete! (71a392c714b5) |
140 working directory parent is obsolete! (71a392c714b5) |
142 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
141 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
143 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
142 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
144 rebasing 11:71a392c714b5 "added x" |
143 rebasing 11:71a392c714b5 "added x" |
145 2 new content-divergent changesets |
144 2 new content-divergent changesets |
216 |
215 |
217 $ echo bar > y |
216 $ echo bar > y |
218 $ hg amend |
217 $ hg amend |
219 |
218 |
220 $ hg up fc6ad2bac162 --hidden |
219 $ hg up fc6ad2bac162 --hidden |
|
220 updating to a hidden changeset fc6ad2bac162 |
|
221 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) |
221 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
222 updated to hidden changeset fc6ad2bac162 |
|
223 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) |
|
224 working directory parent is obsolete! (fc6ad2bac162) |
223 working directory parent is obsolete! (fc6ad2bac162) |
225 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
224 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
226 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
225 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
227 rebasing 16:fc6ad2bac162 "added y" |
226 rebasing 16:fc6ad2bac162 "added y" |
228 2 new content-divergent changesets |
227 2 new content-divergent changesets |
350 $ echo foo > y |
349 $ echo foo > y |
351 $ hg add y |
350 $ hg add y |
352 $ hg amend |
351 $ hg amend |
353 |
352 |
354 $ hg up daf1de08f3b0 --hidden |
353 $ hg up daf1de08f3b0 --hidden |
|
354 updating to a hidden changeset daf1de08f3b0 |
|
355 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) |
355 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
356 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
356 updated to hidden changeset daf1de08f3b0 |
|
357 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) |
|
358 working directory parent is obsolete! (daf1de08f3b0) |
357 working directory parent is obsolete! (daf1de08f3b0) |
359 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
358 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
360 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
359 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
361 rebasing 22:daf1de08f3b0 "added z" |
360 rebasing 22:daf1de08f3b0 "added z" |
362 2 new content-divergent changesets |
361 2 new content-divergent changesets |