Mercurial > public > mercurial-scm > hg-stable

diff 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
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun May 13 13:18:06 2012 +0200
+++ b/mercurial/localrepo.py	Sat May 12 21:28:10 2012 +0200
@@ -1187,7 +1187,7 @@
                 raise
 
             # update bookmarks, dirstate and mergestate
-            bookmarks.update(self, p1, ret)
+            bookmarks.update(self, [p1, p2], ret)
             for f in changes[0] + changes[1]:
                 self.dirstate.normal(f)
             for f in changes[2]: