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 |
138 marked working directory as branch bar |
137 marked working directory as branch bar |
139 (branches are permanent and global, did you want a bookmark?) |
138 (branches are permanent and global, did you want a bookmark?) |
140 $ hg amend -m "added foo to x" |
139 $ hg amend -m "added foo to x" |
141 |
140 |
142 $ hg up 71a392c714b5 --hidden |
141 $ hg up 71a392c714b5 --hidden |
|
142 updating to a hidden changeset 71a392c714b5 |
|
143 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) |
143 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
144 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
144 updated to hidden changeset 71a392c714b5 |
|
145 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) |
|
146 working directory parent is obsolete! (71a392c714b5) |
145 working directory parent is obsolete! (71a392c714b5) |
147 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
146 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
148 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
147 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
149 rebasing 11:71a392c714b5 "added x" |
148 rebasing 11:71a392c714b5 "added x" |
150 2 new content-divergent changesets |
149 2 new content-divergent changesets |
223 |
222 |
224 $ echo bar > y |
223 $ echo bar > y |
225 $ hg amend |
224 $ hg amend |
226 |
225 |
227 $ hg up fc6ad2bac162 --hidden |
226 $ hg up fc6ad2bac162 --hidden |
|
227 updating to a hidden changeset fc6ad2bac162 |
|
228 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) |
228 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
229 updated to hidden changeset fc6ad2bac162 |
|
230 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) |
|
231 working directory parent is obsolete! (fc6ad2bac162) |
230 working directory parent is obsolete! (fc6ad2bac162) |
232 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
231 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
233 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
232 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
234 rebasing 16:fc6ad2bac162 "added y" |
233 rebasing 16:fc6ad2bac162 "added y" |
235 2 new content-divergent changesets |
234 2 new content-divergent changesets |
358 $ echo foo > y |
357 $ echo foo > y |
359 $ hg add y |
358 $ hg add y |
360 $ hg amend |
359 $ hg amend |
361 |
360 |
362 $ hg up daf1de08f3b0 --hidden |
361 $ hg up daf1de08f3b0 --hidden |
|
362 updating to a hidden changeset daf1de08f3b0 |
|
363 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) |
363 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
364 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
364 updated to hidden changeset daf1de08f3b0 |
|
365 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) |
|
366 working directory parent is obsolete! (daf1de08f3b0) |
365 working directory parent is obsolete! (daf1de08f3b0) |
367 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
366 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
368 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
367 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
369 rebasing 22:daf1de08f3b0 "added z" |
368 rebasing 22:daf1de08f3b0 "added z" |
370 2 new content-divergent changesets |
369 2 new content-divergent changesets |