Mercurial > evolve

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