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

Re: creating patch of moved file fails

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Wed, 15 Jul 2009 10:28:53 -0400

Stefan Sperling wrote:
> On Wed, Jul 15, 2009 at 08:22:46AM -0500, Peter Samuelson wrote:
>> [Stefan K√ľng]
>>> $ svn mv testwc\file.txt testwc\file2.txt
>>> $ svn diff testwc > patch.txt
>>> now patch.txt only contains the deletion of file.txt, but not the add
>>> of file2.txt.
>> That is how 'diff' has always worked, isn't it? I believe the reason
>> is that it is more useful to show the diff of the file contents, rather
>> than just depicting the whole new file. Of course this means if you
>> did not edit the file after the 'svn cp' or 'svn mv', there will be
>> nothing in the diff.
> I'm not sure if this was a deliberate design decision, or simply an
> oversight in the implementation of svn diff. svn diff compares the
> text base with the working file. In case of a copied file, the copied
> file will have no changes WRT its text base, since the text base
> and the working file are identical.

It was deliberate. But, for obvious reasons, most of us have a love/hate
relationship with that decision. There are appropriate times for both
flavors of output here.

C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2009-07-15 16:29:12 CEST

This is an archived mail posted to the Subversion Dev mailing list.