Request for nice feature to solve tree conflict on moved/renamed files

[Torge Riedel <to...@gmx.de>]

Hi,

I just faced this problem:

Had to fix a bug in an older, but still supported version of my application.
After the fix I merged the range of revisions to the trunk and got a "tree conflict". Yes, that file was moved and renamed, maybe there is a loss of information in the merge tracking, don't know.

I tried to solve it by creating a patch of the file and apply it to the file in the trunk, but that's impossible. Applying a patch is only available on directories.
At least I did the merge "by hand" (not much modifications).

What I would like to request is
  - either a possibility to apply a diff to a single file (even if it's renamed / moved)
or
  - in the merge dialog right click on that file with "tree conflict" and select a file to apply the modifications to

Good night
Torge

Re: Request for nice feature to solve tree conflict on moved/renamed files

[Thorsten Schöning <ts...@am-soft.de>]

Guten Tag Torge Riedel,
am Mittwoch, 12. Juni 2013 um 21:56 schrieben Sie:

>   - in the merge dialog right click[...]

Sounds you should post your request to the TorotiseSVN mailing list.

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail:Thorsten.Schoening@AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/

Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow