Re: conflict resolver callback question / enhancement request

On 10/12/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> David Glasser wrote:
> > On 10/12/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> >> On 10/12/07, Erik Huelsmann <ehuels@gmail.com> wrote:
> >>
> >>> Actually, it *is* a trivial thing to add, since I added an API to use
> >>> our internal diff/merge algorithm on in-memory text blocks.
> >> And how would we know if the propvalues (svn_string_t) are
> >> contextually mergeable?
> >
> > I was thinking about this for a bit today. I suspect that people
> > would in fact appreciate it if svn:include values could be mergeable
> > in the CLI client.
> >
> > Perhaps a config value for mergeable properties, defaulting to
> > svn:include and svn:externals?
>
> svn:include ?
> Did I miss the introduction of a new special property?
> What does that property do? Is it somewhere documented?
> I couldn't find anything about that property.

Er, svn:ignore.

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org