344 (amend of on ancestors) |
344 (amend of on ancestors) |
345 |
345 |
346 $ hg amend |
346 $ hg amend |
347 1 new orphan changesets |
347 1 new orphan changesets |
348 $ hg log |
348 $ hg log |
349 6 feature-A: a nifty feature - test |
349 4 feature-A: a nifty feature - test |
350 4 feature-B: another feature (child of 568a468b60fc) - test |
350 3 feature-B: another feature (child of 568a468b60fc) - test |
351 1 : a nifty feature - test |
351 1 : a nifty feature - test |
352 0 : base - test |
352 0 : base - test |
353 $ hg up -q 0 |
353 $ hg up -q 0 |
354 $ glog --hidden |
354 $ glog --hidden |
355 o 6:ba0ec09b1bab@default(draft) a nifty feature |
355 o 4:ba0ec09b1bab@default(draft) a nifty feature |
356 | |
356 | |
357 | x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc |
357 | o 3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc) |
358 | | |
358 | | |
359 | | o 4:6992c59c6b06@default(draft) another feature (child of 568a468b60fc) |
|
360 | |/ |
|
361 | | x 3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a |
|
362 | | | |
|
363 | | x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc) |
359 | | x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc) |
364 | |/ |
360 | |/ |
365 | x 1:568a468b60fc@default(draft) a nifty feature |
361 | x 1:568a468b60fc@default(draft) a nifty feature |
366 |/ |
362 |/ |
367 @ 0:e55e0562ee93@default(public) base |
363 @ 0:e55e0562ee93@default(public) base |
368 |
364 |
369 $ hg debugobsolete |
365 $ hg debugobsolete |
370 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
366 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
371 c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'ef1': '0', 'user': 'test'} (glob) |
|
372 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
367 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
373 c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'ef1': '0', 'user': 'test'} (glob) |
|
374 $ hg evolve |
368 $ hg evolve |
375 move:[4] another feature (child of 568a468b60fc) |
369 move:[3] another feature (child of 568a468b60fc) |
376 atop:[6] a nifty feature |
370 atop:[4] a nifty feature |
377 merging main-file-1 |
371 merging main-file-1 |
378 working directory is now at 99833d22b0c6 |
372 working directory is now at 99833d22b0c6 |
379 $ hg log |
373 $ hg log |
380 7 feature-B: another feature (child of ba0ec09b1bab) - test |
374 5 feature-B: another feature (child of ba0ec09b1bab) - test |
381 6 feature-A: a nifty feature - test |
375 4 feature-A: a nifty feature - test |
382 0 : base - test |
376 0 : base - test |
383 |
377 |
384 Test commit -o options |
378 Test commit -o options |
385 |
379 |
386 $ hg up 6 |
380 $ hg up -r "desc('a nifty feature')" |
387 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
381 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
388 $ hg revert -r 7 --all |
382 $ hg revert -r "desc('another feature')" --all |
389 adding file-from-B |
383 adding file-from-B |
390 reverting main-file-1 |
384 reverting main-file-1 |
391 $ sed -i'' -e s/Zwei/deux/ main-file-1 |
385 $ sed -i'' -e s/Zwei/deux/ main-file-1 |
392 $ hg commit -m 'another feature that rox' -o 7 |
386 $ hg commit -m 'another feature that rox' -o 5 |
393 created new head |
387 created new head |
394 $ hg log |
388 $ hg log |
395 8 feature-B: another feature that rox - test |
389 6 feature-B: another feature that rox - test |
396 6 feature-A: a nifty feature - test |
390 4 feature-A: a nifty feature - test |
397 0 : base - test |
391 0 : base - test |
398 |
392 |
399 phase change turning obsolete changeset public issue a bumped warning |
393 phase change turning obsolete changeset public issue a bumped warning |
400 |
394 |
401 $ hg phase --hidden --public 7 |
395 $ hg phase --hidden --public 99833d22b0c6 |
402 1 new phase-divergent changesets |
396 1 new phase-divergent changesets |
403 |
397 |
404 all solving bumped troubled |
398 all solving bumped troubled |
405 |
399 |
406 $ hg log -G |
400 $ glog |
407 @ 8 feature-B: another feature that rox - test |
401 @ 6:47d52a103155@default(draft) another feature that rox |
408 | |
402 | |
409 | o 7 : another feature (child of ba0ec09b1bab) - test |
403 | o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab) |
410 |/ |
404 |/ |
411 o 6 feature-A: a nifty feature - test |
405 o 4:ba0ec09b1bab@default(public) a nifty feature |
412 | |
406 | |
413 o 0 : base - test |
407 o 0:e55e0562ee93@default(public) base |
414 |
408 |
415 $ hg evolve --any --traceback --phasedivergent |
409 $ hg evolve --any --traceback --phasedivergent |
416 recreate:[8] another feature that rox |
410 recreate:[6] another feature that rox |
417 atop:[7] another feature (child of ba0ec09b1bab) |
411 atop:[5] another feature (child of ba0ec09b1bab) |
418 computing new diff |
412 computing new diff |
419 committed as 6707c5e1c49d |
413 committed as 6707c5e1c49d |
420 working directory is now at 6707c5e1c49d |
414 working directory is now at 6707c5e1c49d |
421 $ hg log -G |
415 $ glog |
422 @ 9 feature-B: bumped update to 99833d22b0c6: - test |
416 @ 7:6707c5e1c49d@default(draft) bumped update to 99833d22b0c6: |
423 | |
417 | |
424 o 7 : another feature (child of ba0ec09b1bab) - test |
418 o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab) |
425 | |
419 | |
426 o 6 feature-A: a nifty feature - test |
420 o 4:ba0ec09b1bab@default(public) a nifty feature |
427 | |
421 | |
428 o 0 : base - test |
422 o 0:e55e0562ee93@default(public) base |
429 |
423 |
430 $ hg diff --hidden -r 9 -r 8 |
424 $ hg diff --hidden -r 6707c5e1c49d -r 47d52a103155 |
431 $ hg diff -r 9^ -r 9 |
425 $ hg diff -r 6707c5e1c49d^ -r 6707c5e1c49d |
432 diff --git a/main-file-1 b/main-file-1 |
426 diff --git a/main-file-1 b/main-file-1 |
433 --- a/main-file-1 |
427 --- a/main-file-1 |
434 +++ b/main-file-1 |
428 +++ b/main-file-1 |
435 @@ -3,1 +3,1 @@ |
429 @@ -3,1 +3,1 @@ |
436 -Zwei |
430 -Zwei |
440 test evolve --all |
434 test evolve --all |
441 $ sed -i'' -e s/deux/to/ main-file-1 |
435 $ sed -i'' -e s/deux/to/ main-file-1 |
442 $ hg commit -m 'dansk 2!' |
436 $ hg commit -m 'dansk 2!' |
443 $ sed -i'' -e s/Three/tre/ main-file-1 |
437 $ sed -i'' -e s/Three/tre/ main-file-1 |
444 $ hg commit -m 'dansk 3!' |
438 $ hg commit -m 'dansk 3!' |
445 $ hg update 9 |
439 $ hg update 6707c5e1c49d |
446 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
440 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
447 $ sed -i'' -e s/Un/Én/ main-file-1 |
441 $ sed -i'' -e s/Un/Én/ main-file-1 |
448 $ hg commit --amend -m 'dansk!' |
442 $ hg commit --amend -m 'dansk!' |
449 2 new orphan changesets |
443 2 new orphan changesets |
450 |
444 |
451 (ninja test for the {trouble} template: |
445 (ninja test for the {trouble} template: |
452 |
446 |
453 $ hg log -G --template '{rev} {troubles}\n' |
447 $ hg log -G --template '{rev} {troubles}\n' |
454 @ 13 |
448 @ 10 |
455 | |
449 | |
456 | o 11 orphan |
450 | o 9 orphan |
457 | | |
451 | | |
458 | o 10 orphan |
452 | o 8 orphan |
459 | | |
453 | | |
460 | x 9 |
454 | x 7 |
461 |/ |
455 |/ |
462 o 7 |
456 o 5 |
463 | |
457 | |
464 o 6 |
458 o 4 |
465 | |
459 | |
466 o 0 |
460 o 0 |
467 |
461 |
468 |
462 |
469 |
463 |
470 (/ninja) |
464 (/ninja) |
471 |
465 |
472 $ hg evolve --all --traceback |
466 $ hg evolve --all --traceback |
473 move:[10] dansk 2! |
467 move:[8] dansk 2! |
474 atop:[13] dansk! |
468 atop:[10] dansk! |
475 merging main-file-1 |
469 merging main-file-1 |
476 move:[11] dansk 3! |
470 move:[9] dansk 3! |
477 atop:[14] dansk 2! |
471 atop:[11] dansk 2! |
478 merging main-file-1 |
472 merging main-file-1 |
479 working directory is now at 68557e4f0048 |
473 working directory is now at 68557e4f0048 |
480 $ hg log -G |
474 $ hg log -G |
481 @ 15 : dansk 3! - test |
475 @ 12 : dansk 3! - test |
482 | |
476 | |
483 o 14 : dansk 2! - test |
477 o 11 : dansk 2! - test |
484 | |
478 | |
485 o 13 feature-B: dansk! - test |
479 o 10 feature-B: dansk! - test |
486 | |
480 | |
487 o 7 : another feature (child of ba0ec09b1bab) - test |
481 o 5 : another feature (child of ba0ec09b1bab) - test |
488 | |
482 | |
489 o 6 feature-A: a nifty feature - test |
483 o 4 feature-A: a nifty feature - test |
490 | |
484 | |
491 o 0 : base - test |
485 o 0 : base - test |
492 |
486 |
493 |
487 |
494 $ cd .. |
488 $ cd .. |
930 $ hg up 'desc(a1)' |
924 $ hg up 'desc(a1)' |
931 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
925 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
932 $ hg amend -m 'a1_' |
926 $ hg amend -m 'a1_' |
933 2 new orphan changesets |
927 2 new orphan changesets |
934 $ hg evolve |
928 $ hg evolve |
935 move:[5] a2 |
929 move:[4] a2 |
936 atop:[7] a1_ |
930 atop:[6] a1_ |
937 working directory is now at eb07e22a0e63 |
931 working directory is now at eb07e22a0e63 |
938 $ hg evolve |
932 $ hg evolve |
939 move:[6] a3 |
933 move:[5] a3 |
940 atop:[8] a2 |
934 atop:[7] a2 |
941 working directory is now at 777c26ca5e78 |
935 working directory is now at 777c26ca5e78 |
942 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
936 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
943 @ 9 [mybranch] a3 |
937 @ 8 [mybranch] a3 |
944 | |
938 | |
945 o 8 [mybranch] a2 |
939 o 7 [mybranch] a2 |
946 | |
940 | |
947 o 7 [default] a1_ |
941 o 6 [default] a1_ |
948 | |
942 | |
949 o 0 [default] a0 |
943 o 0 [default] a0 |
950 |
944 |
951 |
945 |
952 Evolve from the middle of a stack pick the right changesets. |
946 Evolve from the middle of a stack pick the right changesets. |
953 |
947 |
954 $ hg up 7 |
948 $ hg up -r "desc('a1_')" |
955 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
949 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
956 $ hg ci --amend -m 'a1__' |
950 $ hg ci --amend -m 'a1__' |
957 2 new orphan changesets |
951 2 new orphan changesets |
958 |
952 |
959 $ hg up 8 |
953 $ hg up -r "desc('a2')" |
960 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
954 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
961 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
955 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
962 o 10 [default] a1__ |
956 o 9 [default] a1__ |
963 | |
957 | |
964 | o 9 [mybranch] a3 |
958 | o 8 [mybranch] a3 |
965 | | |
959 | | |
966 | @ 8 [mybranch] a2 |
960 | @ 7 [mybranch] a2 |
967 | | |
961 | | |
968 | x 7 [default] a1_ |
962 | x 6 [default] a1_ |
969 |/ |
963 |/ |
970 o 0 [default] a0 |
964 o 0 [default] a0 |
971 |
965 |
972 $ hg evolve |
966 $ hg evolve |
973 nothing to evolve on current working copy parent |
967 nothing to evolve on current working copy parent |
975 [2] |
969 [2] |
976 |
970 |
977 |
971 |
978 Evolve disables active bookmarks. |
972 Evolve disables active bookmarks. |
979 |
973 |
980 $ hg up 10 |
974 $ hg up -r "desc('a1__')" |
981 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
975 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
982 $ hg bookmark testbookmark |
976 $ hg bookmark testbookmark |
983 $ ls .hg/bookmarks* |
977 $ ls .hg/bookmarks* |
984 .hg/bookmarks |
978 .hg/bookmarks |
985 .hg/bookmarks.* (glob) |
979 .hg/bookmarks.* (glob) |
986 $ hg evolve |
980 $ hg evolve |
987 move:[8] a2 |
981 move:[7] a2 |
988 atop:[10] a1__ |
982 atop:[9] a1__ |
989 (leaving bookmark testbookmark) |
983 (leaving bookmark testbookmark) |
990 working directory is now at d952e93add6f |
984 working directory is now at d952e93add6f |
991 $ ls .hg/bookmarks* |
985 $ ls .hg/bookmarks* |
992 .hg/bookmarks |
986 .hg/bookmarks |
|
987 $ glog |
|
988 @ 10:d952e93add6f@mybranch(draft) a2 |
|
989 | |
|
990 o 9:9f8b83c2e7f3@default(draft) a1__ |
|
991 | |
|
992 | o 8:777c26ca5e78@mybranch(draft) a3 |
|
993 | | |
|
994 | x 7:eb07e22a0e63@mybranch(draft) a2 |
|
995 | | |
|
996 | x 6:faafc6cea0ba@default(draft) a1_ |
|
997 |/ |
|
998 o 0:07c1c36d9ef0@default(draft) a0 |
|
999 |
993 |
1000 |
994 Possibility to select what trouble to solve first, asking for bumped before |
1001 Possibility to select what trouble to solve first, asking for bumped before |
995 divergent |
1002 divergent |
996 $ hg up 10 |
1003 $ hg up -r "desc('a1__')" |
997 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1004 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
998 $ hg revert -r 11 --all |
1005 $ hg revert -r d952e93add6f --all |
999 reverting a |
1006 reverting a |
1000 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
1007 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
1001 o 11 [mybranch] a2 |
1008 o 10 [mybranch] a2 |
1002 | |
1009 | |
1003 @ 10 [default] a1__ |
1010 @ 9 [default] a1__ |
1004 | |
1011 | |
1005 | o 9 [mybranch] a3 |
1012 | o 8 [mybranch] a3 |
1006 | | |
1013 | | |
1007 | x 8 [mybranch] a2 |
1014 | x 7 [mybranch] a2 |
1008 | | |
1015 | | |
1009 | x 7 [default] a1_ |
1016 | x 6 [default] a1_ |
1010 |/ |
1017 |/ |
1011 o 0 [default] a0 |
1018 o 0 [default] a0 |
1012 |
1019 |
1013 $ echo "hello world" > newfile |
1020 $ echo "hello world" > newfile |
1014 $ hg add newfile |
1021 $ hg add newfile |
1015 $ hg commit -m "add new file bumped" -o 11 |
1022 $ hg commit -m "add new file bumped" -o 10 |
1016 $ hg phase --public --hidden 11 |
1023 $ hg phase --public --hidden d952e93add6f |
1017 1 new phase-divergent changesets |
1024 1 new phase-divergent changesets |
1018 $ hg log -G |
1025 $ hg log -G |
1019 @ 12 : add new file bumped - test |
1026 @ 11 : add new file bumped - test |
1020 | |
1027 | |
1021 | o 11 : a2 - test |
1028 | o 10 : a2 - test |
1022 |/ |
1029 |/ |
1023 o 10 testbookmark: a1__ - test |
1030 o 9 testbookmark: a1__ - test |
1024 | |
1031 | |
1025 | o 9 : a3 - test |
1032 | o 8 : a3 - test |
1026 | | |
1033 | | |
1027 | x 8 : a2 - test |
1034 | x 7 : a2 - test |
1028 | | |
1035 | | |
1029 | x 7 : a1_ - test |
1036 | x 6 : a1_ - test |
1030 |/ |
1037 |/ |
1031 o 0 : a0 - test |
1038 o 0 : a0 - test |
1032 |
1039 |
1033 |
1040 |
1034 Now we have a bumped and an unstable changeset, we solve the bumped first |
1041 Now we have a bumped and an unstable changeset, we solve the bumped first |
1035 normally the unstable changeset would be solve first |
1042 normally the unstable changeset would be solve first |
1036 |
1043 |
1037 $ hg log -G |
1044 $ hg log -G |
1038 @ 12 : add new file bumped - test |
1045 @ 11 : add new file bumped - test |
1039 | |
1046 | |
1040 | o 11 : a2 - test |
1047 | o 10 : a2 - test |
1041 |/ |
1048 |/ |
1042 o 10 testbookmark: a1__ - test |
1049 o 9 testbookmark: a1__ - test |
1043 | |
1050 | |
1044 | o 9 : a3 - test |
1051 | o 8 : a3 - test |
1045 | | |
1052 | | |
1046 | x 8 : a2 - test |
1053 | x 7 : a2 - test |
1047 | | |
1054 | | |
1048 | x 7 : a1_ - test |
1055 | x 6 : a1_ - test |
1049 |/ |
1056 |/ |
1050 o 0 : a0 - test |
1057 o 0 : a0 - test |
1051 |
1058 |
1052 $ hg evolve -r 12 --phasedivergent |
1059 $ hg evolve -r "desc('add new file bumped')" --phasedivergent |
1053 recreate:[12] add new file bumped |
1060 recreate:[11] add new file bumped |
1054 atop:[11] a2 |
1061 atop:[10] a2 |
1055 computing new diff |
1062 computing new diff |
1056 committed as f15d32934071 |
1063 committed as f15d32934071 |
1057 working directory is now at f15d32934071 |
1064 working directory is now at f15d32934071 |
1058 $ hg evolve --any |
1065 $ hg evolve --any |
1059 move:[9] a3 |
1066 move:[8] a3 |
1060 atop:[13] bumped update to d952e93add6f: |
1067 atop:[12] bumped update to d952e93add6f: |
1061 working directory is now at cce26b684bfe |
1068 working directory is now at cce26b684bfe |
|
1069 $ glog |
|
1070 @ 13:cce26b684bfe@default(draft) a3 |
|
1071 | |
|
1072 o 12:f15d32934071@default(draft) bumped update to d952e93add6f: |
|
1073 | |
|
1074 o 10:d952e93add6f@mybranch(public) a2 |
|
1075 | |
|
1076 o 9:9f8b83c2e7f3@default(public) a1__ |
|
1077 | |
|
1078 o 0:07c1c36d9ef0@default(public) a0 |
|
1079 |
|
1080 |
1062 Check that we can resolve troubles in a revset with more than one commit |
1081 Check that we can resolve troubles in a revset with more than one commit |
1063 $ hg up 14 -C |
1082 $ hg up cce26b684bfe -C |
1064 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1083 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1065 $ mkcommit gg |
1084 $ mkcommit gg |
1066 $ hg up 14 |
1085 $ hg up cce26b684bfe |
1067 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1086 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1068 $ mkcommit gh |
1087 $ mkcommit gh |
1069 created new head |
1088 created new head |
1070 $ hg up 14 |
1089 $ hg up cce26b684bfe |
1071 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1090 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1072 $ printf "newline\nnewline\n" >> a |
1091 $ printf "newline\nnewline\n" >> a |
1073 $ hg log -G |
1092 $ hg log -G |
1074 o 16 : add gh - test |
1093 o 15 : add gh - test |
1075 | |
1094 | |
1076 | o 15 : add gg - test |
1095 | o 14 : add gg - test |
1077 |/ |
1096 |/ |
1078 @ 14 : a3 - test |
1097 @ 13 : a3 - test |
1079 | |
1098 | |
1080 o 13 : bumped update to d952e93add6f: - test |
1099 o 12 : bumped update to d952e93add6f: - test |
1081 | |
1100 | |
1082 o 11 : a2 - test |
1101 o 10 : a2 - test |
1083 | |
1102 | |
1084 o 10 testbookmark: a1__ - test |
1103 o 9 testbookmark: a1__ - test |
1085 | |
1104 | |
1086 o 0 : a0 - test |
1105 o 0 : a0 - test |
1087 |
1106 |
1088 $ hg amend |
1107 $ hg amend |
1089 2 new orphan changesets |
1108 2 new orphan changesets |
1090 $ hg log -G |
1109 $ glog |
1091 @ 18 : a3 - test |
1110 @ 16:edc3c9de504e@default(draft) a3 |
1092 | |
1111 | |
1093 | o 16 : add gh - test |
1112 | o 15:beb41503aa3e@default(draft) add gh |
1094 | | |
1113 | | |
1095 | | o 15 : add gg - test |
1114 | | o 14:27247fcb2df6@default(draft) add gg |
1096 | |/ |
1115 | |/ |
1097 | x 14 : a3 - test |
1116 | x 13:cce26b684bfe@default(draft) a3 |
1098 |/ |
1117 |/ |
1099 o 13 : bumped update to d952e93add6f: - test |
1118 o 12:f15d32934071@default(draft) bumped update to d952e93add6f: |
1100 | |
1119 | |
1101 o 11 : a2 - test |
1120 o 10:d952e93add6f@mybranch(public) a2 |
1102 | |
1121 | |
1103 o 10 testbookmark: a1__ - test |
1122 o 9:9f8b83c2e7f3@default(public) a1__ |
1104 | |
1123 | |
1105 o 0 : a0 - test |
1124 o 0:07c1c36d9ef0@default(public) a0 |
1106 |
1125 |
1107 |
1126 |
1108 Evolving an empty revset should do nothing |
1127 Evolving an empty revset should do nothing |
1109 $ hg evolve --rev "16 and 15" |
1128 $ hg evolve --rev "beb41503aa3e and 27247fcb2df6" |
1110 set of specified revisions is empty |
1129 set of specified revisions is empty |
1111 [1] |
1130 [1] |
1112 |
1131 |
1113 $ hg evolve --rev "14::" --phasedivergent |
1132 $ hg evolve --rev "cce26b684bfe::" --phasedivergent |
1114 no phasedivergent changesets in specified revisions |
1133 no phasedivergent changesets in specified revisions |
1115 (do you want to use --orphan) |
1134 (do you want to use --orphan) |
1116 [2] |
1135 [2] |
1117 $ hg evolve --rev "14::" --orphan |
1136 $ hg evolve --rev "cce26b684bfe::" --orphan |
1118 move:[15] add gg |
1137 move:[14] add gg |
1119 atop:[18] a3 |
1138 atop:[16] a3 |
1120 move:[16] add gh |
1139 move:[15] add gh |
1121 atop:[18] a3 |
1140 atop:[16] a3 |
1122 working directory is now at e02107f98737 |
1141 working directory is now at e02107f98737 |
1123 $ hg log -G |
1142 $ glog |
1124 @ 20 : add gh - test |
1143 @ 18:e02107f98737@default(draft) add gh |
1125 | |
1144 | |
1126 | o 19 : add gg - test |
1145 | o 17:24e63b319adf@default(draft) add gg |
1127 |/ |
1146 |/ |
1128 o 18 : a3 - test |
1147 o 16:edc3c9de504e@default(draft) a3 |
1129 | |
1148 | |
1130 o 13 : bumped update to d952e93add6f: - test |
1149 o 12:f15d32934071@default(draft) bumped update to d952e93add6f: |
1131 | |
1150 | |
1132 o 11 : a2 - test |
1151 o 10:d952e93add6f@mybranch(public) a2 |
1133 | |
1152 | |
1134 o 10 testbookmark: a1__ - test |
1153 o 9:9f8b83c2e7f3@default(public) a1__ |
1135 | |
1154 | |
1136 o 0 : a0 - test |
1155 o 0:07c1c36d9ef0@default(public) a0 |
1137 |
1156 |
1138 Enabling commands selectively, no command enabled, next and fold and unknown |
1157 Enabling commands selectively, no command enabled, next and fold and unknown |
1139 $ cat >> $HGRCPATH <<EOF |
1158 $ cat >> $HGRCPATH <<EOF |
1140 > [experimental] |
1159 > [experimental] |
1141 > evolution=createmarkers |
1160 > evolution=createmarkers |
1235 > [experimental] |
1254 > [experimental] |
1236 > evolution=all |
1255 > evolution=all |
1237 > EOF |
1256 > EOF |
1238 |
1257 |
1239 Check hg evolve --rev on singled out commit |
1258 Check hg evolve --rev on singled out commit |
1240 $ hg up 19 -C |
1259 $ hg up 24e63b319adf -C |
1241 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1260 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1242 $ mkcommit j1 |
1261 $ mkcommit j1 |
1243 $ mkcommit j2 |
1262 $ mkcommit j2 |
1244 $ mkcommit j3 |
1263 $ mkcommit j3 |
1245 $ hg up .^^ |
1264 $ hg up .^^ |
1246 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1265 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1247 $ echo "hello" > j4 |
1266 $ echo "hello" > j4 |
1248 $ hg add j4 |
1267 $ hg add j4 |
1249 $ hg amend |
1268 $ hg amend |
1250 2 new orphan changesets |
1269 2 new orphan changesets |
1251 $ glog -r "18::" |
1270 $ glog -r "edc3c9de504e::" |
1252 @ 25:8dc373be86d9@default(draft) add j1 |
1271 @ 22:8dc373be86d9@default(draft) add j1 |
1253 | |
1272 | |
1254 | o 23:d7eadcf6eccd@default(draft) add j3 |
1273 | o 21:d7eadcf6eccd@default(draft) add j3 |
1255 | | |
1274 | | |
1256 | o 22:2223ea564144@default(draft) add j2 |
1275 | o 20:2223ea564144@default(draft) add j2 |
1257 | | |
1276 | | |
1258 | x 21:48490698b269@default(draft) add j1 |
1277 | x 19:48490698b269@default(draft) add j1 |
1259 |/ |
1278 |/ |
1260 | o 20:e02107f98737@default(draft) add gh |
1279 | o 18:e02107f98737@default(draft) add gh |
1261 | | |
1280 | | |
1262 o | 19:24e63b319adf@default(draft) add gg |
1281 o | 17:24e63b319adf@default(draft) add gg |
1263 |/ |
1282 |/ |
1264 o 18:edc3c9de504e@default(draft) a3 |
1283 o 16:edc3c9de504e@default(draft) a3 |
1265 | |
1284 | |
1266 ~ |
1285 ~ |
1267 |
1286 |
1268 $ hg evolve --rev 23 --any |
1287 $ hg evolve --rev d7eadcf6eccd --any |
1269 abort: cannot specify both "--rev" and "--any" |
1288 abort: cannot specify both "--rev" and "--any" |
1270 [255] |
1289 [255] |
1271 $ hg evolve --rev 23 |
1290 $ hg evolve --rev d7eadcf6eccd |
1272 cannot solve instability of d7eadcf6eccd, skipping |
1291 cannot solve instability of d7eadcf6eccd, skipping |
1273 |
1292 |
1274 Check that uncommit respects the allowunstable option |
1293 Check that uncommit respects the allowunstable option |
1275 With only createmarkers we can only uncommit on a head |
1294 With only createmarkers we can only uncommit on a head |
1276 $ cat >> $HGRCPATH <<EOF |
1295 $ cat >> $HGRCPATH <<EOF |
1286 $ hg up 8dc373be86d9 |
1305 $ hg up 8dc373be86d9 |
1287 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1306 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1288 $ hg uncommit --all |
1307 $ hg uncommit --all |
1289 new changeset is empty |
1308 new changeset is empty |
1290 (use 'hg prune .' to remove it) |
1309 (use 'hg prune .' to remove it) |
1291 $ glog -r "18::" |
1310 $ glog -r "edc3c9de504e::" |
1292 @ 26:044804d0c10d@default(draft) add j1 |
1311 @ 23:044804d0c10d@default(draft) add j1 |
1293 | |
1312 | |
1294 | o 23:d7eadcf6eccd@default(draft) add j3 |
1313 | o 21:d7eadcf6eccd@default(draft) add j3 |
1295 | | |
1314 | | |
1296 | o 22:2223ea564144@default(draft) add j2 |
1315 | o 20:2223ea564144@default(draft) add j2 |
1297 | | |
1316 | | |
1298 | x 21:48490698b269@default(draft) add j1 |
1317 | x 19:48490698b269@default(draft) add j1 |
1299 |/ |
1318 |/ |
1300 | o 20:e02107f98737@default(draft) add gh |
1319 | o 18:e02107f98737@default(draft) add gh |
1301 | | |
1320 | | |
1302 o | 19:24e63b319adf@default(draft) add gg |
1321 o | 17:24e63b319adf@default(draft) add gg |
1303 |/ |
1322 |/ |
1304 o 18:edc3c9de504e@default(draft) a3 |
1323 o 16:edc3c9de504e@default(draft) a3 |
1305 | |
1324 | |
1306 ~ |
1325 ~ |
1307 |
1326 |
1308 Check that prune respects the allowunstable option |
1327 Check that prune respects the allowunstable option |
1309 $ hg up -C . |
1328 $ hg up -C . |
1310 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1329 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1311 $ hg up 20 |
1330 $ hg up e02107f98737 |
1312 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1331 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1313 $ hg evolve --all |
1332 $ hg evolve --all |
1314 nothing to evolve on current working copy parent |
1333 nothing to evolve on current working copy parent |
1315 (2 other orphan in the repository, do you want --any or --rev) |
1334 (2 other orphan in the repository, do you want --any or --rev) |
1316 [2] |
1335 [2] |
1317 $ hg evolve --all --any |
1336 $ hg evolve --all --any |
1318 move:[22] add j2 |
1337 move:[20] add j2 |
1319 atop:[26] add j1 |
1338 atop:[23] add j1 |
1320 move:[23] add j3 |
1339 move:[21] add j3 |
1321 atop:[27] add j2 |
1340 atop:[24] add j2 |
1322 working directory is now at c9a20e2d74aa |
1341 working directory is now at c9a20e2d74aa |
1323 $ glog -r "18::" |
1342 $ glog -r "edc3c9de504e::" |
1324 @ 28:c9a20e2d74aa@default(draft) add j3 |
1343 @ 25:c9a20e2d74aa@default(draft) add j3 |
1325 | |
1344 | |
1326 o 27:b0e3066231e2@default(draft) add j2 |
1345 o 24:b0e3066231e2@default(draft) add j2 |
1327 | |
1346 | |
1328 o 26:044804d0c10d@default(draft) add j1 |
1347 o 23:044804d0c10d@default(draft) add j1 |
1329 | |
1348 | |
1330 | o 20:e02107f98737@default(draft) add gh |
1349 | o 18:e02107f98737@default(draft) add gh |
1331 | | |
1350 | | |
1332 o | 19:24e63b319adf@default(draft) add gg |
1351 o | 17:24e63b319adf@default(draft) add gg |
1333 |/ |
1352 |/ |
1334 o 18:edc3c9de504e@default(draft) a3 |
1353 o 16:edc3c9de504e@default(draft) a3 |
1335 | |
1354 | |
1336 ~ |
1355 ~ |
1337 $ hg up 19 |
1356 $ hg up 24e63b319adf |
1338 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1357 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1339 $ mkcommit c5_ |
1358 $ mkcommit c5_ |
1340 created new head |
1359 created new head |
1341 $ hg prune '26 + 27' |
1360 $ hg prune '044804d0c10d + b0e3066231e2' |
1342 abort: touch will orphan 1 descendants |
1361 abort: touch will orphan 1 descendants |
1343 (see 'hg help evolution.instability') |
1362 (see 'hg help evolution.instability') |
1344 [255] |
1363 [255] |
1345 $ hg prune '19::28' |
1364 $ hg prune '24e63b319adf::c9a20e2d74aa' |
1346 abort: touch will orphan 1 descendants |
1365 abort: touch will orphan 1 descendants |
1347 (see 'hg help evolution.instability') |
1366 (see 'hg help evolution.instability') |
1348 [255] |
1367 [255] |
1349 $ hg prune '26::' |
1368 $ hg prune '044804d0c10d::' |
1350 3 changesets pruned |
1369 3 changesets pruned |
1351 $ glog -r "18::" |
1370 $ glog -r "edc3c9de504e::" |
1352 @ 29:2251801b6c91@default(draft) add c5_ |
1371 @ 26:2251801b6c91@default(draft) add c5_ |
1353 | |
1372 | |
1354 | o 20:e02107f98737@default(draft) add gh |
1373 | o 18:e02107f98737@default(draft) add gh |
1355 | | |
1374 | | |
1356 o | 19:24e63b319adf@default(draft) add gg |
1375 o | 17:24e63b319adf@default(draft) add gg |
1357 |/ |
1376 |/ |
1358 o 18:edc3c9de504e@default(draft) a3 |
1377 o 16:edc3c9de504e@default(draft) a3 |
1359 | |
1378 | |
1360 ~ |
1379 ~ |
1361 |
1380 |
1362 Check that fold respects the allowunstable option |
1381 Check that fold respects the allowunstable option |
1363 |
1382 |
1365 |
1384 |
1366 $ hg up edc3c9de504e |
1385 $ hg up edc3c9de504e |
1367 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1386 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1368 $ mkcommit unstableifparentisfolded |
1387 $ mkcommit unstableifparentisfolded |
1369 created new head |
1388 created new head |
1370 $ glog -r "18::" |
1389 $ glog -r "edc3c9de504e::" |
1371 @ 30:68330ac625b8@default(draft) add unstableifparentisfolded |
1390 @ 27:68330ac625b8@default(draft) add unstableifparentisfolded |
1372 | |
1391 | |
1373 | o 29:2251801b6c91@default(draft) add c5_ |
1392 | o 26:2251801b6c91@default(draft) add c5_ |
1374 | | |
1393 | | |
1375 +---o 20:e02107f98737@default(draft) add gh |
1394 +---o 18:e02107f98737@default(draft) add gh |
1376 | | |
1395 | | |
1377 | o 19:24e63b319adf@default(draft) add gg |
1396 | o 17:24e63b319adf@default(draft) add gg |
1378 |/ |
1397 |/ |
1379 o 18:edc3c9de504e@default(draft) a3 |
1398 o 16:edc3c9de504e@default(draft) a3 |
1380 | |
1399 | |
1381 ~ |
1400 ~ |
1382 |
1401 |
1383 $ hg fold --exact "19::" |
1402 $ hg fold --exact "24e63b319adf::" |
1384 2 changesets folded |
1403 2 changesets folded |
1385 |
1404 |
1386 Check that evolve shows error while handling split commits |
1405 Check that evolve shows error while handling split commits |
1387 -------------------------------------- |
1406 -------------------------------------- |
1388 |
1407 |
1389 $ cat >> $HGRCPATH <<EOF |
1408 $ cat >> $HGRCPATH <<EOF |
1390 > [experimental] |
1409 > [experimental] |
1391 > evolution=all |
1410 > evolution=all |
1392 > EOF |
1411 > EOF |
1393 |
1412 |
1394 $ glog -r "18::" |
1413 $ glog -r "edc3c9de504e::" |
1395 o 31:580886d07058@default(draft) add gg |
1414 o 28:580886d07058@default(draft) add gg |
1396 | |
1415 | |
1397 | @ 30:68330ac625b8@default(draft) add unstableifparentisfolded |
1416 | @ 27:68330ac625b8@default(draft) add unstableifparentisfolded |
1398 |/ |
1417 |/ |
1399 | o 20:e02107f98737@default(draft) add gh |
1418 | o 18:e02107f98737@default(draft) add gh |
1400 |/ |
1419 |/ |
1401 o 18:edc3c9de504e@default(draft) a3 |
1420 o 16:edc3c9de504e@default(draft) a3 |
1402 | |
1421 | |
1403 ~ |
1422 ~ |
1404 |
1423 |
1405 Create a split commit |
1424 Create a split commit |
1406 $ printf "oo" > oo; |
1425 $ printf "oo" > oo; |
1407 $ printf "pp" > pp; |
1426 $ printf "pp" > pp; |
1408 $ hg add oo pp |
1427 $ hg add oo pp |
1409 $ hg commit -m "oo+pp" |
1428 $ hg commit -m "oo+pp" |
1410 $ mkcommit uu |
1429 $ mkcommit uu |
1411 $ hg up 30 |
1430 $ hg up 68330ac625b8 |
1412 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
1431 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
1413 $ printf "oo" > oo; |
1432 $ printf "oo" > oo; |
1414 $ hg add oo |
1433 $ hg add oo |
1415 $ hg commit -m "_oo" |
1434 $ hg commit -m "_oo" |
1416 created new head |
1435 created new head |
1418 $ hg add pp |
1437 $ hg add pp |
1419 $ hg commit -m "_pp" |
1438 $ hg commit -m "_pp" |
1420 $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split |
1439 $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split |
1421 1 changesets pruned |
1440 1 changesets pruned |
1422 1 new orphan changesets |
1441 1 new orphan changesets |
1423 $ glog -r "18::" |
1442 $ glog -r "edc3c9de504e::" |
1424 @ 35:7a555adf2b4a@default(draft) _pp |
1443 @ 32:7a555adf2b4a@default(draft) _pp |
1425 | |
1444 | |
1426 o 34:2be4d2d5bf34@default(draft) _oo |
1445 o 31:2be4d2d5bf34@default(draft) _oo |
1427 | |
1446 | |
1428 | o 33:53f0c003e03e@default(draft) add uu |
1447 | o 30:53f0c003e03e@default(draft) add uu |
1429 | | |
1448 | | |
1430 | x 32:1bf2152f4f82@default(draft) oo+pp |
1449 | x 29:1bf2152f4f82@default(draft) oo+pp |
1431 |/ |
1450 |/ |
1432 | o 31:580886d07058@default(draft) add gg |
1451 | o 28:580886d07058@default(draft) add gg |
1433 | | |
1452 | | |
1434 o | 30:68330ac625b8@default(draft) add unstableifparentisfolded |
1453 o | 27:68330ac625b8@default(draft) add unstableifparentisfolded |
1435 |/ |
1454 |/ |
1436 | o 20:e02107f98737@default(draft) add gh |
1455 | o 18:e02107f98737@default(draft) add gh |
1437 |/ |
1456 |/ |
1438 o 18:edc3c9de504e@default(draft) a3 |
1457 o 16:edc3c9de504e@default(draft) a3 |
1439 | |
1458 | |
1440 ~ |
1459 ~ |
1441 $ hg evolve --rev "18::" |
1460 $ hg evolve --rev "edc3c9de504e::" |
1442 move:[33] add uu |
1461 move:[30] add uu |
1443 atop:[35] _pp |
1462 atop:[32] _pp |
1444 working directory is now at 43c3f5ef149f |
1463 working directory is now at 43c3f5ef149f |
1445 |
1464 |
1446 |
1465 |
1447 Check that dirstate changes are kept at failure for conflicts (issue4966) |
1466 Check that dirstate changes are kept at failure for conflicts (issue4966) |
1448 ---------------------------------------- |
1467 ---------------------------------------- |
1449 |
1468 |
1450 $ echo "will be amended" > newfile |
1469 $ echo "will be amended" > newfile |
1451 $ hg commit -m "will be amended" |
1470 $ hg commit -m "will be amended" |
1452 $ hg parents |
1471 $ hg parents |
1453 37 : will be amended - test |
1472 34 : will be amended - test |
1454 |
1473 |
1455 $ echo "will be evolved safely" >> a |
1474 $ echo "will be evolved safely" >> a |
1456 $ hg commit -m "will be evolved safely" |
1475 $ hg commit -m "will be evolved safely" |
1457 |
1476 |
1458 $ echo "will cause conflict at evolve" > newfile |
1477 $ echo "will cause conflict at evolve" > newfile |
1459 $ echo "newly added" > newlyadded |
1478 $ echo "newly added" > newlyadded |
1460 $ hg add newlyadded |
1479 $ hg add newlyadded |
1461 $ hg commit -m "will cause conflict at evolve" |
1480 $ hg commit -m "will cause conflict at evolve" |
1462 |
1481 |
1463 $ hg update -q 37 |
1482 $ glog -r "edc3c9de504e::" |
|
1483 @ 36:02e943732647@default(draft) will cause conflict at evolve |
|
1484 | |
|
1485 o 35:f8e30e9317aa@default(draft) will be evolved safely |
|
1486 | |
|
1487 o 34:36030b147271@default(draft) will be amended |
|
1488 | |
|
1489 o 33:43c3f5ef149f@default(draft) add uu |
|
1490 | |
|
1491 o 32:7a555adf2b4a@default(draft) _pp |
|
1492 | |
|
1493 o 31:2be4d2d5bf34@default(draft) _oo |
|
1494 | |
|
1495 | o 28:580886d07058@default(draft) add gg |
|
1496 | | |
|
1497 o | 27:68330ac625b8@default(draft) add unstableifparentisfolded |
|
1498 |/ |
|
1499 | o 18:e02107f98737@default(draft) add gh |
|
1500 |/ |
|
1501 o 16:edc3c9de504e@default(draft) a3 |
|
1502 | |
|
1503 ~ |
|
1504 |
|
1505 $ hg update -q 36030b147271 |
1464 $ echo "amended" > newfile |
1506 $ echo "amended" > newfile |
1465 $ hg amend -m "amended" |
1507 $ hg amend -m "amended" |
1466 2 new orphan changesets |
1508 2 new orphan changesets |
1467 |
1509 |
1468 $ hg evolve --rev "37::" |
1510 $ hg evolve --rev "36030b147271::" |
1469 move:[38] will be evolved safely |
1511 move:[35] will be evolved safely |
1470 atop:[41] amended |
1512 atop:[37] amended |
1471 move:[39] will cause conflict at evolve |
1513 move:[36] will cause conflict at evolve |
1472 atop:[42] will be evolved safely |
1514 atop:[38] will be evolved safely |
1473 merging newfile |
1515 merging newfile |
1474 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') |
1516 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') |
1475 evolve failed! |
1517 evolve failed! |
1476 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
1518 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
1477 abort: unresolved merge conflicts (see hg help resolve) |
1519 abort: unresolved merge conflicts (see hg help resolve) |
1478 [255] |
1520 [255] |
1479 |
1521 |
1480 $ glog -r "36::" --hidden |
1522 $ glog -r "43c3f5ef149f::" --hidden |
1481 @ 42:c904da5245b0@default(draft) will be evolved safely |
1523 @ 38:c904da5245b0@default(draft) will be evolved safely |
1482 | |
1524 | |
1483 o 41:34ae045ec400@default(draft) amended |
1525 o 37:34ae045ec400@default(draft) amended |
1484 | |
1526 | |
1485 | x 40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271 |
1527 | o 36:02e943732647@default(draft) will cause conflict at evolve |
1486 | | |
1528 | | |
1487 | | o 39:02e943732647@default(draft) will cause conflict at evolve |
1529 | x 35:f8e30e9317aa@default(draft) will be evolved safely |
1488 | | | |
1530 | | |
1489 | | x 38:f8e30e9317aa@default(draft) will be evolved safely |
1531 | x 34:36030b147271@default(draft) will be amended |
1490 | |/ |
1532 |/ |
1491 | x 37:36030b147271@default(draft) will be amended |
1533 o 33:43c3f5ef149f@default(draft) add uu |
1492 |/ |
|
1493 o 36:43c3f5ef149f@default(draft) add uu |
|
1494 | |
1534 | |
1495 ~ |
1535 ~ |
1496 |
1536 |
1497 $ hg status newlyadded |
1537 $ hg status newlyadded |
1498 A newlyadded |
1538 A newlyadded |