Hi,
I think I found an error in merge. I have following configuration:
branch1:
dir1
subdir11
file1
...
subdir12
branch2:
dir1
subdir11
file1
...
subdir12
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.
br,
<*.bosy>
Roman Bosák
Senior Software Specialist
TietoEnator
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