Mercurial > evolve

comparison tests/test-stabilize-result.t @ 2854:66796d7b5415

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning: rename unstable warning message unstable has been renamed into orphan. Update the warning message when new orphan changesets are detected. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary
author Boris Feld <boris.feld@octobus.net>
date Thu, 24 Aug 2017 09:11:06 +0200
parents f588de9dd067
children 1db0137297f4
comparison
equal deleted inserted replaced
2853:cec3d2ea2eeb 2854:66796d7b5415
25 $ hg up 1 25 $ hg up 1
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 (leaving bookmark changea) 27 (leaving bookmark changea)
28 $ echo a >> a 28 $ echo a >> a
29 $ hg amend -m changea 29 $ hg amend -m changea
30 1 new unstable changesets 30 1 new orphan changesets
31 $ hg evolve -v --confirm 31 $ hg evolve -v --confirm
32 move:[2] changea 32 move:[2] changea
33 atop:[4] changea 33 atop:[4] changea
34 perform evolve? [Ny] n 34 perform evolve? [Ny] n
35 abort: evolve aborted by user 35 abort: evolve aborted by user
74 gdown have been deprecated in favor of previous 74 gdown have been deprecated in favor of previous
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
76 [4] changea 76 [4] changea
77 $ echo 'a' > a 77 $ echo 'a' > a
78 $ hg amend 78 $ hg amend
79 1 new unstable changesets 79 1 new orphan changesets
80 $ hg evolve 80 $ hg evolve
81 move:[5] newer a 81 move:[5] newer a
82 atop:[7] changea 82 atop:[7] changea
83 merging a 83 merging a
84 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 84 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')