Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 13806:8ba08a16e4e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: do not forward merged bookmark (issue1877)
author David Soria Parra <dsp@php.net>
date Mon, 14 Mar 2011 23:50:28 +0100
parents 43b5fe18ea6c
children e6f795494d4f
comparison
equal deleted inserted replaced
13805:0bc7b1661177 13806:8ba08a16e4e0
1017 self.ui.write( 1017 self.ui.write(
1018 _('note: commit message saved in %s\n') % msgfn) 1018 _('note: commit message saved in %s\n') % msgfn)
1019 raise 1019 raise
1020 1020
1021 # update bookmarks, dirstate and mergestate 1021 # update bookmarks, dirstate and mergestate
1022 parents = (p1, p2) 1022 bookmarks.update(self, p1, ret)
1023 if p2 == nullid:
1024 parents = (p1,)
1025 bookmarks.update(self, parents, ret)
1026 for f in changes[0] + changes[1]: 1023 for f in changes[0] + changes[1]:
1027 self.dirstate.normal(f) 1024 self.dirstate.normal(f)
1028 for f in changes[2]: 1025 for f in changes[2]:
1029 self.dirstate.forget(f) 1026 self.dirstate.forget(f)
1030 self.dirstate.setparents(ret) 1027 self.dirstate.setparents(ret)