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

Re: Re: Patch files produce zero length files

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-12-20 16:18:42 CET

On 20/12/2007, Toal, Michael (GE Indust, GE Fanuc)
<michael.toal@gefanuc.com> wrote:
> >> No, neither. It was decided that 'svn diff' actually should work like
> >> this (no, I don't think it should, but who am I to tell?).

I don't have the thread reference to hand, but I think the argument
was that they are working on a better patch format which handles tree
changes better and fixes this sort of problem (one of this year's
Google SoC projects). The impression I got was that no-one wants to
work on fixing the bug when the patch format will be replaced anyway.
Sadly it will probably be another year before the new patch format
makes it into a release, based on past release cycle times.

> >> But it only works this way if you rename/move a file. If you simply
> add
> >> a new file, the diff contains the newly added file.
>
> So if someone wants to rename a file, the have to:
>
> Copy the contents to the clipboard.
> svn delete the file
> svn add a file
> Copy the contents of the clipboard to the file.
> svn commit.

The problem only occurs when you are producing a patch file. Renaming
within the working copy works fine (except on Windows where the new
name is just a case-change of the old name).

The workaround is not to include the rename in your patch file and
tell the other user to rename by hand :-(

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Dec 20 16:18:51 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.