Mercurial > hg
changeset 43139:f78ad4caa5ad
sidedatacopies: introduce a sidedata testcase for test-copies.t
For now it is equivalent to the filelog case, but introducing this early helps
make the comings changesets clearer.
Differential Revision: https://phab.mercurial-scm.org/D6947
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 06 Oct 2019 23:36:51 -0400 |
| parents | f9dc98a97cdb |
| children | 12b8a2ef8d04 |
| files | tests/test-copies.t |
| diffstat | 1 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-copies.t Sun Oct 06 23:36:51 2019 -0400 +++ b/tests/test-copies.t Sun Oct 06 23:36:51 2019 -0400 @@ -1,4 +1,4 @@ -#testcases filelog compatibility changeset +#testcases filelog compatibility changeset sidedata $ cat >> $HGRCPATH << EOF > [extensions] @@ -22,6 +22,13 @@ > EOF #endif +#if sidedata + $ cat >> $HGRCPATH << EOF + > [format] + > exp-use-copies-side-data-changeset = yes + > EOF +#endif + $ REPONUM=0 $ newrepo() { > cd $TESTTMP @@ -302,6 +309,7 @@ x -> z $ hg debugpathcopies 0 2 x -> z (filelog !) + x -> z (sidedata !) Copy file that exists on both sides of the merge, different content $ newrepo @@ -395,7 +403,7 @@ $ hg debugpathcopies 2 3 y -> z $ hg debugpathcopies 1 3 - y -> z (no-filelog !) + y -> z (no-filelog no-sidedata !) Create x and y, then rename x to z on one side of merge, and rename y to z and modify z on the other side. When storing copies in the changeset, we don't @@ -440,17 +448,18 @@ o 0 add x and y x y $ hg debugpathcopies 1 4 - y -> z (no-filelog !) + y -> z (no-filelog no-sidedata !) $ hg debugpathcopies 2 4 - x -> z (no-filelog !) + x -> z (no-filelog no-sidedata !) $ hg debugpathcopies 0 4 x -> z (filelog !) + x -> z (sidedata !) y -> z (compatibility !) y -> z (changeset !) $ hg debugpathcopies 1 5 - y -> z (no-filelog !) + y -> z (no-filelog no-sidedata !) $ hg debugpathcopies 2 5 - x -> z (no-filelog !) + x -> z (no-filelog no-sidedata !) $ hg debugpathcopies 0 5 x -> z