hgext/mq.py
changeset 15057 774da7121fc9
parent 14987 3709cca378ff
child 15085 110d6804bfc6
equal deleted inserted replaced
15056:8413916df816 15057:774da7121fc9
  1490             try:
  1490             try:
  1491                 # might be nice to attempt to roll back strip after this
  1491                 # might be nice to attempt to roll back strip after this
  1492                 n = repo.commit(message, user, ph.date, match=match,
  1492                 n = repo.commit(message, user, ph.date, match=match,
  1493                                 force=True)
  1493                                 force=True)
  1494                 # only write patch after a successful commit
  1494                 # only write patch after a successful commit
  1495                 patchf.rename()
  1495                 patchf.close()
  1496                 self.applied.append(statusentry(n, patchfn))
  1496                 self.applied.append(statusentry(n, patchfn))
  1497             except:
  1497             except:
  1498                 ctx = repo[cparents[0]]
  1498                 ctx = repo[cparents[0]]
  1499                 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
  1499                 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
  1500                 self.savedirty()
  1500                 self.savedirty()