Mercurial > hg
changeset 43140:12b8a2ef8d04
sidedatacopies: introduce a sidedata testcase for test-copies-unrelated.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/D6948
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 06 Oct 2019 23:36:51 -0400 |
| parents | f78ad4caa5ad |
| children | 52781d57313d |
| files | tests/test-copies-unrelated.t |
| diffstat | 1 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-copies-unrelated.t Sun Oct 06 23:36:51 2019 -0400 +++ b/tests/test-copies-unrelated.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 @@ -172,8 +179,8 @@ o 0 add x x $ hg debugpathcopies 0 5 - x -> y (no-filelog !) -#if no-filelog + x -> y (no-filelog no-sidedata !) +#if no-filelog no-sidedata $ hg graft -r 2 grafting 2:* "modify x again" (glob) merging y and x to y @@ -340,8 +347,12 @@ o 0 base a $ hg debugpathcopies 1 5 - x -> y (no-filelog !) -#if filelog + x -> y (no-filelog no-sidedata !) +#if no-filelog no-sidedata + $ hg graft -r 2 + grafting 2:* "modify x" (glob) + merging y and x to y +#else BROKEN: This should succeed and merge the changes from x into y $ hg graft -r 2 grafting 2:* "modify x" (glob) @@ -351,10 +362,6 @@ abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') [255] -#else - $ hg graft -r 2 - grafting 2:* "modify x" (glob) - merging y and x to y #endif $ hg co -qC 2 BROKEN: This should succeed and merge the changes from x into y