Mercurial Mercurial > hg / 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-known.t
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 24 Aug 2020 15:20:09 +0530
changeset 45468 09edbff6ae8d
parent 37845 b4b7427b5786
permissions -rw-r--r--
merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally If a file is not present on the local side, and it's unchanged between other merge parent and ancestor, we don't use any action, neither we had a if-else branch for that condition. This leads to bid-merge missing that there is a such action possible which can be performed. As test changes demonstrate, we now choose the locally deleted side instead of choosing the remote one consistently. This is also wrong behavior which is resulted because of missing possible action. It will be fixed in next patch. This whole logic is not acurrate as we should prompt user on what to do when this kind of criss-cross merge is in play. Differential Revision: https://phab.mercurial-scm.org/D8940
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13723
e615765fdcc7 wireproto: add known([id]) function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     1
 
= Test the known() protocol function =
e615765fdcc7 wireproto: add known([id]) function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     2
 












e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     3


Create a test repository:













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     4














e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     5


  $ hg init repo













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     6


  $ cd repo













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     7


  $ touch a ; hg add a ; hg ci -ma













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     8


  $ touch b ; hg add b ; hg ci -mb













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     9


  $ touch c ; hg add c ; hg ci -mc













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    10


  $ hg log --template '{node}\n'













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    11


  991a3460af53952d10ec8a295d3d2cc2e5fa9690













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    12


  0e067c57feba1a5694ca4844f05588bb1bf82342













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    13


  3903775176ed42b1458a6281db4a0ccf4d9f287a













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    14


  $ cd ..













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    15














e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    16


Test locally:













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    17














e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    18


  $ hg debugknown repo 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    19


  111













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    20


  $ hg debugknown repo 000a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 0003775176ed42b1458a6281db4a0ccf4d9f287a













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    21


  010













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    22


  $ hg debugknown repo













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    23


  













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    24














e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    25


Test via HTTP:













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    26














e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    27


  $ hg serve -R repo -p $HGPORT -d --pid-file=hg.pid -E error.log -A access.log













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    28


  $ cat hg.pid >> $DAEMON_PIDS













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    29


  $ hg debugknown http://localhost:$HGPORT/ 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    30


  111













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    31


  $ hg debugknown http://localhost:$HGPORT/ 000a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 0003775176ed42b1458a6281db4a0ccf4d9f287a













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    32


  010













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    33


  $ hg debugknown http://localhost:$HGPORT/













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    34


  













e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    35


  $ cat error.log








25474






8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls



Matt Mackall <mpm@selenic.com>


parents: 
25472

diff
changeset




    36


  $ killdaemons.py








13723






e615765fdcc7
wireproto: add known([id]) function



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    37
















Mercurial