diff -r 5bb5d4ba14e5 -r 7a20fe8dc080 mercurial/bundle2.py --- a/mercurial/bundle2.py Thu Apr 17 02:01:38 2014 -0400 +++ b/mercurial/bundle2.py Thu Apr 17 15:27:54 2014 -0400 @@ -151,7 +151,7 @@ _pack = struct.pack _unpack = struct.unpack -_magicstring = 'HG20' +_magicstring = 'HG2X' _fstreamparamsize = '>H' _fpartheadersize = '>H' @@ -456,7 +456,7 @@ magic, version = header[0:2], header[2:4] if magic != 'HG': raise util.Abort(_('not a Mercurial bundle')) - if version != '20': + if version != '2X': raise util.Abort(_('unknown bundle version %s') % version) self.ui.debug('start processing of %s stream\n' % header)