Mercurial > public > mercurial-scm > hg

diff 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
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sat Mar 26 13:05:17 2011 +0100
+++ b/mercurial/localrepo.py	Mon Mar 14 23:50:28 2011 +0100
@@ -1024,10 +1024,7 @@
                 raise
 
             # update bookmarks, dirstate and mergestate
-            parents = (p1, p2)
-            if p2 == nullid:
-                parents = (p1,)
-            bookmarks.update(self, parents, ret)
+            bookmarks.update(self, p1, ret)
             for f in changes[0] + changes[1]:
                 self.dirstate.normal(f)
             for f in changes[2]: