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

Re: Diffs and deleted directories

From: Mathias Weinert <mathias.weinert_at_gfa-net.de>
Date: 2006-03-27 10:30:51 CEST

Garrett Rooney wrote:

> Does anyone know why 'svn diff' has such strangely inconsistent
> behavior with regard to deleted directories?
>
> For example, if I move a directory in my working copy from foo1 to
> foo2, svn diff will show me the following:
>
> $ svn move foo1 foo2
> A foo3
> D foo2/file.txt
> D foo2
> $ svn di
> Index: foo2/file.txt
> ===================================================================
> --- foo2/file.txt (revision 0)
> +++ foo2/file.txt (working copy)
> @@ -1 +0,0 @@
> -blah
>
> So the delete shows up, but not the add.
>
> If I then commit and look at the repos-repos diff it looks like this:
>
> $ svn ci -m,
> Deleting foo2
> Adding foo3
>
> Committed revision 3.
> $ svn di -r 2:3 file:///home/rooneg/test/repos
> Index: foo3/file.txt
> ===================================================================
> --- foo3/file.txt (revision 0)
> +++ foo3/file.txt (revision 3)
> @@ -0,0 +1 @@
> +blah
>
> Ok, this way the add shows up but the delete does not.
>
> Is it just me, or is this kinda weird?
>
> For the curious, the reason I stumbled onto this is that I was trying
> to see what diff would show for a renamed directory (from the
> fs-atomic-renames branch), and the repos-repos diff I tried only
> showed me the add, not the delete. I was, needless to say, rather
> confused by this until I realized that 'svn move' results in the same
> behavior.

FYI, I reported something similar some time ago:
http://svn.haxx.se/dev/archive-2006-02/0853.shtml
and had a little discussion with maxb on it:
http://svn.haxx.se/dev/archive-2006-03/0034.shtml

Mathias

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 27 10:34:34 2006

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