Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 45242:5780a04a1b46
merge stable in default
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 31 Jul 2020 17:09:31 +0530 |
parents | a253ded5b03d 0ea08126a2af |
children | 1f5c548f15e5 |
comparison
equal
deleted
inserted
replaced
45241:e0bfde04f957 | 45242:5780a04a1b46 |
---|---|
961 | | | 961 | | |
962 o | 1: 6f252845ea45 'a' | 962 o | 1: 6f252845ea45 'a' |
963 |/ | 963 |/ |
964 o 0: d20a80d4def3 'base' | 964 o 0: d20a80d4def3 'base' |
965 | 965 |
966 | |
967 $ cd .. | |
968 | |
969 Test (virtual) working directory without changes, created by merge conflict | |
970 resolution. There was a regression where the file was incorrectly detected as | |
971 changed although the file contents were the same as in the parent. | |
972 | |
973 $ hg init nofilechanges | |
974 $ cd nofilechanges | |
975 $ echo a > a; hg add a; hg ci -m a | |
976 $ echo foo > test; hg add test; hg ci -m b | |
977 $ hg up 0 -q | |
978 $ echo bar > test; hg add test; hg ci -m c | |
979 created new head | |
980 $ hg rebase -d 2 -d 1 --tool :local | |
981 rebasing 2:ca2749322ee5 "c" (tip) | |
982 note: not rebasing 2:ca2749322ee5 "c" (tip), its destination already has all its changes | |
983 saved backup bundle to $TESTTMP/nofilechanges/.hg/strip-backup/ca2749322ee5-6dc7e94b-rebase.hg |