equal
deleted
inserted
replaced
342 |
342 |
343 |
343 |
344 (amend of on ancestors) |
344 (amend of on ancestors) |
345 |
345 |
346 $ hg amend |
346 $ hg amend |
347 1 new unstable changesets |
347 1 new orphan changesets |
348 $ hg log |
348 $ hg log |
349 6 feature-A: a nifty feature - test |
349 6 feature-A: a nifty feature - test |
350 4 feature-B: another feature (child of 568a468b60fc) - test |
350 4 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 |
444 $ hg commit -m 'dansk 3!' |
444 $ hg commit -m 'dansk 3!' |
445 $ hg update 9 |
445 $ hg update 9 |
446 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
446 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
447 $ sed -i'' -e s/Un/Én/ main-file-1 |
447 $ sed -i'' -e s/Un/Én/ main-file-1 |
448 $ hg commit --amend -m 'dansk!' |
448 $ hg commit --amend -m 'dansk!' |
449 2 new unstable changesets |
449 2 new orphan changesets |
450 |
450 |
451 (ninja test for the {trouble} template: |
451 (ninja test for the {trouble} template: |
452 |
452 |
453 $ hg log -G --template '{rev} {troubles}\n' |
453 $ hg log -G --template '{rev} {troubles}\n' |
454 @ 13 |
454 @ 13 |
829 adding b |
829 adding b |
830 $ hg mv a c |
830 $ hg mv a c |
831 $ hg ci -m c |
831 $ hg ci -m c |
832 $ hg prune .^ |
832 $ hg prune .^ |
833 1 changesets pruned |
833 1 changesets pruned |
834 1 new unstable changesets |
834 1 new orphan changesets |
835 $ hg stab --any |
835 $ hg stab --any |
836 move:[15] c |
836 move:[15] c |
837 atop:[13] a |
837 atop:[13] a |
838 working directory is now at 3742bde73477 |
838 working directory is now at 3742bde73477 |
839 $ hg st -C --change=tip |
839 $ hg st -C --change=tip |
906 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
906 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
907 $ hg branch mybranch |
907 $ hg branch mybranch |
908 marked working directory as branch mybranch |
908 marked working directory as branch mybranch |
909 (branches are permanent and global, did you want a bookmark?) |
909 (branches are permanent and global, did you want a bookmark?) |
910 $ hg amend |
910 $ hg amend |
911 1 new unstable changesets |
911 1 new orphan changesets |
912 |
912 |
913 $ hg evolve |
913 $ hg evolve |
914 move:[3] a3 |
914 move:[3] a3 |
915 atop:[5] a2 |
915 atop:[5] a2 |
916 working directory is now at 7c5649f73d11 |
916 working directory is now at 7c5649f73d11 |
928 branch change preserved |
928 branch change preserved |
929 |
929 |
930 $ hg up 'desc(a1)' |
930 $ hg up 'desc(a1)' |
931 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
931 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
932 $ hg amend -m 'a1_' |
932 $ hg amend -m 'a1_' |
933 2 new unstable changesets |
933 2 new orphan changesets |
934 $ hg evolve |
934 $ hg evolve |
935 move:[5] a2 |
935 move:[5] a2 |
936 atop:[7] a1_ |
936 atop:[7] a1_ |
937 working directory is now at eb07e22a0e63 |
937 working directory is now at eb07e22a0e63 |
938 $ hg evolve |
938 $ hg evolve |
952 Evolve from the middle of a stack pick the right changesets. |
952 Evolve from the middle of a stack pick the right changesets. |
953 |
953 |
954 $ hg up 7 |
954 $ hg up 7 |
955 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
955 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
956 $ hg ci --amend -m 'a1__' |
956 $ hg ci --amend -m 'a1__' |
957 2 new unstable changesets |
957 2 new orphan changesets |
958 |
958 |
959 $ hg up 8 |
959 $ hg up 8 |
960 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
960 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
961 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
961 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
962 o 10 [default] a1__ |
962 o 10 [default] a1__ |
1084 o 10 testbookmark: a1__ - test |
1084 o 10 testbookmark: a1__ - test |
1085 | |
1085 | |
1086 o 0 : a0 - test |
1086 o 0 : a0 - test |
1087 |
1087 |
1088 $ hg amend |
1088 $ hg amend |
1089 2 new unstable changesets |
1089 2 new orphan changesets |
1090 $ hg log -G |
1090 $ hg log -G |
1091 @ 18 : a3 - test |
1091 @ 18 : a3 - test |
1092 | |
1092 | |
1093 | o 16 : add gh - test |
1093 | o 16 : add gh - test |
1094 | | |
1094 | | |
1245 $ hg up .^^ |
1245 $ hg up .^^ |
1246 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1246 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1247 $ echo "hello" > j4 |
1247 $ echo "hello" > j4 |
1248 $ hg add j4 |
1248 $ hg add j4 |
1249 $ hg amend |
1249 $ hg amend |
1250 2 new unstable changesets |
1250 2 new orphan changesets |
1251 $ glog -r "18::" |
1251 $ glog -r "18::" |
1252 @ 25:8dc373be86d9@default(draft) add j1 |
1252 @ 25:8dc373be86d9@default(draft) add j1 |
1253 | |
1253 | |
1254 | o 23:d7eadcf6eccd@default(draft) add j3 |
1254 | o 23:d7eadcf6eccd@default(draft) add j3 |
1255 | | |
1255 | | |
1417 $ printf "pp" > pp; |
1417 $ printf "pp" > pp; |
1418 $ hg add pp |
1418 $ hg add pp |
1419 $ hg commit -m "_pp" |
1419 $ hg commit -m "_pp" |
1420 $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split |
1420 $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split |
1421 1 changesets pruned |
1421 1 changesets pruned |
1422 1 new unstable changesets |
1422 1 new orphan changesets |
1423 $ glog -r "18::" |
1423 $ glog -r "18::" |
1424 @ 35:7a555adf2b4a@default(draft) _pp |
1424 @ 35:7a555adf2b4a@default(draft) _pp |
1425 | |
1425 | |
1426 o 34:2be4d2d5bf34@default(draft) _oo |
1426 o 34:2be4d2d5bf34@default(draft) _oo |
1427 | |
1427 | |
1461 $ hg commit -m "will cause conflict at evolve" |
1461 $ hg commit -m "will cause conflict at evolve" |
1462 |
1462 |
1463 $ hg update -q 37 |
1463 $ hg update -q 37 |
1464 $ echo "amended" > newfile |
1464 $ echo "amended" > newfile |
1465 $ hg amend -m "amended" |
1465 $ hg amend -m "amended" |
1466 2 new unstable changesets |
1466 2 new orphan changesets |
1467 |
1467 |
1468 $ hg evolve --rev "37::" |
1468 $ hg evolve --rev "37::" |
1469 move:[38] will be evolved safely |
1469 move:[38] will be evolved safely |
1470 atop:[41] amended |
1470 atop:[41] amended |
1471 move:[39] will cause conflict at evolve |
1471 move:[39] will cause conflict at evolve |