Working copy file name substitution parameter

[deja...@gmail.com]

Is there a substitution parameter that expands to file name and path of the working copy file?

I am trying to compare changes between two revisions of the file with the current working copy using external diff/merge tool that allows me to specify 3 file and I can do this if I manually specify the working copy file path but it is very slow and cumbersome.

[Tony Rietwyk]

I use an external compare tool to do merging.  This is the text from the settings dialog:

   "C:\Program Files\Beyond Compare 4\BCompare.exe"  ""%theirs""  ""%mine""  ""%base""  ""%merged""

Hope that helps.

[Stefan]

look at the docs here:

https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-settings.html#tsvn-dug-settings-progs

[dean.mu...@gmail.com]

Hi,

Thanks for the response, unfortunately the %merged parameter is not available when just looking at difference between two revisions.

I am not ready to merge as there are many files in many changesets that cannot be easily excluded and most of the changes are not appropriate for the branch I am working on.

This seems to be a common scenario that just isn't handled very well in TortoiseSVN - there was a fix made in the trunk that was a part of larger changeset and I would like to apply it to a branch that was created on a tag long before the fix.

The easy way would be to use 3 way merge tool with changes on left and middle and working copy on the right. I can do this manually but it requires a lot of manual work when there are a number of files changed.

[dean.mu...@gmail.com]

Hi Stefan,

I've had a look at the help before posting here and even the version you posted does not seem to list a parameter that expands to the name and path of the file in the working copy folder.

I am trying to see the difference between two revisions and apply some of those changes to a working copy. I can use %base and %mine to see the difference between two revisions but I have to hard code the path to the working copy. This becomes quite tedious when there are number of files in different subfolders.

Am I missing something?