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

Bug: svn merge checks URLs literally for added files

From: Jens Seidel <jensseidel_at_users.sourceforge.net>
Date: 2006-11-25 21:21:06 CET

Hi,

I recognized an obscure behaviour which is probably a bug.

I use subversion 1.4.2 together with an older version on the server
which I access with svn+ssh://.

My working copy uses the URL
 svn+ssh://IP/svn-repository/project
and I tried to merge using

$ svn merge -r 725:753 svn+ssh://jens@IP/svn-repository/project/trunk
Skipped missing target: 'src/dir/file1'
C src/dir/file2
svn: The URL 'svn+ssh://jens@IP/svn-repository/project/trunk/src/directory'
has a different repository root than its parent

As you see I use jens@ in the URL inconsistently nevertheless I always
refer to the same repository.

svn complained about the directory "src/directory", which "merge" tries to
add. Since file2 is properly patched (marked as conflict) I wonder why
subversion worries about the directory.

Jens

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Nov 25 21:25:27 2006

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