Strange diff after merge

[Lele Gaifax <le...@nautilus.homeip.net>]

Hi all,

I have the following scenario:

## Create a simple repos
# cd /tmp
# svnadmin create repos
# svn co file:///tmp/repos wc
# cd wc
# svn mkdir product
# cp /etc/passwd product/a.txt
# svn add product/a.txt
# svn ci -m "upstream product"

## Make a branch of something
# svn cp file:///tmp/repos/product /tmp/wc/tailored

## Add something to the upstream product
# cd /tmp/wc/product
# ls -la > b.txt
# svn add b.txt
# svn ci -m "Added something to upstream"

## Merge upstream changes to the branch
# cd /tmp/wc/tailored
# svn merge -r 1:2 file:///tmp/repos/product .

Till here everything works as expected, as the merge did copy the new
"b.txt" into the branch:

# cd /tmp/wc/tailored
# svn st
A  +   .
A  +   b.txt

But now, asking for a diff, it emits a deletion of file "b.txt", not
noticing it has been added

## Show diff
# cd /tmp/wc/tailored
# svn diff --old file:///tmp/repos/product@2 --new .
Index: b.txt
===================================================================
--- b.txt	(revision 2)
+++ b.txt	(working copy)
@@ -1,6 +0,0 @@
-totale 5
-drwxrwxr-x    3 lele     lele         1024  6 mag 11:11 .
-drwxrwxr-x    5 lele     lele         1024  6 mag 11:11 ..
--rw-r--r--    1 lele     lele         1998  6 mag 11:11 a.txt
--rw-rw-r--    1 lele     lele            0  6 mag 11:11 b.txt
-drwxrwxr-x    7 lele     lele         1024  6 mag 11:11 .svn

Am i misunderstanding something here?

Thanx, in advance,
ciao, lele.
-- 
nickname: Lele Gaifax	| Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas	| comincerò ad aver paura di chi mi copia.
email: lele@seldati.it	|		-- Fortunato Depero, 1929.


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