equal
deleted
inserted
replaced
17 cat: a: No such file or directory |
17 cat: a: No such file or directory |
18 # across branch |
18 # across branch |
19 adding a |
19 adding a |
20 adding b |
20 adding b |
21 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
22 abort: cannot back out change on a different branch |
22 abort: cannot backout change on a different branch |
23 adding c |
23 adding c |
24 created new head |
24 created new head |
25 abort: cannot back out change on a different branch |
25 abort: cannot backout change on a different branch |
26 # backout with merge |
26 # backout with merge |
27 adding a |
27 adding a |
28 reverting a |
28 reverting a |
29 created new head |
29 created new head |
30 changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182 |
30 changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182 |
52 adding d |
52 adding d |
53 created new head |
53 created new head |
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
55 (branch merge, don't forget to commit) |
55 (branch merge, don't forget to commit) |
56 # backout of merge should fail |
56 # backout of merge should fail |
57 abort: cannot back out a merge changeset without --parent |
57 abort: cannot backout a merge changeset without --parent |
58 # backout of merge with bad parent should fail |
58 # backout of merge with bad parent should fail |
59 abort: cb9a9f314b8b is not a parent of b2f3bb92043e |
59 abort: cb9a9f314b8b is not a parent of b2f3bb92043e |
60 # backout of non-merge with parent should fail |
60 # backout of non-merge with parent should fail |
61 abort: cannot use --parent on non-merge changeset |
61 abort: cannot use --parent on non-merge changeset |
62 # backout with valid parent should be ok |
62 # backout with valid parent should be ok |