Mercurial > evolve

comparison tests/test-single-head-obsolescence-named-branch-A2.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 b20d04641c0f
children df773a9bed0c
comparison
equal deleted inserted replaced
5233:6434f3c4f7aa 5234:35e769c9604f
70 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 70 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
71 $ mkcommit B1 71 $ mkcommit B1
72 created new head 72 created new head
73 (consider using topic for lightweight branches. See 'hg help topic') 73 (consider using topic for lightweight branches. See 'hg help topic')
74 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 74 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
75 1 new obsolescence markers
76 obsoleted 1 changesets 75 obsoleted 1 changesets
77 2 new orphan changesets 76 2 new orphan changesets
78 $ hg log -G --hidden 77 $ hg log -G --hidden
79 @ 25c56d33e4c4 [default] (draft): B1 78 @ 25c56d33e4c4 [default] (draft): B1
80 | 79 |
98 pushing to $TESTTMP/A2/server 97 pushing to $TESTTMP/A2/server
99 searching for changes 98 searching for changes
100 adding changesets 99 adding changesets
101 adding manifests 100 adding manifests
102 adding file changes 101 adding file changes
102 added 1 changesets with 1 changes to 1 files (+1 heads)
103 1 new obsolescence markers
103 transaction abort! 104 transaction abort!
104 rollback completed 105 rollback completed
105 abort: rejecting multiple heads on branch "default" 106 abort: rejecting multiple heads on branch "default"
106 (2 heads: 8aaa48160adc 25c56d33e4c4) 107 (2 heads: 8aaa48160adc 25c56d33e4c4)
107 [255] 108 [255]