# HG changeset patch # User Pierre-Yves David # Date 1394232405 28800 # Node ID 1a23c7c52a4306cf1dfddc810cdff043b09753b8 # Parent e9eeef0d07ece98115905a9d1c986c66a0a68204 exchange: fix pull over wire protocol Actually hand pulled obsolescence markers to the pull logic. In the wire protocol case we did not reset the position of the file pointer after writing the pulled data. This lead the pull logic to thing that no markers were send at all. This changeset fix this client side bug. (apparently no test check both markers pulling and wireprotocol) diff -r e9eeef0d07ec -r 1a23c7c52a43 hgext/evolve.py --- a/hgext/evolve.py Thu Mar 06 12:15:04 2014 -0800 +++ b/hgext/evolve.py Fri Mar 07 14:46:45 2014 -0800 @@ -2303,6 +2303,7 @@ current += readsize ui.progress('OBSEXC', current, unit="bytes", total=length) ui.progress('OBSEXC', None) + data.seek(0) return data @eh.addattr(localrepo.localpeer, 'evoext_pullobsmarkers_0')