Mercurial > evolve

comparison tests/test-single-head-obsolescence-topic-B2.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 df773a9bed0c
children b1d010b2e6c4
comparison
equal deleted inserted replaced
6185:74a61e0dc9da 6186:c915d9441654
77 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 77 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
78 $ hg topic topic-X 78 $ hg topic topic-X
79 marked working directory as topic: topic-X 79 marked working directory as topic: topic-X
80 $ mkcommit B1 80 $ mkcommit B1
81 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` 81 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
82 1 new obsolescence markers
83 obsoleted 1 changesets 82 obsoleted 1 changesets
84 2 new orphan changesets 83 2 new orphan changesets
85 $ hg log -G --hidden 84 $ hg log -G --hidden
86 @ 5a4735b75167 [default:topic-X] (draft): B1 85 @ 5a4735b75167 [default:topic-X] (draft): B1
87 | 86 |
105 pushing to $TESTTMP/B2/server 104 pushing to $TESTTMP/B2/server
106 searching for changes 105 searching for changes
107 adding changesets 106 adding changesets
108 adding manifests 107 adding manifests
109 adding file changes 108 adding file changes
109 added 1 changesets with 1 changes to 1 files (+1 heads)
110 1 new obsolescence markers
110 transaction abort! 111 transaction abort!
111 rollback completed 112 rollback completed
112 abort: rejecting multiple heads on branch "default:topic-X" 113 abort: rejecting multiple heads on branch "default:topic-X"
113 (2 heads: 5a47a98cd8e5 5a4735b75167) 114 (2 heads: 5a47a98cd8e5 5a4735b75167)
114 [255] 115 [255]