equal
deleted
inserted
replaced
922 date: Thu Jan 01 00:00:00 1970 +0000 |
922 date: Thu Jan 01 00:00:00 1970 +0000 |
923 summary: c_ROOT |
923 summary: c_ROOT |
924 |
924 |
925 $ cd .. |
925 $ cd .. |
926 |
926 |
927 Check error cases |
|
928 ================= |
|
929 |
|
930 $ hg clone rewind-testing-base rewind-testing-error |
|
931 updating to branch default |
|
932 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
933 $ cd rewind-testing-error |
|
934 |
|
935 Uncommited changes |
|
936 ------------------ |
|
937 |
|
938 $ echo C > C |
|
939 $ hg add C |
|
940 $ hg rewind |
|
941 abort: uncommitted changes |
|
942 [255] |
|
943 |
|
944 Merge commits |
927 Merge commits |
945 ------------- |
928 ============= |
|
929 |
|
930 $ hg clone -q rewind-testing-base rewind-merge |
|
931 $ cd rewind-merge |
946 |
932 |
947 $ hg up --clean .^ |
933 $ hg up --clean .^ |
948 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
934 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
949 $ echo foo > foo |
935 $ echo foo > foo |
950 $ hg ci -qAm foo |
936 $ hg ci -qAm foo |
963 A B |
949 A B |
964 |
950 |
965 $ hg rewind --from . |
951 $ hg rewind --from . |
966 rewinded to 1 changesets |
952 rewinded to 1 changesets |
967 (1 changesets obsoleted) |
953 (1 changesets obsoleted) |
968 working directory is now at 006fd8c2fed9 |
954 working directory is now at 9d325190bd87 |
969 $ hg st --change . |
955 $ hg st --change . |
970 A B |
956 A B |
971 |
957 |
972 $ hg glf -r '. + allpredecessors(.) + parents(.)' --hidden |
958 $ hg glf -r '. + allpredecessors(.) + parents(.)' --hidden |
973 @ 6: merge () |
959 @ 6: merge () |
974 |\ |
960 |\ |
975 +---x 5: merge, but foo is now bar (foo) |
961 +---x 5: merge, but foo is now bar (foo) |
976 | |/ |
962 | |/ |
977 +---x 4: merge () |
963 +---x 4: merge () |
978 | |/ |
964 | |/ |
979 | o 3: foo (C foo) |
965 | o 3: foo (foo) |
980 | | |
966 | | |
981 | ~ |
967 | ~ |
982 o 2: c_B0 (B) |
968 o 2: c_B0 (B) |
983 | |
969 | |
984 ~ |
970 ~ |
|
971 |
|
972 $ cd .. |