Mercurial > hg-stable
view tests/test-remotefilelog-share.t @ 45874:781b09790633
tests: show that interactive shelve can leave the repo with a merge state
If part of a file is shelved (as we already do in a test), there will
be an unfinished merge state left after `hg shelve` finishes. There
should never be a merge conflict and there should never be a reason
that the user would like to re-resolve conflicts, so we should clear
that state (see next patch).
Differential Revision: https://phab.mercurial-scm.org/D9334
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 16 Nov 2020 22:38:36 -0800 |
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