[Kdiff3-user] Ignored subdirectories deleted during merge

[Vladan B. <vb...@ie...>]

Hi,

I have the following problem:

I'm trying to merge three directories under CVS control and I have 
configured kdiff3 to ignore the subdirectories named CVS.

If I choose to put the results of the merge in directory C, kdiff3 will 
delete some of the ignored CVS subdirectories instead of leaving them 
alone. This happens for the directories where the "A" or "B" merge 
operation is chosen for the entire directory.

The workaround I found is to select "Do nothing" for the directory, and 
then manually set "A" or "B" for each file, but this is really tedious.

Shouldn't selecting the "A", "B" or "C" operation for a directory mean 
that it should be applied to individual files instead of the directory 
itself?

A similar thing happens if the option to create .orig backup files is 
active. In this case the original directory at the destination will be 
renamed into .orig, and the corresponding directory from "A" or "B" 
copied over (but without the ignored files). Here again I lose the CVS 
subdirectory.

Is this the intended behavior, and can it be changed? Or is there 
another way to do it?

Thanks,

Vladan.

-- 
Vladan Bato
vb...@ie...