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

Feature request: easier property conflict resolving

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-14 11:16:37 CEST


Property conflicts are handled by creating .prej files. That's ok.
But unlike resolving text conflicts, a GUI diff tool can't just resolve
the conflict and write the correct file to the original file. For text
conflicts, users can use those diff tools, then call 'svn resolved' and
everythings ok.
For property conflicts, that's not possible, because there's no
'original' file which has the resolved property content.

have the svn_wc_entry_t struct extended with an entry containing the
original property content. Then, when 'svn resolved' is called, let the
svn_client_resolved2() API check for the existence of that file and if
it exists use the content of that file to set the property.

Most (if not all) GUI diff tools don't know anything about SVN
properties but only deal with text files. Resolving a property conflict
should be as 'easy' as resolving a property conflict. While SVN UI
clients could make the property conflict data available as text files
before calling the GUI diff tools, there's currently no way for the diff
tool to write the resolved content into the 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 Sun Oct 14 11:16:55 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.