Mercurial > evolve

comparison tests/test-evolve-content-divergence.t @ 3933:1194c850fe2a mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:19:45 +0200
parents f7afd3a158e3
children d00f0c369bc7 e541acefbaa5
comparison
equal deleted inserted replaced
3932:35b2d201eb71 3933:1194c850fe2a
36 36
37 $ hg branch -r . foobar 37 $ hg branch -r . foobar
38 changed branch on 1 changesets 38 changed branch on 1 changesets
39 39
40 $ hg up c41c793e0ef1 --hidden 40 $ hg up c41c793e0ef1 --hidden
41 updating to a hidden changeset c41c793e0ef1
42 (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
41 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
42 updated to hidden changeset c41c793e0ef1
43 (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
44 working directory parent is obsolete! (c41c793e0ef1) 44 working directory parent is obsolete! (c41c793e0ef1)
45 (use 'hg evolve' to update to its successor: 9e5dffcb3d48) 45 (use 'hg evolve' to update to its successor: 9e5dffcb3d48)
46 $ echo bar > d 46 $ echo bar > d
47 $ hg branch watwat 47 $ hg branch watwat
48 marked working directory as branch watwat 48 marked working directory as branch watwat
144 144
145 $ echo foo > d 145 $ echo foo > d
146 $ hg amend -m "foo to d" 146 $ hg amend -m "foo to d"
147 147
148 $ hg up a9d6fd6b5e40 --hidden 148 $ hg up a9d6fd6b5e40 --hidden
149 updating to a hidden changeset a9d6fd6b5e40
150 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
150 updated to hidden changeset a9d6fd6b5e40
151 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
152 working directory parent is obsolete! (a9d6fd6b5e40) 152 working directory parent is obsolete! (a9d6fd6b5e40)
153 (use 'hg evolve' to update to its successor: b10b07a394f1) 153 (use 'hg evolve' to update to its successor: b10b07a394f1)
154 $ echo babar > d 154 $ echo babar > d
155 $ hg amend -m "foo to d" 155 $ hg amend -m "foo to d"
156 2 new content-divergent changesets 156 2 new content-divergent changesets
204 204
205 $ echo bar > d 205 $ echo bar > d
206 $ hg amend -m "bar to d, expect beers" 206 $ hg amend -m "bar to d, expect beers"
207 207
208 $ hg up 11175423b5dc --hidden 208 $ hg up 11175423b5dc --hidden
209 updating to a hidden changeset 11175423b5dc
210 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
209 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 211 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
210 updated to hidden changeset 11175423b5dc
211 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
212 working directory parent is obsolete! (11175423b5dc) 212 working directory parent is obsolete! (11175423b5dc)
213 (use 'hg evolve' to update to its successor: 27f0463f169a) 213 (use 'hg evolve' to update to its successor: 27f0463f169a)
214 $ echo wat > d 214 $ echo wat > d
215 $ hg amend -m "wat to d, wat?" 215 $ hg amend -m "wat to d, wat?"
216 2 new content-divergent changesets 216 2 new content-divergent changesets
408 marked working directory as branch bar 408 marked working directory as branch bar
409 (branches are permanent and global, did you want a bookmark?) 409 (branches are permanent and global, did you want a bookmark?)
410 $ hg amend -m "added foo to x" 410 $ hg amend -m "added foo to x"
411 411
412 $ hg up 71a392c714b5 --hidden 412 $ hg up 71a392c714b5 --hidden
413 updating to a hidden changeset 71a392c714b5
414 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d)
413 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 415 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
414 updated to hidden changeset 71a392c714b5
415 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d)
416 working directory parent is obsolete! (71a392c714b5) 416 working directory parent is obsolete! (71a392c714b5)
417 (use 'hg evolve' to update to its successor: 1e1a50385a7d) 417 (use 'hg evolve' to update to its successor: 1e1a50385a7d)
418 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True 418 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True
419 rebasing 11:71a392c714b5 "added x" 419 rebasing 11:71a392c714b5 "added x"
420 2 new content-divergent changesets 420 2 new content-divergent changesets
493 493
494 $ echo bar > y 494 $ echo bar > y
495 $ hg amend 495 $ hg amend
496 496
497 $ hg up fc6ad2bac162 --hidden 497 $ hg up fc6ad2bac162 --hidden
498 updating to a hidden changeset fc6ad2bac162
499 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba)
498 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 500 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
499 updated to hidden changeset fc6ad2bac162
500 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba)
501 working directory parent is obsolete! (fc6ad2bac162) 501 working directory parent is obsolete! (fc6ad2bac162)
502 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) 502 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba)
503 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True 503 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True
504 rebasing 16:fc6ad2bac162 "added y" 504 rebasing 16:fc6ad2bac162 "added y"
505 2 new content-divergent changesets 505 2 new content-divergent changesets
628 $ echo foo > y 628 $ echo foo > y
629 $ hg add y 629 $ hg add y
630 $ hg amend 630 $ hg amend
631 631
632 $ hg up daf1de08f3b0 --hidden 632 $ hg up daf1de08f3b0 --hidden
633 updating to a hidden changeset daf1de08f3b0
634 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080)
633 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 635 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
634 updated to hidden changeset daf1de08f3b0
635 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080)
636 working directory parent is obsolete! (daf1de08f3b0) 636 working directory parent is obsolete! (daf1de08f3b0)
637 (use 'hg evolve' to update to its successor: 3f7a1f693080) 637 (use 'hg evolve' to update to its successor: 3f7a1f693080)
638 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True 638 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True
639 rebasing 22:daf1de08f3b0 "added z" 639 rebasing 22:daf1de08f3b0 "added z"
640 2 new content-divergent changesets 640 2 new content-divergent changesets