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/hg.py
changeset 26354 c1fb2cab6260
parent 26353 7c20d501709b
child 26587 56b2bcea2529 
--- a/mercurial/hg.py	Thu Sep 24 15:47:23 2015 -0700
+++ b/mercurial/hg.py	Thu Sep 24 15:52:11 2015 -0700
@@ -582,10 +582,11 @@
                     try:
                         uprev = destrepo.lookup(checkout)
                     except error.RepoLookupError:
-                        try:
-                            uprev = destrepo.lookup(update)
-                        except error.RepoLookupError:
-                            pass
+                        if update is not True:
+                            try:
+                                uprev = destrepo.lookup(update)
+                            except error.RepoLookupError:
+                                pass
                 if uprev is None:
                     try:
                         uprev = destrepo._bookmarks['@']
mercurial