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

Re: Problem when merging branch into trunk

From: Richard Morris <richard_at_hddbroker.com>
Date: 2007-02-20 02:26:27 CET

Richard Morris wrote:
> Hello all,
>
> I am having a problem merging a branch into the trunk. I checkout the
> trunk and then try to merge the branch into working copy but when I
> do, I get this error message:
>
> svn: URL
> 'http://svn.hddbroker.com/repos/intranet/branches/release-1.3.0/website/includes/javascript/sarissa'
> doesn't match existing URL
> 'http://svn.hddbroker.com/repos/intranet/trunk/website/includes/javascript/sarissa'
> in 'website/includes/javascript/sarissa'
>
> I did searched the mailing list archive to see if anyone else has
> encountered this problem and for the people that had their problems
> resolved they used the --ignore-ancestry but when I tried it go this
> error message:
>
> svn: Can't add 'website/includes/javascript/sarissa/doc/test' to a
> parent directory scheduled for deletion
>
> I have attached a log of the commands I used to try to merge the
> branch into the trunk.
> I know the problem revolves around the
> website/includes/javascript/sarissa' in
> 'website/includes/javascript/sarissa directory. In revision 260 I
> deleted that directory (which contained version 9.6.1 of Sarissa) and
> in revision 261 I added that directory back in (which now contained
> version 9.7.6 of Sarissa). It looks like to me subversion doesn't
> like me deleting a directory in one revision and then creating the
> same directory with new files in another revision.
>
> I am at a loss as to what I can do to resolve this. Can anyone
> suggest something?
>
> Thank you.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
I managed to fix the problem by upgrading to the latest version.
Apparently Subversion 1.3.1 didn't like the manner in which I deleted
the directory in one revision and then added a new directory with the
same name in another revision. Upgrading to Subversion 1.4.3 allowed me
to do what I needed to without a problem.

-- 
	
*Richard Morris*
Toll Free: 	(866) 960-3331
International: 	+1 250 474-6022
Fax: 	+1 250 474-6099
E-Mail: 	richard@hddbroker.com <mailto:richard@hddbroker.com>
Web Site: 	www.hddbroker.com <http://www.hddbroker.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 20 02:26:57 2007

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