245 4 feature-B: another feature - test |
244 4 feature-B: another feature - test |
246 1 : a nifty feature - test |
245 1 : a nifty feature - test |
247 0 : base - test |
246 0 : base - test |
248 $ hg up -q 0 |
247 $ hg up -q 0 |
249 $ glog --hidden |
248 $ glog --hidden |
250 o 6:23409eba69a0@default(draft) a nifty feature |
249 o 6:ba0ec09b1bab@default(draft) a nifty feature |
251 | |
250 | |
252 | x 5:1c85604a32e4@default(draft) amends 568a468b60fc99a42d5d4ddbe181caff1eef308d |
251 | x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc |
253 | | |
252 | | |
254 | | o 4:f8111a076f09@default(draft) another feature |
253 | | o 4:207cbc4ea7fe@default(draft) another feature |
255 | |/ |
254 | |/ |
256 | | x 3:80ebe8e4ea86@default(draft) amends 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 |
255 | | x 3:5bb880fc0f12@default(draft) temporary amend commit for 7b36850622b2 |
257 | | | |
256 | | | |
258 | | x 2:7b36850622b2@default(draft) another feature |
257 | | x 2:7b36850622b2@default(draft) another feature |
259 | |/ |
258 | |/ |
260 | x 1:568a468b60fc@default(draft) a nifty feature |
259 | x 1:568a468b60fc@default(draft) a nifty feature |
261 |/ |
260 |/ |
262 @ 0:e55e0562ee93@default(public) base |
261 @ 0:e55e0562ee93@default(public) base |
263 |
262 |
264 $ hg debugobsolete |
263 $ hg debugobsolete |
265 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
264 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 207cbc4ea7fee30d18b3a25f534fe5db22c6071b 0 {'date': '* *', 'user': 'test'} (glob) |
266 80ebe8e4ea869802d88c96622bed8ad34aff9d37 0 {'date': '* *', 'user': 'test'} (glob) |
265 5bb880fc0f12dd61eee6de36f62b93fdbc3684b0 0 {'date': '* *', 'user': 'test'} (glob) |
267 568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) |
266 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 {'date': '* *', 'user': 'test'} (glob) |
268 1c85604a32e4fec7b2d804c6f8cbaf4de9925ee3 0 {'date': '* *', 'user': 'test'} (glob) |
267 c296b79833d1d497f33144786174bf35e04e44a3 0 {'date': '* *', 'user': 'test'} (glob) |
269 $ hg evolve |
268 $ hg evolve |
270 move:[4] another feature |
269 move:[4] another feature |
271 atop:[6] a nifty feature |
270 atop:[6] a nifty feature |
272 merging main-file-1 |
271 merging main-file-1 |
273 $ hg log |
272 $ hg log |
308 |
307 |
309 $ hg evolve --any --traceback |
308 $ hg evolve --any --traceback |
310 recreate:[8] another feature that rox |
309 recreate:[8] another feature that rox |
311 atop:[7] another feature |
310 atop:[7] another feature |
312 computing new diff |
311 computing new diff |
313 commited as d3c9b3a5c458 |
312 commited as ca3b75e3e59b |
314 $ hg glog |
313 $ hg glog |
315 @ 9 feature-B: bumped update to 5f4744038ed5: - test |
314 @ 9 feature-B: bumped update to abe98aeaaa35: - test |
316 | |
315 | |
317 o 7 : another feature - test |
316 o 7 : another feature - test |
318 | |
317 | |
319 o 6 feature-A: a nifty feature - test |
318 o 6 feature-A: a nifty feature - test |
320 | |
319 | |