Show More
| @@ -29,3 +29,23 b' changeset 3:4cbb1e70196a backs out chang' | |||||
| 29 | the backout changeset is a new head - do not forget to merge |
|
29 | the backout changeset is a new head - do not forget to merge | |
| 30 | (use "backout -m" if you want to auto-merge) |
|
30 | (use "backout -m" if you want to auto-merge) | |
| 31 | b: No such file or directory |
|
31 | b: No such file or directory | |
|
|
32 | adding a | |||
|
|
33 | adding b | |||
|
|
34 | adding c | |||
|
|
35 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
|
36 | adding d | |||
|
|
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
|
38 | (branch merge, don't forget to commit) | |||
|
|
39 | # backout of merge should fail | |||
|
|
40 | abort: cannot back out a merge changeset without --parent | |||
|
|
41 | # backout of merge with bad parent should fail | |||
|
|
42 | abort: cb9a9f314b8b is not a parent of b2f3bb92043e | |||
|
|
43 | # backout of non-merge with parent should fail | |||
|
|
44 | abort: cannot use --parent on non-merge changeset | |||
|
|
45 | # backout with valid parent should be ok | |||
|
|
46 | removing d | |||
|
|
47 | changeset 5:11fbd9be634c backs out changeset 4:b2f3bb92043e | |||
|
|
48 | rolling back last transaction | |||
|
|
49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
|
50 | removing c | |||
|
|
51 | changeset 5:1a5f1a63bf2c backs out changeset 4:b2f3bb92043e | |||
General Comments 0
You need to be logged in to leave comments.
Login now