mercurial/commands.py
changeset 27807 6ad5e134ef2e
parent 27806 a5eae47aa1f8
child 27808 0c48c566bab0
equal deleted inserted replaced
27806:a5eae47aa1f8 27807:6ad5e134ef2e
  3384     """
  3384     """
  3385 
  3385 
  3386     r1 = scmutil.revsingle(repo, rev1).node()
  3386     r1 = scmutil.revsingle(repo, rev1).node()
  3387     r2 = scmutil.revsingle(repo, rev2, 'null').node()
  3387     r2 = scmutil.revsingle(repo, rev2, 'null').node()
  3388 
  3388 
  3389     wlock = repo.wlock()
  3389     with repo.wlock():
  3390     try:
       
  3391         repo.dirstate.beginparentchange()
  3390         repo.dirstate.beginparentchange()
  3392         repo.setparents(r1, r2)
  3391         repo.setparents(r1, r2)
  3393         repo.dirstate.endparentchange()
  3392         repo.dirstate.endparentchange()
  3394     finally:
       
  3395         wlock.release()
       
  3396 
  3393 
  3397 @command('debugdirstate|debugstate',
  3394 @command('debugdirstate|debugstate',
  3398     [('', 'nodates', None, _('do not display the saved mtime')),
  3395     [('', 'nodates', None, _('do not display the saved mtime')),
  3399     ('', 'datesort', None, _('sort by saved mtime'))],
  3396     ('', 'datesort', None, _('sort by saved mtime'))],
  3400     _('[OPTION]...'))
  3397     _('[OPTION]...'))