internal:merge and binary file conflicts

[Matt Mackall]

On Thu, 2009-06-18 at 16:41 +0200, Mads Kiilerich wrote:
> On 06/18/2009 12:29 PM, Matt Mackall wrote:
> > @@ -153,6 +156,12 @@
> >           return 0
> >       if tool == "internal:fail":
> >           return 1
> > +    if tool == 'internal:dump':
> > +        a = repo.wjoin(fd)
> > +        util.copyfile(a, a + ".local")
> > +        repo.wwrite(a + ".other", fco.data(), fco.flags())
> > +        repo.wwrite(a + ".base", fca.data(), fca.flags())
> > +        return 1 # unresolved
> >    
> 
> I think it would be nice if these names were used when merge-tools are 
> launched too.
> 
> The current temp location and the randomness in the names is slightly 
> distracting. There is nothing in these "new" names that the merging user 
> shouldn't understand, so we can expect him to feel fully comfortable 
> with them.

Unfortunately, foo.base it a perfectly reasonable name for someone to
have in their repository.

-- 
http://selenic.com : development and support for Mercurial and Linux