equal
deleted
inserted
replaced
40 |
40 |
41 $ echo bar > d |
41 $ echo bar > d |
42 $ hg amend |
42 $ hg amend |
43 |
43 |
44 $ hg up c41c793e0ef1 --hidden |
44 $ hg up c41c793e0ef1 --hidden |
45 updating to a hidden changeset c41c793e0ef1 |
|
46 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
|
47 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
48 working directory parent is obsolete! (c41c793e0ef1) |
46 working directory parent is obsolete! (c41c793e0ef1) |
49 (use 'hg evolve' to update to its successor: e49523854bc8) |
47 (use 'hg evolve' to update to its successor: e49523854bc8) |
50 |
48 |
51 $ echo foobar > d |
49 $ echo foobar > d |
52 $ hg amend |
50 $ hg amend |
53 2 new content-divergent changesets |
51 2 new content-divergent changesets |
54 $ hg glog --hidden |
52 $ hg glog --hidden |
55 @ 6:9c1631e352d9 added d |
53 @ 6:9c1631e352d9 added d |
56 | () draft |
54 | () draft |
57 | * 5:e49523854bc8 added d |
55 | o 5:e49523854bc8 added d |
58 |/ () draft |
56 |/ () draft |
59 | x 4:c41c793e0ef1 added d |
57 | x 4:c41c793e0ef1 added d |
60 |/ () draft |
58 |/ () draft |
61 o 3:ca1b80f7960a added c |
59 o 3:ca1b80f7960a added c |
62 | () draft |
60 | () draft |
83 working directory is now at 9c1631e352d9 |
81 working directory is now at 9c1631e352d9 |
84 |
82 |
85 $ hg glog --hidden |
83 $ hg glog --hidden |
86 @ 6:9c1631e352d9 added d |
84 @ 6:9c1631e352d9 added d |
87 | () draft |
85 | () draft |
88 | * 5:e49523854bc8 added d |
86 | o 5:e49523854bc8 added d |
89 |/ () draft |
87 |/ () draft |
90 | x 4:c41c793e0ef1 added d |
88 | x 4:c41c793e0ef1 added d |
91 |/ () draft |
89 |/ () draft |
92 o 3:ca1b80f7960a added c |
90 o 3:ca1b80f7960a added c |
93 | () draft |
91 | () draft |
106 rebasing 6:9c1631e352d9 "added d" (tip) |
104 rebasing 6:9c1631e352d9 "added d" (tip) |
107 |
105 |
108 $ hg glog |
106 $ hg glog |
109 @ 7:517d4375cb72 added d |
107 @ 7:517d4375cb72 added d |
110 | () draft |
108 | () draft |
111 | * 5:e49523854bc8 added d |
109 | o 5:e49523854bc8 added d |
112 | | () draft |
110 | | () draft |
113 | o 3:ca1b80f7960a added c |
111 | o 3:ca1b80f7960a added c |
114 | | () draft |
112 | | () draft |
115 | o 2:b1661037fa25 added b |
113 | o 2:b1661037fa25 added b |
116 |/ () draft |
114 |/ () draft |
137 working directory is now at 517d4375cb72 |
135 working directory is now at 517d4375cb72 |
138 |
136 |
139 $ hg glog |
137 $ hg glog |
140 @ 7:517d4375cb72 added d |
138 @ 7:517d4375cb72 added d |
141 | () draft |
139 | () draft |
142 | * 5:e49523854bc8 added d |
140 | o 5:e49523854bc8 added d |
143 | | () draft |
141 | | () draft |
144 | o 3:ca1b80f7960a added c |
142 | o 3:ca1b80f7960a added c |
145 | | () draft |
143 | | () draft |
146 | o 2:b1661037fa25 added b |
144 | o 2:b1661037fa25 added b |
147 |/ () draft |
145 |/ () draft |
158 $ hg add c |
156 $ hg add c |
159 $ hg amend |
157 $ hg amend |
160 $ hg glog |
158 $ hg glog |
161 @ 8:8fd1c4bd144c added d |
159 @ 8:8fd1c4bd144c added d |
162 | () draft |
160 | () draft |
163 | * 5:e49523854bc8 added d |
161 | o 5:e49523854bc8 added d |
164 | | () draft |
162 | | () draft |
165 | o 3:ca1b80f7960a added c |
163 | o 3:ca1b80f7960a added c |
166 | | () draft |
164 | | () draft |
167 | o 2:b1661037fa25 added b |
165 | o 2:b1661037fa25 added b |
168 |/ () draft |
166 |/ () draft |
201 stopped the interrupted evolve |
199 stopped the interrupted evolve |
202 working directory is now at ca1b80f7960a |
200 working directory is now at ca1b80f7960a |
203 |
201 |
204 XXX: we should have preserved the wdir to be at rev 8 |
202 XXX: we should have preserved the wdir to be at rev 8 |
205 $ hg glog |
203 $ hg glog |
206 * 8:8fd1c4bd144c added d |
204 o 8:8fd1c4bd144c added d |
207 | () draft |
205 | () draft |
208 | * 5:e49523854bc8 added d |
206 | o 5:e49523854bc8 added d |
209 | | () draft |
207 | | () draft |
210 | @ 3:ca1b80f7960a added c |
208 | @ 3:ca1b80f7960a added c |
211 | | () draft |
209 | | () draft |
212 | o 2:b1661037fa25 added b |
210 | o 2:b1661037fa25 added b |
213 |/ () draft |
211 |/ () draft |