60 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e |
60 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e |
61 rolling back last transaction |
61 rolling back last transaction |
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63 removing c |
63 removing c |
64 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e |
64 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e |
|
65 # named branches |
|
66 adding default |
|
67 marked working directory as branch branch1 |
|
68 adding file1 |
|
69 marked working directory as branch branch2 |
|
70 adding file2 |
|
71 removing file1 |
|
72 changeset 3:f1c642b1d8e5 backs out changeset 1:bf1602f437f3 |
|
73 the backout changeset is a new head - do not forget to merge |
|
74 (use "backout --merge" if you want to auto-merge) |
|
75 % on branch2 with branch1 not merged, so file1 should still exist: |
|
76 45bbcd363bf0 (branch2) |
|
77 C default |
|
78 C file1 |
|
79 C file2 |
|
80 % on branch2 with branch1 merged, so file1 should be gone: |
|
81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
82 (branch merge, don't forget to commit) |
|
83 21d4dc6f9a41 (branch2) tip |
|
84 C default |
|
85 C file2 |
|
86 % on branch1, so no file1 and file2: |
|
87 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
88 f1c642b1d8e5 (branch1) |
|
89 C default |