On Thursday 04 March 2004 11:05, Rene Rebe wrote:
> Hi all,
>
> according to the attached mail subversion (at least the client) seems
> to have a problems including the diff of deleted files if the whole
> directory is deleted.
[snip]
> Hi,
>
> I've found the following bug in subversion: When I 'svn rm' a directory
> with files in it and 'svn commit' that change, an 'svn diff -rN:M' doesn't
> contain the removals of the files in that directory.
>
> If I just 'svn rm' the files (no the directory itself), the patch is ok.
Hmm... these commands seem to work:
svn diff -rN:BASE
svn diff -rPREV:BASE
These don't seem to:
svn diff -rPREV:M
svn diff -rN:M .
svn diff -rN:M URL
It apparently has something to do with the fact that once the diff routine
hits a deleted directory, it doesn't go any further. For the commands that
work, diff_file_deleted_with_diff() gets called for the missing files but
diff_dir_deleted() doesn't get called. For the second set of commands, it's
vice-versa.
FWIW, diff -u doesn't produce diffs if a directory is missing. I had the
following trees set up:
a/
a/
1
2
3
b/
A 'diff -u a/ b/' produced:
Only in a/: a
I also tried a few other options (-r and -N to be exact), and still couldn't
get it to produce diffs when the directory was missing. So, I'm not sure
what the right interaction is here. Can patch handle removing directories?
-John
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 9 00:14:59 2004