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

Re: [Issue 2233] Show only changes of copied files in "svnlook diff"

From: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2005-05-20 23:36:28 CEST

On Fri, 20 May 2005 kfogel@collab.net wrote:

> "Peter N. Lundblad" <peter@famlundblad.se> writes:
> > > Unless objections are raised, I am changing this to the following:
> > >
> > > svnlook diff always shows diffs for added files against the empty file,
> > > and with headers consistent with svn diff, i.e.
> > > --- a (revision 0)
> > > --- a (revision 147)
> > > This is consistent with svn diff (except when diffing against a wc).
> > >
> > >
> > > svnlook diff --no-diff-added will no show diffs for added or copied files
> > > without modifications, BUT, for copied files with modifications,
> > > it will show diffs against the copy source, with headers
> > > indicating that. The reasoning behind this is that what you don't
> > > want when you say --no-diff-added is the full file contents. OTOH,
> > > you still may want to know about file modifications.
>
> It looks like then there is no way to get this behavior:
>
> * Diffs of purely added files being against the empty file.
> * Diffs of copy+modified files being against the copy source.
>
> Don't we want that?
>

Sounds perfectly reasonable. So, let's handle purely added files and
copies separately. We have --no-diffs-added for the former; that will
either ahve added files diffed against the empty file or no diffs at all.
The latter would be handled by a switch to use diffs against the copy
source instead of the empty stream. I don't think we need to be able to
turn off diffs for copied files entirely. So, any suggestions for names
for the new option? --diff-copied-against-source? (A little long.)

Regards,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 20 23:27:47 2005

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