Exception error in new merge backend

dhruva dhruvakm at gmail.com
Mon Feb 4 06:35:43 CST 2008


Hi,
 The following patch fixes the error.

diff -r 83d193a513c8 mercurial/filemerge.py
--- a/mercurial/filemerge.py    Thu Jan 31 22:32:11 2008 -0600
+++ b/mercurial/filemerge.py    Mon Feb 04 18:04:46 2008 +0530
@@ -47,7 +47,7 @@ def _picktool(repo, ui, path, binary, sy
         return os.environ.get("HGMERGE")

     # then patterns
-    for pattern, tool in ui.configitems("merge-patterns"):
+    for pat, tool in ui.configitems("merge-patterns"):
         mf = util.matcher(repo.root, "", [pat], [], [])[1]
         if mf(path) and check(tool, pat, symlink, False):
                 return tool

-- 
Contents reflect my personal views only!


More information about the Mercurial-devel mailing list