Mercurial > evolve

comparison tests/test-single-head-obsolescence-topic-B5.t @ 6186:c915d9441654 mercurial-5.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.2 into mercurial-5.1
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 18:14:26 +0300
parents 35e769c9604f
children b1d010b2e6c4
comparison
equal deleted inserted replaced
6185:74a61e0dc9da 6186:c915d9441654
78 $ hg up 0 78 $ hg up 0
79 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 79 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
80 $ mkcommit A1 80 $ mkcommit A1
81 $ mkcommit B1 81 $ mkcommit B1
82 $ hg debugobsolete `getid "desc(M0)"` --record-parents 82 $ hg debugobsolete `getid "desc(M0)"` --record-parents
83 1 new obsolescence markers
84 obsoleted 1 changesets 83 obsoleted 1 changesets
85 1 new orphan changesets 84 1 new orphan changesets
86 $ hg log -G --hidden 85 $ hg log -G --hidden
87 @ 262c8c798096 [default] (draft): B1 86 @ 262c8c798096 [default] (draft): B1
88 | 87 |
106 105
107 $ hg push -r 'desc("C0")' --force 106 $ hg push -r 'desc("C0")' --force
108 pushing to $TESTTMP/B5/server 107 pushing to $TESTTMP/B5/server
109 searching for changes 108 searching for changes
110 no changes found 109 no changes found
110 1 new obsolescence markers
111 transaction abort! 111 transaction abort!
112 rollback completed 112 rollback completed
113 abort: rejecting multiple heads on branch "default:topic-X" 113 abort: rejecting multiple heads on branch "default:topic-X"
114 (2 heads: 5a47a98cd8e5 d3826ff42cf7) 114 (2 heads: 5a47a98cd8e5 d3826ff42cf7)
115 [255] 115 [255]