Mercurial > hg

annotate tests/test-wireproto.py.out @ 26949:b639b2f186bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.applyupdates: only attempt to merge files in mergeactions This only makes a difference when a merge driver is active -- in that case we don't want to try and merge all the files, just the ones still unresolved after the merge driver's preprocess step is over.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 12 Nov 2015 14:29:02 -0800
parents d3d32643c060
children 40381a88bab4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14622
bd88561afb4b wireproto: add batching support to wirerepository
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
1 Hello, Foobar
25708
d3d32643c060 wireproto: correctly escape batched args and responses (issue4739)
Augie Fackler <augie@google.com>
parents: 14765
diff changeset
2 ['Hello, Fo, =;:<o', 'Hello, Bar']