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

Re: svn diff header confusion

From: Ben Reser <ben_at_reser.org>
Date: 2004-01-26 22:19:08 CET

On Mon, Jan 26, 2004 at 03:48:37PM +0000, Andy Whitcroft wrote:
> It appears that the 'svn diff' command can result in output in which the
> file headers within the diff are incorrect; the unified diff itself appears
> to be as expected. I am therefore assuming this is a different issue to
> issue #1602.
>
> In this recipe revision 0 (BASE) is an empty repository and revision 1
> (HEAD) contains a single file containing the word test (the full recipe to
> reproduce and the full output from all the possible diffs are included at
> the end of this email).
> The working copy from which the diffs are requested is a checkout of
> revision 0.
>
> If we examine the svn diff -r BASE:HEAD and HEAD:BASE outputs it is clear
> that the diffs cannot both be against the working copy (if either is)
> despite the fact that it is clearly labeled as such indeed they are the
> diff we would expect between the requested versions, the diff (further
> below) of the real working copy against BASE and HEAD support this. It
> seems to me that BASE is being incorrectly reported as working copy.
>
> + svn diff -r BASE:HEAD
> Index: file
> ===================================================================
> --- file (revision 0)
> +++ file (working copy)
> @@ -0,0 +1 @@
> +test
> + svn diff -r HEAD:BASE
> Index: file
> ===================================================================
> --- file (revision 1)
> +++ file (working copy)
> @@ -1 +0,0 @@
> -test
>
> Does this come under an existing issuse or should I file one. Feel free to
> say 'stupid' that's because of 'foo' and expected behaviour.

Looks like the same thing I reported in:
http://www.contactor.se/~dast/svn/archive-2003-12/1307.shtml
msgid: 20031223075138.GE7841@titanium.brain.org

-- 
Ben Reser <ben@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jan 26 22:20:11 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.