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

Re: How to patch svn move'd files

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Sat, 3 Oct 2009 21:55:03 +0100

2009/10/3 Andreas Bednarek <andris_at_seznam.cz>:
> Hi,
> I have troubles applying a patch to a working copy when there are files that were moved among folders. I used the TSVN->Rename command from the popup to move the files, since I didn't recall the RMB drag&drop feature, but believe it does a 'svn move' command anyway, so that should be fine, shouldn't it?
> In the patch file, the files in the old locations are emptied, but the new files are just diffs and TSVN cannot find the originals to patch them against (it's trying to fetch revision 0 of those from the repository).
> Am using TSVN 1.6.5, Build 16974 - 32 Bit
> Am I doing something wrong?

No. The patch function just uses svn diff, which is not very good at
handling addition of files. This should be resolved when subversion
extends its patch file functionality. I think this is scheduled for
1.7, but that is some way off yet.


:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-03 22:55:03 CEST

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