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-batching.py.out
author Matt Harbison <matt_harbison@yahoo.com>
Mon, 20 Aug 2018 16:19:36 -0400
changeset 39224 5e52b6da9c0c
parent 37633 33a6eee08db2
permissions -rw-r--r--
tests: demonstrate a problem with renames on the p2 side of a conversion I think this is related to the octopus merge being sloppy, and that's having a cascading affect on the fixup merge. If this change is made on p1 (specifically with the 'Added parent file' commit), the failure doesn't occur. The file modification with the rename doesn't seem to be necessary, but it's what's happening in a production repo where I first noticed, so I left it. This is an example of the manifest divergence I'd been seeing, which wasn't fixed by Yuya's recent changes. This is separate from the changelog divergence I was also seeing[1]. Probably nobody cares about bzr anymore, but this will also affect git, since the octopus fixup code is in the hg sink. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-August/120473.html
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14621
84094c0d2724 wireproto: add basic command batching infrastructure
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     1
 












84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     2


== Local













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     3


Ready.













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     4


Un and Deux













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     5


Eins und Zwei













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     6


One and Two













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     7


Eins und Zwei













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     8


Uno und Due













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




     9














84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    10


== Remote













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    11


Ready.













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    12


REQ: foo?one=Vo&two=Efvy













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    13


  -> Vo!boe!Efvy













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    14


Un and Deux













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    15


REQ: bar?b=Fjot&a=[xfj













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    16


  -> Fjot!voe![xfj













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    17


Eins und Zwei








33766






4c706037adef
wireproto: overhaul iterating batcher code (API)



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33765

diff
changeset




    18


REQ: batch?cmds=foo:one=Pof,two=Uxp;bar:b=Fjot,a=[xfj;bar:b=Vop,a=Evf













4c706037adef
wireproto: overhaul iterating batcher code (API)



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33765

diff
changeset




    19


  -> Pof!boe!Uxp;Fjot!voe![xfj;Vop!voe!Evf








14621






84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    20


One and Two













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    21


Eins und Zwei













84094c0d2724
wireproto: add basic command batching infrastructure



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    22


Uno und Due















Mercurial