equal
deleted
inserted
replaced
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 (child of 568a468b60fc) |
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 5b410c3ae5af |
273 working directory is now at 5c9c8d9c2e4e |
274 $ hg log |
274 $ hg log |
275 7 feature-B: another feature (child of 568a468b60fc) - test |
275 7 feature-B: another feature (child of ba0ec09b1bab) - 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 |
299 all solving bumped troubled |
299 all solving bumped troubled |
300 |
300 |
301 $ hg glog |
301 $ hg glog |
302 @ 8 feature-B: another feature that rox - test |
302 @ 8 feature-B: another feature that rox - test |
303 | |
303 | |
304 | o 7 : another feature (child of 568a468b60fc) - test |
304 | o 7 : another feature (child of ba0ec09b1bab) - test |
305 |/ |
305 |/ |
306 o 6 feature-A: a nifty feature - test |
306 o 6 feature-A: a nifty feature - test |
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 (child of 568a468b60fc) |
312 atop:[7] another feature (child of ba0ec09b1bab) |
313 computing new diff |
313 computing new diff |
314 committed as 8234cfce9af9 |
314 committed as 476d0454d60e |
315 working directory is now at 8234cfce9af9 |
315 working directory is now at 476d0454d60e |
316 $ hg glog |
316 $ hg glog |
317 @ 9 feature-B: bumped update to 5b410c3ae5af: - test |
317 @ 9 feature-B: bumped update to 5c9c8d9c2e4e: - test |
318 | |
318 | |
319 o 7 : another feature (child of 568a468b60fc) - test |
319 o 7 : another feature (child of ba0ec09b1bab) - 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 |
369 atop:[13] dansk! |
369 atop:[13] dansk! |
370 merging main-file-1 |
370 merging main-file-1 |
371 move:[11] dansk 3! |
371 move:[11] dansk 3! |
372 atop:[14] dansk 2! |
372 atop:[14] dansk 2! |
373 merging main-file-1 |
373 merging main-file-1 |
374 working directory is now at e65e652e27bf |
374 working directory is now at cfb5ebed336d |
375 $ hg glog |
375 $ hg glog |
376 @ 15 : dansk 3! - test |
376 @ 15 : dansk 3! - test |
377 | |
377 | |
378 o 14 : dansk 2! - test |
378 o 14 : dansk 2! - test |
379 | |
379 | |
380 o 13 feature-B: dansk! - test |
380 o 13 feature-B: dansk! - test |
381 | |
381 | |
382 o 7 : another feature (child of 568a468b60fc) - test |
382 o 7 : another feature (child of ba0ec09b1bab) - test |
383 | |
383 | |
384 o 6 feature-A: a nifty feature - test |
384 o 6 feature-A: a nifty feature - test |
385 | |
385 | |
386 o 0 : base - test |
386 o 0 : base - test |
387 |
387 |
745 $ cd ../work |
745 $ cd ../work |
746 $ hg fold .^ --message "Folding with custom commit message" |
746 $ hg fold .^ --message "Folding with custom commit message" |
747 2 changesets folded |
747 2 changesets folded |
748 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
748 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
749 $ glog |
749 $ glog |
750 @ 16:d0aee199f74c@default(draft) Folding with custom commit message |
750 @ 16:d6239ff09c9f@default(draft) Folding with custom commit message |
751 | |
751 | |
752 o 13:b0258f43f9d0@default(draft) dansk! |
752 o 13:56ade053f46d@default(draft) dansk! |
753 | |
753 | |
754 o 7:5b410c3ae5af@default(public) another feature (child of 568a468b60fc) |
754 o 7:5c9c8d9c2e4e@default(public) another feature (child of ba0ec09b1bab) |
755 | |
755 | |
756 o 6:ba0ec09b1bab@default(public) a nifty feature |
756 o 6:ba0ec09b1bab@default(public) a nifty feature |
757 | |
757 | |
758 o 0:e55e0562ee93@default(public) base |
758 o 0:e55e0562ee93@default(public) base |
759 |
759 |
764 |
764 |
765 $ hg fold .^ --logfile commit-message |
765 $ hg fold .^ --logfile commit-message |
766 2 changesets folded |
766 2 changesets folded |
767 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
767 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
768 $ hg qlog |
768 $ hg qlog |
769 17 - bf2fd466ccd4 A longer |
769 17 - dba606655966 A longer |
770 commit message (draft) |
770 commit message (draft) |
771 7 - 5b410c3ae5af another feature (child of 568a468b60fc) (public) |
771 7 - 5c9c8d9c2e4e another feature (child of ba0ec09b1bab) (public) |
772 6 - ba0ec09b1bab a nifty feature (public) |
772 6 - ba0ec09b1bab a nifty feature (public) |
773 0 - e55e0562ee93 base (public) |
773 0 - e55e0562ee93 base (public) |