view tests/test-remotefilelog-share.t @ 48584:74973a6d4e67

filemerge: always define a "base" label

It simplifies the code and improves the conflict markers to always
have the "base" label defined.

Differential Revision: https://phab.mercurial-scm.org/D12016

#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