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

Re: Resolution of 'svn diff' change?

From: <cmpilato_at_collab.net>
Date: 2003-05-20 22:19:50 CEST

Jan Braun <janbraun@gmx.de> writes:

> [1] While figuring that out, I stumbled about the following:
>
> svnadmin create repo
> svn co file://`pwd`/repo wc
> cd wc
> echo this is "c" in rev 1 >c
> echo this is "will-be-c" in rev 1 >willbec
> svn add willbec c
> svn ci -m "foo"
> svn rm c
> svn ci -m "bar"
> svn mv willbec c
> svn ci -m "baz"
> svn diff -r 1 c
>
> Index: c
> ===================================================================
> --- c (revision 1)
> +++ c (working copy)
> @@ -0,0 +1 @@
> +this is will-be-c in rev 1
> Index: c
> ===================================================================
> --- c (revision 1)
> +++ c (working copy)
> @@ -1 +0,0 @@
> -this is c in rev 1
>
> These are not only two sets (which i found surprising), but they are
> in the wrong order, which makes the composite patch unapplicable to
> c@1 (which i think is a bug). Should I file this or go get some
> sleep?

Try 'svn diff -r 1 --ignore-ancestry c', and see if that helps.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 20 22:25:06 2003

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.