equal
deleted
inserted
replaced
90 update: 1 new changesets (update) |
90 update: 1 new changesets (update) |
91 |
91 |
92 should fail |
92 should fail |
93 |
93 |
94 $ hg backout 1 |
94 $ hg backout 1 |
95 abort: cannot backout change on a different branch |
95 abort: cannot backout change that is not an ancestor |
96 [255] |
96 [255] |
97 $ echo c > c |
97 $ echo c > c |
98 $ hg ci -Am2 |
98 $ hg ci -Am2 |
99 adding c |
99 adding c |
100 created new head |
100 created new head |
106 update: 1 new changesets, 2 branch heads (merge) |
106 update: 1 new changesets, 2 branch heads (merge) |
107 |
107 |
108 should fail |
108 should fail |
109 |
109 |
110 $ hg backout 1 |
110 $ hg backout 1 |
111 abort: cannot backout change on a different branch |
111 abort: cannot backout change that is not an ancestor |
112 [255] |
112 [255] |
113 $ hg summary |
113 $ hg summary |
114 parent: 2:db815d6d32e6 tip |
114 parent: 2:db815d6d32e6 tip |
115 2 |
115 2 |
116 branch: default |
116 branch: default |