Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 13413:fa921dcd9993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: remove argument introduced by mistake in c19b9282d3a7
author Erik Zielke <ez@aragost.com>
date Wed, 09 Feb 2011 13:37:21 +0100
parents 60792fa3c1a8
children 0748e18be470
comparison
equal deleted inserted replaced
13412:58c497d0e44d 13413:fa921dcd9993
267 """run whatever commands are needed to put the subrepo into 267 """run whatever commands are needed to put the subrepo into
268 this state 268 this state
269 """ 269 """
270 raise NotImplementedError 270 raise NotImplementedError
271 271
272 def merge(self, state, overwrite=False): 272 def merge(self, state):
273 """merge currently-saved state with the new state.""" 273 """merge currently-saved state with the new state."""
274 raise NotImplementedError 274 raise NotImplementedError
275 275
276 def push(self, force): 276 def push(self, force):
277 """perform whatever action is analogous to 'hg push' 277 """perform whatever action is analogous to 'hg push'