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

Re: Gentletypes!

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 31 Jan 2008 19:06:14 +0100

Jon Hardcastle wrote:
> Can anyone tell me,
> When a file is in a state of conflict if there any way
> to programmatically find out the revisions that are
> causing the conflict?

If you write your own svn client and the command you execute gets the
conflict, then yes.

But if you're using TSVN, it depends which command produced the
conflict. Most commands generate the conflicted files with names that
have the revision number in its name (file.ext.rXXX).

> The reason being is the file is a binary that can be
> resolved to editable text but only within its
> environment.
> This is now being modified to handle showing changes
> between 2 files.

Have a look at our diff-scripts which do the same for diffing and/or
resolving conflicts with office docs:
(username: guest, leave password empty)

the "merge-*" script handle conflicts of those files.

You can then configure TSVN to use your own scripts, depending on the
file extension of your files.

And if you have the script finished and working, you could send it to us
so we can include it with TSVN...


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-01-31 19:06:34 CET

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

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