Mercurial > hg
annotate tests/test-wireproto.py.out @ 46815:433cef8f3104
copies: distinguish between merged and touched files during upgrade
This a filenode being different between p1, p2 and result does not necessarily
means a merges happens. For example p2 could be a strict newer version of p1, so
the p2 version is picked by the manifest merging, but then the file is manually
updated before the commit.
In this case the file should be detected as touched.
Differential Revision: https://phab.mercurial-scm.org/D10220
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 13 Mar 2021 03:17:00 +0100 |
parents | 40381a88bab4 |
children |
rev | line source |
---|---|
14622
bd88561afb4b
wireproto: add batching support to wirerepository
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
1 Hello, Foobar |
37923
40381a88bab4
tests: port test-wireproto.py to Python 3
Augie Fackler <augie@google.com>
parents:
25708
diff
changeset
|
2 [b'Hello, Fo, =;:<o', b'Hello, Bar'] |