equal
deleted
inserted
replaced
3500 |
3500 |
3501 r1 = scmutil.revsingle(repo, rev1).node() |
3501 r1 = scmutil.revsingle(repo, rev1).node() |
3502 r2 = scmutil.revsingle(repo, rev2, 'null').node() |
3502 r2 = scmutil.revsingle(repo, rev2, 'null').node() |
3503 |
3503 |
3504 with repo.wlock(): |
3504 with repo.wlock(): |
3505 repo.dirstate.beginparentchange() |
|
3506 repo.setparents(r1, r2) |
3505 repo.setparents(r1, r2) |
3507 repo.dirstate.endparentchange() |
|
3508 |
3506 |
3509 @command('debugdirstate|debugstate', |
3507 @command('debugdirstate|debugstate', |
3510 [('', 'nodates', None, _('do not display the saved mtime')), |
3508 [('', 'nodates', None, _('do not display the saved mtime')), |
3511 ('', 'datesort', None, _('sort by saved mtime'))], |
3509 ('', 'datesort', None, _('sort by saved mtime'))], |
3512 _('[OPTION]...')) |
3510 _('[OPTION]...')) |