Mercurial > hg
view tests/test-remotefilelog-partial-shallow.t @ 44909:d452acc8cce8 stable
flags: account for flag change when tracking rename relevant to merge
There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.
There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D8531
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 16 May 2020 20:37:56 +0200 |
parents | 0800d9e6e216 |
children | 84a93fa7ecfd |
line wrap: on
line source
#require no-windows $ . "$TESTDIR/remotefilelog-library.sh" $ hg init master $ cd master $ cat >> .hg/hgrc <<EOF > [remotefilelog] > server=True > EOF $ echo x > foo $ echo y > bar $ hg commit -qAm one $ cd .. # partial shallow clone $ hg clone --shallow ssh://user@dummy/master shallow --noupdate --config remotefilelog.includepattern=foo streaming all changes 3 files to transfer, 336 bytes of data transferred 336 bytes in * seconds (*/sec) (glob) searching for changes no changes found $ cat >> shallow/.hg/hgrc <<EOF > [remotefilelog] > cachepath=$PWD/hgcache > debug=True > includepattern=foo > reponame = master > [extensions] > remotefilelog= > EOF $ ls shallow/.hg/store/data bar.i # update partial clone $ cd shallow $ hg update 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) $ cat foo x $ cat bar y $ cd .. # pull partial clone $ cd master $ echo a >> foo $ echo b >> bar $ hg commit -qm two $ cd ../shallow $ hg pull pulling from ssh://user@dummy/master searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files new changesets a9688f18cb91 (run 'hg update' to get a working copy) $ hg update 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) $ cat foo x a $ cat bar y b $ cd ..