Mercurial > evolve

comparison tests/test-evolve-content-divergent-relocation.t @ 5318:88f9bbba392d mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 22:50:09 +0800
parents 1752a2e7a226 011b53a9d03c
children 15406dfa60e1
comparison
equal deleted inserted replaced
5317:011b53a9d03c 5318:88f9bbba392d
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
156 marked working directory as branch bar 155 marked working directory as branch bar
157 (branches are permanent and global, did you want a bookmark?) 156 (branches are permanent and global, did you want a bookmark?)
158 $ hg amend -m "added foo to x" 157 $ hg amend -m "added foo to x"
159 158
160 $ hg up 'predecessors(.)' --hidden 159 $ hg up 'predecessors(.)' --hidden
160 updating to a hidden changeset 801b5920c7ea
161 (hidden revision '801b5920c7ea' was rewritten as: 5cf74a13db18)
161 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 162 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
162 updated to hidden changeset 801b5920c7ea
163 (hidden revision '801b5920c7ea' was rewritten as: 5cf74a13db18)
164 working directory parent is obsolete! (801b5920c7ea) 163 working directory parent is obsolete! (801b5920c7ea)
165 (use 'hg evolve' to update to its successor: 5cf74a13db18) 164 (use 'hg evolve' to update to its successor: 5cf74a13db18)
166 $ hg rebase -r . -d 'desc("added d")' --config experimental.evolution.allowdivergence=True 165 $ hg rebase -r . -d 'desc("added d")' --config experimental.evolution.allowdivergence=True
167 rebasing 11:801b5920c7ea "added x" 166 rebasing 11:801b5920c7ea "added x"
168 2 new content-divergent changesets 167 2 new content-divergent changesets
269 268
270 $ echo bar > y 269 $ echo bar > y
271 $ hg amend 270 $ hg amend
272 271
273 $ hg up 'predecessors(.)' --hidden 272 $ hg up 'predecessors(.)' --hidden
273 updating to a hidden changeset ecf1d3992eb4
274 (hidden revision 'ecf1d3992eb4' was rewritten as: 9c32d35206fb)
274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 275 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
275 updated to hidden changeset ecf1d3992eb4
276 (hidden revision 'ecf1d3992eb4' was rewritten as: 9c32d35206fb)
277 working directory parent is obsolete! (ecf1d3992eb4) 276 working directory parent is obsolete! (ecf1d3992eb4)
278 (use 'hg evolve' to update to its successor: 9c32d35206fb) 277 (use 'hg evolve' to update to its successor: 9c32d35206fb)
279 $ hg rebase -r . -d 'desc("added foo to x")' --config experimental.evolution.allowdivergence=True 278 $ hg rebase -r . -d 'desc("added foo to x")' --config experimental.evolution.allowdivergence=True
280 rebasing 16:ecf1d3992eb4 "added y" 279 rebasing 16:ecf1d3992eb4 "added y"
281 2 new content-divergent changesets 280 2 new content-divergent changesets
422 $ echo foo > y 421 $ echo foo > y
423 $ hg add y 422 $ hg add y
424 $ hg amend 423 $ hg amend
425 424
426 $ hg up 'predecessors(.)' --hidden 425 $ hg up 'predecessors(.)' --hidden
426 updating to a hidden changeset 2048a66e8834
427 (hidden revision '2048a66e8834' was rewritten as: 9bc2ace42175)
427 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 428 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
428 updated to hidden changeset 2048a66e8834
429 (hidden revision '2048a66e8834' was rewritten as: 9bc2ace42175)
430 working directory parent is obsolete! (2048a66e8834) 429 working directory parent is obsolete! (2048a66e8834)
431 (use 'hg evolve' to update to its successor: 9bc2ace42175) 430 (use 'hg evolve' to update to its successor: 9bc2ace42175)
432 $ hg rebase -r . -d 'desc("added y")' --config experimental.evolution.allowdivergence=True 431 $ hg rebase -r . -d 'desc("added y")' --config experimental.evolution.allowdivergence=True
433 rebasing 22:2048a66e8834 "added z" 432 rebasing 22:2048a66e8834 "added z"
434 2 new content-divergent changesets 433 2 new content-divergent changesets
621 620
622 The first side of the divergence get rebased on top of upstream. 621 The first side of the divergence get rebased on top of upstream.
623 $ hg rebase -r . -d 'desc("upstream")' 622 $ hg rebase -r . -d 'desc("upstream")'
624 rebasing 2:898ddd4443b3 "divergent" (tip) 623 rebasing 2:898ddd4443b3 "divergent" (tip)
625 $ hg --hidden co 2 -q 624 $ hg --hidden co 2 -q
626 updated to hidden changeset 898ddd4443b3 625 updating to a hidden changeset 898ddd4443b3
627 (hidden revision '898ddd4443b3' was rewritten as: befae6138569) 626 (hidden revision '898ddd4443b3' was rewritten as: befae6138569)
628 working directory parent is obsolete! (898ddd4443b3) 627 working directory parent is obsolete! (898ddd4443b3)
629 628
630 The other side of the divergence gets amended so it matches upstream. 629 The other side of the divergence gets amended so it matches upstream.
631 Relocation (onto upstream) will therefore result in no changes to commit. 630 Relocation (onto upstream) will therefore result in no changes to commit.