Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 16706:a270ec977ba6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: delete divergent bookmarks on merge
author David Soria Parra <dsp@php.net>
date Sat, 12 May 2012 21:28:10 +0200
parents c2d9ef43ff6c
children f8dee1a8f844
comparison
equal deleted inserted replaced
16705:c2d9ef43ff6c 16706:a270ec977ba6
1185 self.ui.write( 1185 self.ui.write(
1186 _('note: commit message saved in %s\n') % msgfn) 1186 _('note: commit message saved in %s\n') % msgfn)
1187 raise 1187 raise
1188 1188
1189 # update bookmarks, dirstate and mergestate 1189 # update bookmarks, dirstate and mergestate
1190 bookmarks.update(self, p1, ret) 1190 bookmarks.update(self, [p1, p2], ret)
1191 for f in changes[0] + changes[1]: 1191 for f in changes[0] + changes[1]:
1192 self.dirstate.normal(f) 1192 self.dirstate.normal(f)
1193 for f in changes[2]: 1193 for f in changes[2]:
1194 self.dirstate.drop(f) 1194 self.dirstate.drop(f)
1195 self.dirstate.setparents(ret) 1195 self.dirstate.setparents(ret)