From: androdev k <and...@gm...> - 2008-12-17 08:38:44
|
Please help. When I run directory merge (F7), KDiff3 first deletes the folder in the destination (C), and copies the files from the source (B). So if my destination folder contains "ignored" content such as CVS folder, binary content, etc. they will all be deleted/lost. This is the simulation run output: delete directory recursively( <C>/commoncpp ) delete directory recursively( <C>/commoncpp/src ) delete directory recursively( <C>/commoncpp/src/common ) delete( <C>/commoncpp/src/common/DatabaseException.cpp ) copy( <B>/commoncpp/src/common/DatabaseException.cpp -> <C>/commoncpp/src/common/DatabaseException.cpp ) delete( <C>/commoncpp/src/common/DatabaseException.h ) copy( <B>/commoncpp/src/common/DatabaseException.h -> <C>/commoncpp/src/common/DatabaseException.h ) How can I change this behaviour? Deleting <C> folders just to update one of the files inside has very bad side effects. Thanks. A.D |