Mercurial > hg
view tests/test-narrow-sparse.t @ 45587:768412472663
merge: store cases when a file is absent post merge in commitinfo
Some merges can result in file being absent form working directory. This can be
one of file was kept deleted or file was removed by merge code.
User might revert the file back before committing. In such cases we will like to
have better handling and create new filenodes.
We store this info in mergestate as commitinfo so that we can use it while
committing to create new filenode if required.
Differential Revision: https://phab.mercurial-scm.org/D9003
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 24 Aug 2020 15:35:34 +0530 |
parents | b05eb98a6b67 |
children | 84a93fa7ecfd |
line wrap: on
line source
Testing interaction of sparse and narrow when both are enabled on the client side and we do a non-ellipsis clone #testcases tree flat $ . "$TESTDIR/narrow-library.sh" $ cat << EOF >> $HGRCPATH > [extensions] > sparse = > EOF #if tree $ cat << EOF >> $HGRCPATH > [experimental] > treemanifest = 1 > EOF #endif $ hg init master $ cd master $ mkdir inside $ echo 'inside' > inside/f $ hg add inside/f $ hg commit -m 'add inside' $ mkdir widest $ echo 'widest' > widest/f $ hg add widest/f $ hg commit -m 'add widest' $ mkdir outside $ echo 'outside' > outside/f $ hg add outside/f $ hg commit -m 'add outside' $ cd .. narrow clone the inside file $ hg clone --narrow ssh://user@dummy/master narrow --include inside/f requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 1 changes to 1 files new changesets *:* (glob) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd narrow $ hg tracked I path:inside/f $ hg files inside/f XXX: we should have a flag in `hg debugsparse` to list the sparse profile $ test -f .hg/sparse [1] $ cat .hg/requires dotencode fncache generaldelta narrowhg-experimental revlogv1 sparserevlog store treemanifest (tree !) $ hg debugrebuilddirstate