Mercurial > hg
comparison tests/test-sparse.t @ 39527:9db856446298
sparse: add local files to temporaryfiles if they exist out of sparse
We get the f1 from args if it's merge and check that whether that exists in
sparse checkout or not. If that does not, we add that for merging.
The error comes from very low-level where we try to read data of a
working-filectx which does not exists in the working directory. It will be
extremely ugly to plug in logic to update sparse copy with new file at such a
low level.
We already have logic related to updating the checkout with required files in
calculateupdates() and let's handle this case there only. calculateupdates()
call sparse.filterupdatesactions() and the logic is added into the latter
function.
To get the exact traceback, this patch can be backed out and
test-sparse-merges.t can be run with ui.traceback=True.
Differential Revision: https://phab.mercurial-scm.org/D4341
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Tue, 21 Aug 2018 16:11:17 +0300 |
parents | deb851914fd7 |
children | 5abc47d4ca6b |
comparison
equal
deleted
inserted
replaced
39526:c6eb2118f44f | 39527:9db856446298 |
---|---|
187 | 187 |
188 Verify rebase temporarily includes excluded files | 188 Verify rebase temporarily includes excluded files |
189 | 189 |
190 $ hg rebase -d 1 -r 2 --config extensions.rebase= | 190 $ hg rebase -d 1 -r 2 --config extensions.rebase= |
191 rebasing 2:b91df4f39e75 "edit hide" (tip) | 191 rebasing 2:b91df4f39e75 "edit hide" (tip) |
192 temporarily included 1 file(s) in the sparse checkout for merging | 192 temporarily included 2 file(s) in the sparse checkout for merging |
193 merging hide | 193 merging hide |
194 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') | 194 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') |
195 unresolved conflicts (see hg resolve, then hg rebase --continue) | 195 unresolved conflicts (see hg resolve, then hg rebase --continue) |
196 [1] | 196 [1] |
197 | 197 |
222 | 222 |
223 Verify merge fails if merging excluded files | 223 Verify merge fails if merging excluded files |
224 | 224 |
225 $ hg up -q 1 | 225 $ hg up -q 1 |
226 $ hg merge -r 2 | 226 $ hg merge -r 2 |
227 temporarily included 1 file(s) in the sparse checkout for merging | 227 temporarily included 2 file(s) in the sparse checkout for merging |
228 merging hide | 228 merging hide |
229 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') | 229 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') |
230 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 230 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
231 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 231 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
232 [1] | 232 [1] |