mercurial/hg.py
changeset 7280 810ca383da9c
parent 7050 6788608627c4
child 7546 c7f48414f3ad
--- a/mercurial/hg.py	Tue Oct 28 19:07:14 2008 +0100
+++ b/mercurial/hg.py	Tue Oct 28 19:25:26 2008 +0100
@@ -256,7 +256,6 @@
 
 def update(repo, node):
     """update the working directory to node, merging linear changes"""
-    pl = repo.parents()
     stats = _merge.update(repo, node, False, False, None)
     _showstats(repo, stats)
     if stats[3]:
@@ -274,7 +273,6 @@
     stats = _merge.update(repo, node, True, force, False)
     _showstats(repo, stats)
     if stats[3]:
-        pl = repo.parents()
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
     elif remind:
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))