Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 14498:4d958d1bb072 stable

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 89e7d35e0ef0
children a281981e2033
comparison
equal deleted inserted replaced
14497:ea585f2b1adc 14498:4d958d1bb072
1022 self.ui.write( 1022 self.ui.write(
1023 _('note: commit message saved in %s\n') % msgfn) 1023 _('note: commit message saved in %s\n') % msgfn)
1024 raise 1024 raise
1025 1025
1026 # update bookmarks, dirstate and mergestate 1026 # update bookmarks, dirstate and mergestate
1027 parents = (p1, p2) 1027 bookmarks.update(self, p1, ret)
1028 if p2 == nullid:
1029 parents = (p1,)
1030 bookmarks.update(self, parents, ret)
1031 for f in changes[0] + changes[1]: 1028 for f in changes[0] + changes[1]:
1032 self.dirstate.normal(f) 1029 self.dirstate.normal(f)
1033 for f in changes[2]: 1030 for f in changes[2]:
1034 self.dirstate.forget(f) 1031 self.dirstate.forget(f)
1035 self.dirstate.setparents(ret) 1032 self.dirstate.setparents(ret)