Mercurial > hg
view tests/test-remotefilelog-bad-configs.t @ 46811:5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
While commiting a merge, the commit code does not know whether a file was merged
during `hg merge` or not. This leads the commit code to look for filelog
ancestor to choose parents of new filelog created on merge commit.
This leads to wrong results in some cases as demonstrated by previous patch.
From this patch, we start storing information about merged files in mergestate
in stateextras and then use that on commit to detect whether we need to set two
parents or not.
Differential Revision: https://phab.mercurial-scm.org/D10149
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 10 Mar 2021 13:14:32 +0530 |
parents | 0800d9e6e216 |
children |
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 > x $ echo y > y $ echo z > z $ hg commit -qAm xy $ cd .. $ hgcloneshallow ssh://user@dummy/master shallow -q 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) $ cd shallow Verify error message when noc achepath specified $ hg up -q null $ cp $HGRCPATH $HGRCPATH.bak $ grep -v cachepath < $HGRCPATH.bak > tmp $ mv tmp $HGRCPATH $ hg up tip abort: could not find config option remotefilelog.cachepath [255] $ mv $HGRCPATH.bak $HGRCPATH Verify error message when no fallback specified $ hg up -q null $ rm .hg/hgrc $ clearcache $ hg up tip 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) abort: no remotefilelog server configured - is your .hg/hgrc trusted? [255]