Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 13806 8ba08a16e4e0
parent 13795 43b5fe18ea6c
child 13809 e6f795494d4f 
--- a/mercurial/localrepo.py	Wed Mar 30 13:23:24 2011 -0500
+++ b/mercurial/localrepo.py	Mon Mar 14 23:50:28 2011 +0100
@@ -1019,10 +1019,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]:
mercurial