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

Controlling which diff tool is used from javahl interface

From: Iain McGinniss <Iain.McGinniss_at_grahamtechnology.com>
Date: 2006-10-24 14:30:12 CEST

Hello all,

I am currently attempting to integrate support for subversion (via
javahl) into our product. In this product, we store a number of models
in XML format, with these XML files being version controlled by a
provider such as subversion. However, I do not wish subversion to
automatically perform textual merges on any of the XML files - the
behaviour I require is for this to be treated as a conflict forcing the
user to perform a manual merge (which will be performed by a graphical
merge tool specific to the model type in the XML file).

 From doing a quick search, it seems that if I were using the command
line client I could simply point diff3 to a script which returns a
non-zero code, indicating to the svn client that user intervention is
required to merge the changes. However, I cannot see any way of doing
this using the javahl bindings for svn. From the docs it seems possible
that I could force this behaviour by default if I change the user or
system-wide configuration of subversion, but this then means that if
they have any ordinary SVN repositories (for code or other information
not controlled by our product) then the same behaviour will occur there
also. If there was a way to configure the working copy to have this
behaviour individually, this would suit our needs for now.

So, am I simply not seen some part of the javahl API that would allow me
to control which diff tool is used during an update? Or is there a way
to configure a working copy individually to prevent automatic text
content merges?

Thanks in advance,

Iain McGinniss
Software Engineer
Graham Technology plc.
Email: Iain.McGinniss@grahamtechnology.com
This email (and any attachments) is private and confidential, and is intended solely for the
addressee. If you have received this communication in error please remove it and inform us via
telephone or email. Although we take all possible steps to ensure mail and attachments
are free from malicious content, malware and viruses, we cannot accept any responsibility
whatsoever for any changes to content outwith our administrative bounds. The views represented
within this mail are solely the view of the author and do not reflect the views of the organisation
as a whole.
Graham Technology plc                                                http://www.grahamtechnology.com

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Received on Tue Oct 24 14:32:17 2006

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