Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 3715:a77fb9669e99 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 23 Apr 2018 12:23:00 +0200
parents 19ec729f3ca2
children e5ba6531503e
comparison
equal deleted inserted replaced
3714:19ec729f3ca2 3715:a77fb9669e99
78 searching for changes 78 searching for changes
79 adding changesets 79 adding changesets
80 adding manifests 80 adding manifests
81 adding file changes 81 adding file changes
82 added 1 changesets with 1 changes to 1 files 82 added 1 changesets with 1 changes to 1 files
83 new changesets 4d1169d82e47
84 (run 'hg update' to get a working copy) 83 (run 'hg update' to get a working copy)
85 84
86 $ hg glog 85 $ hg glog
87 o 1:4d1169d82e47 modify a 86 o 1:4d1169d82e47 modify a
88 | () draft 87 | () draft
560 559
561 $ hg pull ../public 560 $ hg pull ../public
562 pulling from ../public 561 pulling from ../public
563 searching for changes 562 searching for changes
564 no changes found 563 no changes found
565 1 new phase-divergent changesets 564 1 new bumped changesets
566 565
567 $ hg obslog -r . 566 $ hg obslog -r .
568 @ 334e300d6db5 (10) added x to x 567 @ 334e300d6db5 (10) added x to x
569 | 568 |
570 o 2352021b3785 (9) added x to x 569 o 2352021b3785 (9) added x to x
1211 1210
1212 $ hg prune -r 12ebe0d625d7 --succ . 1211 $ hg prune -r 12ebe0d625d7 --succ .
1213 1 changesets pruned 1212 1 changesets pruned
1214 1213
1215 $ hg phase 12ebe0d625d7 --hidden --public 1214 $ hg phase 12ebe0d625d7 --hidden --public
1216 1 new phase-divergent changesets 1215 1 new bumped changesets
1217 1216
1218 Resolution of phase-divergent merge commit using `hg evolve` 1217 Resolution of phase-divergent merge commit using `hg evolve`
1219 1218
1220 XXX: we should handle phase-divergent merges 1219 XXX: we should handle phase-divergent merges
1221 $ hg evolve --phase-divergent 1220 $ hg evolve --phase-divergent