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

merge problem

From: Yahor Sinkevich <tom_at_ultersys.ru>
Date: Thu, 28 Feb 2008 20:43:01 +0200

Hi, TSVN guru! J

 

I'm using TSVN for long time.

Now I need do some not trivial merge.

 

From branch V0 I made branch V1, some revisions commited to V1, then I made
branch V2 (copy from V1). Some revisions commited to V2.

Now I need merge all changes made in V1 and V2 back to the V0.

 

See settings in attached file.

After I press "Dry run" I got error:

Error: REPORT request failed on '/Repos/bvfusion/!svn/vcc/default'

Error: Cannot replace a directory from within

 

I cannot understand how can I fix it.

 

Thanks a lot!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org

TSVN1.JPG
Received on 2008-02-28 20:12:28 CET

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