Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
36083:9772ef9f6c04 | 36084:dc01484606da |
---|---|
1 #testcases flat tree | |
1 | 2 |
2 $ . "$TESTDIR/narrow-library.sh" | 3 $ . "$TESTDIR/narrow-library.sh" |
4 | |
5 #if tree | |
6 $ cat << EOF >> $HGRCPATH | |
7 > [experimental] | |
8 > treemanifest = 1 | |
9 > EOF | |
10 #endif | |
3 | 11 |
4 create full repo | 12 create full repo |
5 | 13 |
6 $ hg init master | 14 $ hg init master |
7 $ cd master | 15 $ cd master |
74 | 82 |
75 TODO: Can merge non-conflicting changes outside narrow spec | 83 TODO: Can merge non-conflicting changes outside narrow spec |
76 | 84 |
77 $ hg update -q 'desc("modify inside/f1")' | 85 $ hg update -q 'desc("modify inside/f1")' |
78 $ hg merge 'desc("modify outside/f1")' | 86 $ hg merge 'desc("modify outside/f1")' |
79 abort: merge affects file 'outside/f1' outside narrow, which is not yet supported | 87 abort: merge affects file 'outside/f1' outside narrow, which is not yet supported (flat !) |
88 abort: merge affects file 'outside/' outside narrow, which is not yet supported (tree !) | |
80 (merging in the other direction may work) | 89 (merging in the other direction may work) |
81 [255] | 90 [255] |
82 | 91 |
83 $ hg update -q 'desc("modify outside/f1")' | 92 $ hg update -q 'desc("modify outside/f1")' |
84 $ hg merge 'desc("modify inside/f1")' | 93 $ hg merge 'desc("modify inside/f1")' |
88 | 97 |
89 Refuses merge of conflicting outside changes | 98 Refuses merge of conflicting outside changes |
90 | 99 |
91 $ hg update -q 'desc("modify outside/f1")' | 100 $ hg update -q 'desc("modify outside/f1")' |
92 $ hg merge 'desc("conflicting outside/f1")' | 101 $ hg merge 'desc("conflicting outside/f1")' |
93 abort: conflict in file 'outside/f1' is outside narrow clone | 102 abort: conflict in file 'outside/f1' is outside narrow clone (flat !) |
103 abort: conflict in file 'outside/' is outside narrow clone (tree !) | |
94 [255] | 104 [255] |