Mercurial > evolve

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