comparison mercurial/sshrepo.py @ 2019:ced2d3620f95

add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 29 Mar 2006 10:27:16 -0800
parents 50de0887bbcd
children 1f1fc418a96c
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
128 128
129 self.pipeo.flush() 129 self.pipeo.flush()
130 130
131 self.readerr() 131 self.readerr()
132 l = int(self.pipei.readline()) 132 l = int(self.pipei.readline())
133 return self.pipei.read(l) != "" 133 r = self.pipei.read(l)
134 if not r:
135 return 1
136 return int(r)