CODEWITHSUNDEEP
bashsvnmergediff
nubera
nubera

Reputation: 21

svn external merge tool

On Linux, I am using diffuse as a diff tool with SVN, which is quite handy in my opinion. However, I would like to use it as a merge tool as well. When using an external merge tool (option (l) while merging) SVN passes five files to it: (i) the unmodified file, (ii) theirs, (iii) mine, (iv) the one to be stored, (v) the current working copy. I don't have a screen that allows me to handle diffuse with five files open at the same time, therefore I would like to know the following:

How can I close just one or two of the open files in diffuse?

or

How can I tell diffuse not to open all of them but just the once I need?

I have tried the following, with out success: The merge-tool is defined in the file ~/.subversion/config as follows:

merge-tool-cmd = diffuse

I simply replaced it by 

merge-tool-cmd = diffuse $2 $3 $4

Can anyone help? Thanks and cheers in advance!

Upvotes: 2

Views: 1064

Answers (1)

David W.
David W.

Reputation: 107040

Yes, Subversion can be fun in this way...

The easiest way is to create a script that executes diffuse for you with the right parameters, and then specifying that script in your Subversion configuration.

I did the same thing with vimdiff. The Subversion manual explains what is involved and gives you an example script in Python and Windows Batch that you can hack for your own use.

From these two examples, you should be able to put together a short script in any language you prefer.

Upvotes: 1

Related Questions