You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Peter N. Lundblad" <pe...@famlundblad.se> on 2005/05/18 19:28:20 UTC
Diff output inconsistentices
Hi,
This message is related to issue #2233, that is a request to make svn look
diff output diffs against the copy source instead of the empty file.
I've noticed that our diff output is a little inconsistent, and want to
check fi this is delibarte.
If you do
svn cp a b
edit b
svn diff
(a is a file)
you'll get a diff between a and b, not between a dn the empty stream.
If you commit this and do diff against the previous version the output
will be b diffed against the empty stream. This might be the most useful
outputs in the different situations, but it seems strange to have
different diff output depending on if it is against the wc or a repository
revision.
Now, we run svnlook diff on the new revision. Here we also get a diff
against the empty stream, but the label indicates that the diff is against
the copy source. this is actually the issue 2233. I'd like to change the
labels to be consistent with the svn diff output (path, revision 0),
change the issue to an enhancement (to actually support an option to diff
against the copy source) and put it into unscheduled.
Comments?
Thanks,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Diff output inconsistentices
Posted by Ling Li <li...@gmail.com>.
* This is an old email but seems it got no response. *
I also feel this inconsistency annoying. Can we also have the option
"--no-diff-added" or "--diff-copy-from" for svn diff? I've noticed
that explicitly specifying --old and --new might give similar effect,
but this doesn't help much if one revision contains several file copy
operations with different sources/destinations (e.g., when you move
things around).
On 5/18/05, Peter N. Lundblad <pe...@famlundblad.se> wrote:
> Hi,
>
> This message is related to issue #2233, that is a request to make svn look
> diff output diffs against the copy source instead of the empty file.
>
> I've noticed that our diff output is a little inconsistent, and want to
> check fi this is delibarte.
>
> If you do
> svn cp a b
> edit b
> svn diff
> (a is a file)
>
> you'll get a diff between a and b, not between a dn the empty stream.
>
> If you commit this and do diff against the previous version the output
> will be b diffed against the empty stream. This might be the most useful
> outputs in the different situations, but it seems strange to have
> different diff output depending on if it is against the wc or a repository
> revision.
>
> Now, we run svnlook diff on the new revision. Here we also get a diff
> against the empty stream, but the label indicates that the diff is against
> the copy source. this is actually the issue 2233. I'd like to change the
> labels to be consistent with the svn diff output (path, revision 0),
> change the issue to an enhancement (to actually support an option to diff
> against the copy source) and put it into unscheduled.
>
> Comments?
>
> Thanks,
> //Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org