[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: conflict resolver callback question / enhancement request

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-12 22:42:21 CEST

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.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 12 22:42:38 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.