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

["Peter N. Lundblad" <pe...@famlundblad.se>]

On Fri, 20 May 2005 lundblad@tigris.org wrote:

Does anyone have any objections to the followining proposal? It's quite
simple, but it does change the output of svnlook. I think that's
acceptable, since the current output is buggy.

> http://subversion.tigris.org/issues/show_bug.cgi?id=2233
>
>
>
> User lundblad changed the following:
> ------- Additional comments from lundblad@tigris.org Fri May 20 03:07:38 -0700 2005 -------
> To summarize the current situation:
>
> svnlook diff will show no diffs for added or copied files without
> modifications. For copied files with modifications it will show diffs against
> the empty file, but with headers indicating the diff is against the copyfrom
> file. This is what the original reporter describes above.
> svnlook --no-diff-added will show no diffs for added or copied files whatsoever.
>
> 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.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: issues-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: issues-help@subversion.tigris.org
>
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[John Szakmeister <jo...@szakmeister.net>]

On Friday 20 May 2005 06:23, Peter N. Lundblad wrote:
> On Fri, 20 May 2005 lundblad@tigris.org wrote:
>
> Does anyone have any objections to the followining proposal? It's quite
> simple, but it does change the output of svnlook. I think that's
> acceptable, since the current output is buggy.

Looks good to me!

-John


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

["C. Michael Pilato" <cm...@collab.net>]

"Peter N. Lundblad" <pe...@famlundblad.se> writes:

> But maybe svnlook is more for creating diffs to be read by humans. IN that
> case, I like your suggestion. Else, I guess --no-diff-copies-as-adds is
> the way to go.

Quite the opposite.  When I wrote 'svnlook diff', it was meant for
patch application as commit emails were the only form of incremental
backup available at the time.  As for the what the future hold for
'svnlook diff' as determined by this thread, I've no strong opinions.
So don't take that piece of history as anything more than that.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

["Peter N. Lundblad" <pe...@famlundblad.se>]

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

> "Peter N. Lundblad" <pe...@famlundblad.se> writes:
> > 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.)
>
> I think diffing copied files against the source should be the default
> behavior.  The option could be '--diff-copies-as-adds'?
>
This is inconsitent with svn diff, and, worse, it makes it impossible to
push those diffs through patch, which doesn't know about our revisions, of
coruse. I guess that's why svn diff behaves like it does, but as I pointed
out in another mail, that's inconsistent in itself. svn diff (WC against
base) will give copies-against-source, but diffing URLs will give
copies-against-empty-file.

But maybe svnlook is more for creating diffs to be read by humans. IN that
case, I like your suggestion. Else, I guess --no-diff-copies-as-adds is
the way to go.

Regards,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[kf...@collab.net]

"Peter N. Lundblad" <pe...@famlundblad.se> writes:
> 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.)

I think diffing copied files against the source should be the default
behavior.  The option could be '--diff-copies-as-adds'?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

["Peter N. Lundblad" <pe...@famlundblad.se>]

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

> "Peter N. Lundblad" <pe...@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

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

[kf...@collab.net]

"Peter N. Lundblad" <pe...@famlundblad.se> writes:
> Does anyone have any objections to the followining proposal? It's quite
> simple, but it does change the output of svnlook. I think that's
> acceptable, since the current output is buggy.
>
> > http://subversion.tigris.org/issues/show_bug.cgi?id=2233
> >
> > To summarize the current situation:
> >
> > svnlook diff will show no diffs for added or copied files without
> > modifications. For copied files with modifications it will show
> > diffs against the empty file, but with headers indicating the diff
> > is against the copyfrom file. This is what the original reporter
> > describes above. svnlook --no-diff-added will show no diffs for
> > added or copied files whatsoever.
> >
> > 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?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org