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

Re: diff of scheduled copies

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2004-09-09 05:49:32 CEST

On Wed, 2004-09-08 at 22:38, Jack Repenning wrote:
> > --verbose is about
> > providing more output, not different output, and it would be bizarre to
> > provide *both* a diff against the text-base and a diff against empty
> > for
> > copied files.
>
> Uuuhhhhhhh .... think I got lost here ...
>
> Are you saying something like "neither of these diffs is necessarily a
> proper subset of the other"? The one might be not merely _more_
> output, but actually _different_?

I think so.

If we have a file which was added with copy history, then we can display
either (a) a diff against empty (as we would for a file added without
copy history) or (b) a diff against the copy source. Right now, we
display (b) (which means we display nothing at all if the file wasn't
modified after the copy).

We could display both (a) and (b), which would be consistent with
--verbose ("show me more"), but that would be weird and I don't like the
idea of displaying more than one diff for a single target. We could
display (a) instead of (b), but I don't think that's consistent with
--verbose.

I'm okay with having a flag to display (a) instead of (b); it just needs
to have a different name. --show-diff-against-empty-for-copies is a bit
long; I wish I had a terser suggestion.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 9 05:50:02 2004

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