Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 26989:a65ea44f163e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: switch to mergestate.clean() See the previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 17:04:32 -0800
parents dfab6edb98e3
children bf3eec62212f
comparison
equal deleted inserted replaced
26988:7e38d49bc713 26989:a65ea44f163e
1166 ui.status(_('working directory now based on ' 1166 ui.status(_('working directory now based on '
1167 'revisions %d and %d\n') % parents) 1167 'revisions %d and %d\n') % parents)
1168 else: 1168 else:
1169 ui.status(_('working directory now based on ' 1169 ui.status(_('working directory now based on '
1170 'revision %d\n') % parents) 1170 'revision %d\n') % parents)
1171 ms = mergemod.mergestate(self) 1171 mergemod.mergestate.clean(self, self['.'].node())
1172 ms.reset(self['.'].node())
1173 1172
1174 # TODO: if we know which new heads may result from this rollback, pass 1173 # TODO: if we know which new heads may result from this rollback, pass
1175 # them to destroy(), which will prevent the branchhead cache from being 1174 # them to destroy(), which will prevent the branchhead cache from being
1176 # invalidated. 1175 # invalidated.
1177 self.destroyed() 1176 self.destroyed()