Exception error in new merge backend

Matt Mackall mpm at selenic.com
Mon Feb 4 09:57:27 CST 2008


On Mon, 2008-02-04 at 18:05 +0530, dhruva wrote:
> 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

Applied, thanks!

-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial-devel mailing list