Installer should merge directories and replace files

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16548 a95241bf-73f2-0310-859d-f6bbb57e9c96
2006-02-28 16:08:49 +00:00
parent f764a491bb
commit 63beb9cd39
1 changed files with 4 additions and 1 deletions
@@ -57,7 +57,10 @@ InstallerCopyLoopControl::OverwriteOnConflict(const BEntry *srcEntry,
 			const char *destName, const BDirectory *destDir, bool srcIsDir, 
 			bool dstIsDir)
 {
-	return kReplace;
+	if (srcIsDir && dstIsDir)
 		return kMerge;
 	else
 		return kReplace;
 }