equal
deleted
inserted
replaced
170 recreate:[9] newer a |
170 recreate:[9] newer a |
171 atop:[6] newer a |
171 atop:[6] newer a |
172 perform evolve? [Ny] y |
172 perform evolve? [Ny] y |
173 rebasing to destination parent: 66719795a494 |
173 rebasing to destination parent: 66719795a494 |
174 computing new diff |
174 computing new diff |
175 committed as c2c1151aa854 |
175 committed as 8c986e77913c |
176 working directory is now at c2c1151aa854 |
176 working directory is now at 8c986e77913c |
177 $ glog |
177 $ glog |
178 @ 11:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: |
178 @ 11:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
179 | |
179 | |
180 | o 7:7bc2f5967f5e@default(draft) bk:[] add c |
180 | o 7:7bc2f5967f5e@default(draft) bk:[] add c |
181 | | |
181 | | |
182 o | 6:1cf0aacfd363@default(public) bk:[] newer a |
182 o | 6:1cf0aacfd363@default(public) bk:[] newer a |
183 |/ |
183 |/ |
202 > EOF |
202 > EOF |
203 $ hg ci -m 'More addition' |
203 $ hg ci -m 'More addition' |
204 $ glog |
204 $ glog |
205 @ 12:3932c176bbaa@default(draft) bk:[] More addition |
205 @ 12:3932c176bbaa@default(draft) bk:[] More addition |
206 | |
206 | |
207 | o 11:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: |
207 | o 11:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
208 | | |
208 | | |
209 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
209 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
210 | | |
210 | | |
211 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
211 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
212 |/ |
212 |/ |
230 $ glog |
230 $ glog |
231 @ 14:eacc9c8240fe@default(draft) bk:[] More addition |
231 @ 14:eacc9c8240fe@default(draft) bk:[] More addition |
232 | |
232 | |
233 | * 13:d2f173e25686@default(draft) bk:[] More addition |
233 | * 13:d2f173e25686@default(draft) bk:[] More addition |
234 |/ |
234 |/ |
235 | o 11:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: |
235 | o 11:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
236 | | |
236 | | |
237 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
237 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
238 | | |
238 | | |
239 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
239 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
240 |/ |
240 |/ |
280 working directory is now at f344982e63c4 |
280 working directory is now at f344982e63c4 |
281 $ hg st |
281 $ hg st |
282 $ glog |
282 $ glog |
283 @ 15:f344982e63c4@default(draft) bk:[] More addition |
283 @ 15:f344982e63c4@default(draft) bk:[] More addition |
284 | |
284 | |
285 | o 11:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: |
285 | o 11:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
286 | | |
286 | | |
287 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
287 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
288 | | |
288 | | |
289 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
289 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
290 |/ |
290 |/ |