From: duplo <duplo@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 31 Aug 2009 10:30:13 +0000 (+0000)
Subject: Add raw copy merge function.
X-Git-Tag: 2.2.0~144
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=4d4f5228c8564b83cb232b8c33b8c039acd31efc;p=bertos.git

Add raw copy merge function.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2824 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 463051e6..401713f6 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -89,8 +89,13 @@ def loadBertosProject(project_file):
     return project_info
 
 def mergeSources(srcdir, new_sources, old_sources):
+    # The current mergeSources function provide only a raw copy of the sources in the
+    # created project.
+    #
     # TODO: implement the three way merge algorithm
-    pass
+    #
+    shutil.rmtree(srcdir, True)
+    copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST)
 
 def projectFileGenerator(project_info):
     directory = project_info.info("PROJECT_PATH")