Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 4232:0d51eb296fb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 16 Mar 2007 00:45:18 -0300
parents dbc3846c09a1
children 09c5f734ff6a
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Mar 15 18:57:47 2007 -0500
+++ b/mercurial/merge.py	Fri Mar 16 00:45:18 2007 -0300
@@ -450,7 +450,10 @@
     wc = repo.workingctx()
     if node is None:
         # tip of current branch
-        node = repo.branchtags()[wc.branch()]
+        try:
+            node = repo.branchtags()[wc.branch()]
+        except KeyError:
+            raise util.Abort(_("branch %s not found") % wc.branch())
     overwrite = force and not branchmerge
     forcemerge = force and branchmerge
     pl = wc.parents()