Mercurial > hg
diff tests/test-narrow-merge.t @ 36084:dc01484606da
tests: fold narrow treemanifest tests into main test file using testcases
These tests predate the testcases functionality in run-tests.py, so it
was never done in narrowhg.
Differential Revision: https://phab.mercurial-scm.org/D1979
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 01 Feb 2018 17:19:41 -0500 |
parents | a2a6e724d61a |
children | 8e855e9984a6 |
line wrap: on
line diff
--- a/tests/test-narrow-merge.t Mon Jan 29 18:16:23 2018 -0500 +++ b/tests/test-narrow-merge.t Thu Feb 01 17:19:41 2018 -0500 @@ -1,6 +1,14 @@ +#testcases flat tree $ . "$TESTDIR/narrow-library.sh" +#if tree + $ cat << EOF >> $HGRCPATH + > [experimental] + > treemanifest = 1 + > EOF +#endif + create full repo $ hg init master @@ -76,7 +84,8 @@ $ hg update -q 'desc("modify inside/f1")' $ hg merge 'desc("modify outside/f1")' - abort: merge affects file 'outside/f1' outside narrow, which is not yet supported + abort: merge affects file 'outside/f1' outside narrow, which is not yet supported (flat !) + abort: merge affects file 'outside/' outside narrow, which is not yet supported (tree !) (merging in the other direction may work) [255] @@ -90,5 +99,6 @@ $ hg update -q 'desc("modify outside/f1")' $ hg merge 'desc("conflicting outside/f1")' - abort: conflict in file 'outside/f1' is outside narrow clone + abort: conflict in file 'outside/f1' is outside narrow clone (flat !) + abort: conflict in file 'outside/' is outside narrow clone (tree !) [255]