Mercurial > evolve
changeset 2519:4b2e9674c0b7
effectflag: add a test for content detection
Add a test for diff detection when the diff is different but only because of
line numbers. The test is a append at the end of the file and we try to rebase
it. We shouldn't detect a content change, it will be done in the next patch.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Tue, 30 May 2017 11:38:30 +0200 |
| parents | 86f97e7c5aa5 |
| children | 5fb5d096348c |
| files | tests/test-evolve-effectflags.t |
| diffstat | 1 files changed, 47 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-effectflags.t Tue May 30 14:46:36 2017 +0200 +++ b/tests/test-evolve-effectflags.t Tue May 30 11:38:30 2017 +0200 @@ -152,3 +152,50 @@ x fad47e5bd78e (16) F0 rewritten(description, user, date, branch) by test (*) as a94e0fd5f1c8 (glob) +rebase not touching the diff +---------------------------- + + $ cat << EOF > H0 + > 0 + > 1 + > 2 + > 3 + > 4 + > 5 + > 6 + > 7 + > 8 + > 9 + > 10 + > EOF + $ hg add H0 + $ hg commit -m 'H0' + $ echo "H1" >> H0 + $ hg commit -m "H1" + $ hg up -r "desc(H0)" + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cat << EOF > H0 + > H2 + > 0 + > 1 + > 2 + > 3 + > 4 + > 5 + > 6 + > 7 + > 8 + > 9 + > 10 + > EOF + $ hg commit -m "H2" + created new head + $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3 + rebasing 20:b57fed8d8322 "H1" + merging H0 + $ hg obslog tip + o e509e2eb3df5 (22) H1 + | + x b57fed8d8322 (20) H1 + rewritten(parent, content) by test (*) as e509e2eb3df5 (glob) +