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-bad-pull.t
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 14 Sep 2020 14:31:23 +0530
changeset 45582 b9d6ab6cdeb4
parent 39723 5abc47d4ca6b
child 45858 ebee234d952a
permissions -rw-r--r--
configitems: add a new config option to control new filenode functionality This series is adding functionality where we can force create a new filenode for some files on a merge-commit. This is meant to represent an explicit choice made by user and hence distingusing the file in the merged commit with the file in parent by creating a new filenode instead of using the parent one. This introduces a experimental config option under which this functionality will be hidden. A new testcase is added in tests/test-merge-criss-cross.t to test the new functionality while making the option does not break other scenarios. Differential Revision: https://phab.mercurial-scm.org/D9026
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
37891
b4b7427b5786 tests: remove #require killdaemons
Gregory Szorc <gregory.szorc@gmail.com>
parents: 32958
diff changeset 
     1
 
#require serve
15446
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset 
     2
 







17019






5d0538599428
test-bad-pull: partially adjust for Windows



Adrian Buehlmann <adrian@cadifra.com>


parents: 
16496

diff
changeset




     3


  $ hg clone http://localhost:$HGPORT/ copy













5d0538599428
test-bad-pull: partially adjust for Windows



Adrian Buehlmann <adrian@cadifra.com>


parents: 
16496

diff
changeset




     4


  abort: * (glob)













5d0538599428
test-bad-pull: partially adjust for Windows



Adrian Buehlmann <adrian@cadifra.com>


parents: 
16496

diff
changeset




     5


  [255]








395






fbe8834923c5
commands: report http exceptions nicely



mpm@selenic.com


parents: 

diff
changeset




     6









15515






21766d5531cb
tests: remove hacks for testing if file or directory exists



Mads Kiilerich <mads@kiilerich.com>


parents: 
15446

diff
changeset




     7


  $ test -d copy













21766d5531cb
tests: remove hacks for testing if file or directory exists



Mads Kiilerich <mads@kiilerich.com>


parents: 
15446

diff
changeset




     8


  [1]








395






fbe8834923c5
commands: report http exceptions nicely



mpm@selenic.com


parents: 

diff
changeset




     9









39723






5abc47d4ca6b
tests: quote PYTHON usage



Matt Harbison <matt_harbison@yahoo.com>


parents: 
37891

diff
changeset




    10


  $ "$PYTHON" "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid








22959






10116463b0b1
tests: pull common http server setup out of individual tests



Mike Hommey <mh@glandium.org>


parents: 
22046

diff
changeset




    11


  $ cat dumb.pid >> $DAEMON_PIDS








16334






b9bd95e61b49
tests: fix shutdown race in test-bad-pull



Matt Mackall <mpm@selenic.com>


parents: 
16296

diff
changeset




    12


  $ hg clone http://localhost:$HGPORT/foo copy2













b9bd95e61b49
tests: fix shutdown race in test-bad-pull



Matt Mackall <mpm@selenic.com>


parents: 
16296

diff
changeset




    13


  abort: HTTP Error 404: * (glob)













b9bd95e61b49
tests: fix shutdown race in test-bad-pull



Matt Mackall <mpm@selenic.com>


parents: 
16296

diff
changeset




    14


  [255]








25474






8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls



Matt Mackall <mpm@selenic.com>


parents: 
25472

diff
changeset




    15


  $ killdaemons.py















hg-stable