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. On Thursday, 3 October 2019 13:08:03 UTC+10, Tony Rietwyk wrote: > > 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. > -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/620d064e-d1d1-4921-adaf-dcd70460b82e%40googlegroups.com.
