Mercurial > hg
diff tests/test-narrow-shallow-merges.t @ 49012:5b65721a75eb
revlog: recommit 49fd21f32695 with a fix for issue6528
`filelog.size` currently special cases two forms of metadata encoding:
- copy data via the parent order as flag bit
- censor data by peaking into the raw delta
All other forms of metadata encoding including the empty metadata block
are mishandled. In `basefilectx.cmp` the empty metadata block is
explicitly checked to compensate for this.
Restore 49fd21f32695, but disable it for filelog, so that the original
flag bit use contines to work. Document all this mess for now in
preparation of a proper rework.
Differential Revision: https://phab.mercurial-scm.org/D11203
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Tue, 20 Jul 2021 15:07:10 +0200 |
parents | 411dc27fd9fd |
children | 7e5be4a7cda7 |
line wrap: on
line diff
--- a/tests/test-narrow-shallow-merges.t Fri Mar 18 12:23:47 2022 -0700 +++ b/tests/test-narrow-shallow-merges.t Tue Jul 20 15:07:10 2021 +0200 @@ -179,7 +179,7 @@ $ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort - ...2a20009de83e 000000000000 3ac1f5779de3 outside 10 + ...2a20009de83e 3ac1f5779de3 000000000000 outside 10 ...3ac1f5779de3 bb96a08b062a 465567bdfb2d merge a/b/c/d 9 ...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12 ...b844052e7b3b 000000000000 000000000000 outside 2c