Show More
@@ -1,31 +1,51 b'' | |||
|
1 | 1 | # basic operation |
|
2 | 2 | adding a |
|
3 | 3 | reverting a |
|
4 | 4 | changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 |
|
5 | 5 | a |
|
6 | 6 | # file that was removed is recreated |
|
7 | 7 | adding a |
|
8 | 8 | adding a |
|
9 | 9 | changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 |
|
10 | 10 | content |
|
11 | 11 | # backout of backout is as if nothing happened |
|
12 | 12 | removing a |
|
13 | 13 | changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a |
|
14 | 14 | cat: a: No such file or directory |
|
15 | 15 | # backout with merge |
|
16 | 16 | adding a |
|
17 | 17 | reverting a |
|
18 | 18 | changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 |
|
19 | 19 | merging with changeset 2:b66ea5b77abb |
|
20 | 20 | merging a |
|
21 | 21 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
22 | 22 | (branch merge, don't forget to commit) |
|
23 | 23 | line 1 |
|
24 | 24 | # backout should not back out subsequent changesets |
|
25 | 25 | adding a |
|
26 | 26 | adding b |
|
27 | 27 | reverting a |
|
28 | 28 | changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5 |
|
29 | 29 | the backout changeset is a new head - do not forget to merge |
|
30 | 30 | (use "backout -m" if you want to auto-merge) |
|
31 | 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