Mercurial > evolve

comparison tests/test-single-head-obsolescence-named-branch-A5.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
74 $ mkcommit A1 74 $ mkcommit A1
75 created new head 75 created new head
76 (consider using topic for lightweight branches. See 'hg help topic') 76 (consider using topic for lightweight branches. See 'hg help topic')
77 $ mkcommit B1 77 $ mkcommit B1
78 $ hg debugobsolete `getid "desc(M0)"` --record-parents 78 $ hg debugobsolete `getid "desc(M0)"` --record-parents
79 1 new obsolescence markers
80 obsoleted 1 changesets 79 obsoleted 1 changesets
81 1 new orphan changesets 80 1 new orphan changesets
82 $ hg log -G --hidden 81 $ hg log -G --hidden
83 @ 262c8c798096 [default] (draft): B1 82 @ 262c8c798096 [default] (draft): B1
84 | 83 |
102 101
103 $ hg push -r 'desc("C0")' --force 102 $ hg push -r 'desc("C0")' --force
104 pushing to $TESTTMP/A5/server 103 pushing to $TESTTMP/A5/server
105 searching for changes 104 searching for changes
106 no changes found 105 no changes found
106 1 new obsolescence markers
107 transaction abort! 107 transaction abort!
108 rollback completed 108 rollback completed
109 abort: rejecting multiple heads on branch "default" 109 abort: rejecting multiple heads on branch "default"
110 (2 heads: 8aaa48160adc 74ff5441d343) 110 (2 heads: 8aaa48160adc 74ff5441d343)
111 [255] 111 [255]