Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-remotefilelog-share.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sat, 12 Dec 2020 19:35:08 +0100
changeset 46607 c19c662097e1
parent 45494 d252f51ab032
permissions -rw-r--r--
copies: detect case when a merge decision overwrite previous data We now detect and record when a merge case required special logic (eg: thing that append during the merge, ambiguity leading to picking p1 data, etc) and we explicitly mark the result as superseding the previous data. This fixes the family of test we previously added. Differential Revision: https://phab.mercurial-scm.org/D9613
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
40761
0800d9e6e216 tests: disable remotefilelog on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 40624
diff changeset 
     1
 
#require no-windows
0800d9e6e216 tests: disable remotefilelog on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 40624
diff changeset 
     2
 







45494






d252f51ab032
share: introduce config option to store requires in .hg/store



Pulkit Goyal <7895pulkit@gmail.com>


parents: 
40761

diff
changeset




     3


#testcases safe normal













d252f51ab032
share: introduce config option to store requires in .hg/store



Pulkit Goyal <7895pulkit@gmail.com>


parents: 
40761

diff
changeset




     4














d252f51ab032
share: introduce config option to store requires in .hg/store



Pulkit Goyal <7895pulkit@gmail.com>


parents: 
40761

diff
changeset




     5


#if safe













d252f51ab032
share: introduce config option to store requires in .hg/store



Pulkit Goyal <7895pulkit@gmail.com>


parents: 
40761

diff
changeset




     6


  $ echo "[format]"         >> $HGRCPATH













d252f51ab032
share: introduce config option to store requires in .hg/store



Pulkit Goyal <7895pulkit@gmail.com>


parents: 
40761

diff
changeset




     7


  $ echo "exp-share-safe = True" >> $HGRCPATH













d252f51ab032
share: introduce config option to store requires in .hg/store



Pulkit Goyal <7895pulkit@gmail.com>


parents: 
40761

diff
changeset




     8


#endif













d252f51ab032
share: introduce config option to store requires in .hg/store



Pulkit Goyal <7895pulkit@gmail.com>


parents: 
40761

diff
changeset




     9









40622






fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    10


  $ . "$TESTDIR/remotefilelog-library.sh"













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    11














fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    12


  $ cat >> $HGRCPATH <<EOF













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    13


  > [extensions]













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    14


  > remotefilelog=













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    15


  > share=













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    16


  > EOF













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    17














fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    18


  $ hg init master













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    19


  $ cd master













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    20


  $ cat >> .hg/hgrc <<EOF













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    21


  > [remotefilelog]













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    22


  > server=True













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    23


  > EOF













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    24


  $ echo x > x













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    25


  $ hg commit -qAm x













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    26














fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    27


  $ cd ..













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    28














fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    29














fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    30


  $ hgcloneshallow ssh://user@dummy/master source --noupdate -q













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    31


  $ hg share source dest













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    32


  updating working directory













fb490d798be0
share: reload repo after adjusting it in postshare()



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    33


  1 files updated, 0 files merged, 0 files removed, 0 files unresolved








40624






157f0e29eaa3
remotefilelog: avoid accessing repo instance after dispatch



Martin von Zweigbergk <martinvonz@google.com>


parents: 
40622

diff
changeset




    34


  $ hg -R dest unshare















hg-stable