Re: Backing out changes: the prefered method?

Sean Russell <ser@germane-software.com> writes:

> How will diffs on directories show up? At the moment if I have:
>
> A/x
>
> and I do:
>
> svn mv A B
> svn ci && svn up
> echo "blah" >> B/x
> svn ci
>
> diffs get all messed up.

In what way? svn diff -rREV1:REV2 cannot yet show deleted files in
deleted directories, but svn diff -rREV should work:

$ svnadmin create repo
$ svn co file:///home/pm/repo/ -d wc
$ cd wc
/home/pm/wc
$ svn mkdir foo
A foo
$ echo bar > foo/bar
$ svn add foo/bar
A foo/bar
$ svn ci -m ""
Adding /home/pm/wc/foo
Adding /home/pm/wc/foo/bar
Committed revision 1.
$ svn up
$ svn mv foo/ foo2
A foo2
D foo/bar
D foo
$ svn ci -m ""
Deleting /home/pm/wc/foo
Adding /home/pm/wc/foo2
Committed revision 2.
$ echo "bar2" >> foo2/bar
$ svn ci -m ""
Sending /home/pm/wc/foo2/bar
Committed revision 3.
$ svn up
D ./foo
$ svn diff -r1
Index: ./foo/bar
===================================================================
--- ./foo/bar
+++ ./.svn/empty-file Wed Jan 30 23:08:56 2002
@@ -1 +0,0 @@
-bar
Index: ./foo2/bar
===================================================================
--- ./foo2/bar
+++ ./foo2/bar Wed Jan 30 23:09:55 2002
@@ -0,0 +1,2 @@
+bar
+bar2

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org