equal
deleted
inserted
replaced
340 |
340 |
341 # apply failed, strip away that rev and merge. |
341 # apply failed, strip away that rev and merge. |
342 hg.clean(repo, head) |
342 hg.clean(repo, head) |
343 self.strip(repo, n, update=False, backup='strip') |
343 self.strip(repo, n, update=False, backup='strip') |
344 |
344 |
345 ctx = repo.changectx(rev) |
345 ctx = repo[rev] |
346 ret = hg.merge(repo, rev) |
346 ret = hg.merge(repo, rev) |
347 if ret: |
347 if ret: |
348 raise util.Abort(_("update returned %d") % ret) |
348 raise util.Abort(_("update returned %d") % ret) |
349 n = repo.commit(None, ctx.description(), ctx.user(), force=1) |
349 n = repo.commit(None, ctx.description(), ctx.user(), force=1) |
350 if n == None: |
350 if n == None: |