249 $ glog --hidden |
249 $ glog --hidden |
250 o 6:ba0ec09b1bab@default(draft) a nifty feature |
250 o 6:ba0ec09b1bab@default(draft) a nifty feature |
251 | |
251 | |
252 | x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc |
252 | x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc |
253 | | |
253 | | |
254 | | o 4:207cbc4ea7fe@default(draft) another feature |
254 | | o 4:6992c59c6b06@default(draft) another feature (child of 568a468b60fc) |
255 | |/ |
255 | |/ |
256 | | x 3:5bb880fc0f12@default(draft) temporary amend commit for 7b36850622b2 |
256 | | x 3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a |
257 | | | |
257 | | | |
258 | | x 2:7b36850622b2@default(draft) another feature |
258 | | x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc) |
259 | |/ |
259 | |/ |
260 | x 1:568a468b60fc@default(draft) a nifty feature |
260 | x 1:568a468b60fc@default(draft) a nifty feature |
261 |/ |
261 |/ |
262 @ 0:e55e0562ee93@default(public) base |
262 @ 0:e55e0562ee93@default(public) base |
263 |
263 |
264 $ hg debugobsolete |
264 $ hg debugobsolete |
265 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 207cbc4ea7fee30d18b3a25f534fe5db22c6071b 0 (*) {'user': 'test'} (glob) |
265 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'user': 'test'} (glob) |
266 5bb880fc0f12dd61eee6de36f62b93fdbc3684b0 0 {7b36850622b2fd159fa30a4fb2a1edd2043b4a14} (*) {'user': 'test'} (glob) |
266 c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'user': 'test'} (glob) |
267 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'user': 'test'} (glob) |
267 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'user': 'test'} (glob) |
268 c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob) |
268 c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob) |
269 $ hg evolve |
269 $ hg evolve |
270 move:[4] another feature |
270 move:[4] another feature (child of 568a468b60fc) |
271 atop:[6] a nifty feature |
271 atop:[6] a nifty feature |
272 merging main-file-1 |
272 merging main-file-1 |
273 working directory is now at abe98aeaaa35 |
273 working directory is now at 5b410c3ae5af |
274 $ hg log |
274 $ hg log |
275 7 feature-B: another feature - test |
275 7 feature-B: another feature (child of 568a468b60fc) - test |
276 6 feature-A: a nifty feature - test |
276 6 feature-A: a nifty feature - test |
277 0 : base - test |
277 0 : base - test |
278 |
278 |
279 Test commit -o options |
279 Test commit -o options |
280 |
280 |
307 | |
307 | |
308 o 0 : base - test |
308 o 0 : base - test |
309 |
309 |
310 $ hg evolve --any --traceback |
310 $ hg evolve --any --traceback |
311 recreate:[8] another feature that rox |
311 recreate:[8] another feature that rox |
312 atop:[7] another feature |
312 atop:[7] another feature (child of 568a468b60fc) |
313 computing new diff |
313 computing new diff |
314 committed as ca3b75e3e59b |
314 committed as 8234cfce9af9 |
315 working directory is now at ca3b75e3e59b |
315 working directory is now at 8234cfce9af9 |
316 $ hg glog |
316 $ hg glog |
317 @ 9 feature-B: bumped update to abe98aeaaa35: - test |
317 @ 9 feature-B: bumped update to 5b410c3ae5af: - test |
318 | |
318 | |
319 o 7 : another feature - test |
319 o 7 : another feature (child of 568a468b60fc) - test |
320 | |
320 | |
321 o 6 feature-A: a nifty feature - test |
321 o 6 feature-A: a nifty feature - test |
322 | |
322 | |
323 o 0 : base - test |
323 o 0 : base - test |
324 |
324 |