equal
deleted
inserted
replaced
325 if cl in cr.descendants(): |
325 if cl in cr.descendants(): |
326 r = remote.pushkey('bookmarks', k, nr, nl) |
326 r = remote.pushkey('bookmarks', k, nr, nl) |
327 if r: |
327 if r: |
328 self.ui.status(_("updating bookmark %s\n") % k) |
328 self.ui.status(_("updating bookmark %s\n") % k) |
329 else: |
329 else: |
330 self.ui.warn(_("failed to update bookmark" |
330 self.ui.warn(_('updating bookmark %s' |
331 " %s!\n") % k) |
331 ' failed!\n') % k) |
332 |
332 |
333 return result |
333 return result |
334 |
334 |
335 def addchangegroup(self, source, srctype, url, emptyok=False): |
335 def addchangegroup(self, source, srctype, url, emptyok=False): |
336 parents = self.dirstate.parents() |
336 parents = self.dirstate.parents() |