Mercurial > hg
view tests/test-remotefilelog-share.t @ 47916:65e3d8028f2e
dirstate: drop the `_merge` method
It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.
Differential Revision: https://phab.mercurial-scm.org/D11351
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 Aug 2021 21:16:48 +0200 |
parents | d252f51ab032 |
children |
line wrap: on
line source
#require no-windows #testcases safe normal #if safe $ echo "[format]" >> $HGRCPATH $ echo "exp-share-safe = True" >> $HGRCPATH #endif $ . "$TESTDIR/remotefilelog-library.sh" $ cat >> $HGRCPATH <<EOF > [extensions] > remotefilelog= > share= > EOF $ hg init master $ cd master $ cat >> .hg/hgrc <<EOF > [remotefilelog] > server=True > EOF $ echo x > x $ hg commit -qAm x $ cd .. $ hgcloneshallow ssh://user@dummy/master source --noupdate -q $ hg share source dest updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R dest unshare