branch | stable |
changeset 17252 | 16fad7323e56 |
parent 17248 | 6ffb35b2284c |
child 17293 | d3f84ccc5495 |
--- a/mercurial/localrepo.py Thu Jul 26 02:54:13 2012 +0200 +++ b/mercurial/localrepo.py Tue Jul 24 21:20:56 2012 +0200 @@ -1951,8 +1951,8 @@ if not r: self.ui.warn(_('updating %s to public failed!\n') % newremotehead) - if ('obsolete' in remote.listkeys('namespaces') - and self.obsstore): + if (self.obsstore and + 'obsolete' in remote.listkeys('namespaces')): data = self.listkeys('obsolete')['dump'] r = remote.pushkey('obsolete', 'dump', '', data) if not r: