equal
deleted
inserted
replaced
129 $ hg amend |
129 $ hg amend |
130 |
130 |
131 Make precursors public |
131 Make precursors public |
132 |
132 |
133 $ hg phase --public 8 |
133 $ hg phase --public 8 |
134 1 new latecomer changesets |
134 1 new bumped changesets |
135 $ glog |
135 $ glog |
136 @ 12:15c83af6f3a3@default(draft) bk:[] newer a |
136 @ 12:15c83af6f3a3@default(draft) bk:[] newer a |
137 | |
137 | |
138 o 9:355c5cda4de1@default(draft) bk:[] add c |
138 o 9:355c5cda4de1@default(draft) bk:[] add c |
139 | |
139 | |
150 recreate:[12] newer a |
150 recreate:[12] newer a |
151 atop:[8] newer a |
151 atop:[8] newer a |
152 hg rebase --rev 15c83af6f3a3 --dest e8cc1b534401; |
152 hg rebase --rev 15c83af6f3a3 --dest e8cc1b534401; |
153 hg update e3183e9c0961; |
153 hg update e3183e9c0961; |
154 hg revert --all --rev 15c83af6f3a3; |
154 hg revert --all --rev 15c83af6f3a3; |
155 hg commit --msg "latecomer update to %s" (no-eol) |
155 hg commit --msg "bumped update to %s" (no-eol) |
156 $ hg evolve --any |
156 $ hg evolve --any |
157 recreate:[12] newer a |
157 recreate:[12] newer a |
158 atop:[8] newer a |
158 atop:[8] newer a |
159 rebasing to destination parent: e8cc1b534401 |
159 rebasing to destination parent: e8cc1b534401 |
160 computing new diff |
160 computing new diff |
161 commited as 1d94fef80e85 |
161 commited as eeeb8f6e7648 |
162 $ glog |
162 $ glog |
163 @ 14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961: |
163 @ 14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961: |
164 | |
164 | |
165 | o 9:355c5cda4de1@default(draft) bk:[] add c |
165 | o 9:355c5cda4de1@default(draft) bk:[] add c |
166 | | |
166 | | |
167 o | 8:e3183e9c0961@default(public) bk:[] newer a |
167 o | 8:e3183e9c0961@default(public) bk:[] newer a |
168 |/ |
168 |/ |
188 $ hg ci -m 'More addition' |
188 $ hg ci -m 'More addition' |
189 created new head |
189 created new head |
190 $ glog |
190 $ glog |
191 @ 15:7391601a4bfa@default(draft) bk:[] More addition |
191 @ 15:7391601a4bfa@default(draft) bk:[] More addition |
192 | |
192 | |
193 | o 14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961: |
193 | o 14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961: |
194 | | |
194 | | |
195 o | 9:355c5cda4de1@default(draft) bk:[] add c |
195 o | 9:355c5cda4de1@default(draft) bk:[] add c |
196 | | |
196 | | |
197 | o 8:e3183e9c0961@default(public) bk:[] newer a |
197 | o 8:e3183e9c0961@default(public) bk:[] newer a |
198 |/ |
198 |/ |
214 $ glog |
214 $ glog |
215 @ 19:3883461cc228@default(draft) bk:[] More addition |
215 @ 19:3883461cc228@default(draft) bk:[] More addition |
216 | |
216 | |
217 | o 17:4754d61bc2db@default(draft) bk:[] More addition |
217 | o 17:4754d61bc2db@default(draft) bk:[] More addition |
218 |/ |
218 |/ |
219 | o 14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961: |
219 | o 14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961: |
220 | | |
220 | | |
221 o | 9:355c5cda4de1@default(draft) bk:[] add c |
221 o | 9:355c5cda4de1@default(draft) bk:[] add c |
222 | | |
222 | | |
223 | o 8:e3183e9c0961@default(public) bk:[] newer a |
223 | o 8:e3183e9c0961@default(public) bk:[] newer a |
224 |/ |
224 |/ |
249 $ hg st |
249 $ hg st |
250 $ hg amend -d '0 0' -m 'More addition' # kill date variation XXX should be done in evolve |
250 $ hg amend -d '0 0' -m 'More addition' # kill date variation XXX should be done in evolve |
251 $ glog |
251 $ glog |
252 @ 22:ac6d600735a4@default(draft) bk:[] More addition |
252 @ 22:ac6d600735a4@default(draft) bk:[] More addition |
253 | |
253 | |
254 | o 14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961: |
254 | o 14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961: |
255 | | |
255 | | |
256 o | 9:355c5cda4de1@default(draft) bk:[] add c |
256 o | 9:355c5cda4de1@default(draft) bk:[] add c |
257 | | |
257 | | |
258 | o 8:e3183e9c0961@default(public) bk:[] newer a |
258 | o 8:e3183e9c0961@default(public) bk:[] newer a |
259 |/ |
259 |/ |