From 63beb9cd39369fc756040bcf68aecdcde21ffa98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Tue, 28 Feb 2006 16:08:49 +0000
Subject: [PATCH] Installer should merge directories and replace files

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16548 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/installer/InstallerCopyLoopControl.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/apps/installer/InstallerCopyLoopControl.cpp b/src/apps/installer/InstallerCopyLoopControl.cpp
index 3a143a3f79..4221366c51 100644
--- a/src/apps/installer/InstallerCopyLoopControl.cpp
+++ b/src/apps/installer/InstallerCopyLoopControl.cpp
@@ -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;
 }