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