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

Merge Error

From: <Roman.Bosak_at_tietoenator.com>
Date: 2006-05-19 11:12:58 CEST

I think I found an error in merge. I have following configuration:
While working with branch1 I deleted subdir11 from SVN and reverted this delete adding subdir11 back.
Now when I am trying to merge branch1 into branch2 merge process crashed with Error.

Roman Bosák
Senior Software Specialist
Czech Software Center
Phone +420 599 096 022
E-mail: roman.bosak@tietoenator.com <mailto:roman.bosak@tietoenator.com>
Vıstavní 13
CZ-709 00 Ostrava
Czech Republic
www.tietoenator.com <http://www.tietoenator.com/>

Received on Fri May 19 11:15:20 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.