X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=401713f61a4f010a21a68440357b7f2fd13f7f7f;hb=4d4f5228c8564b83cb232b8c33b8c039acd31efc;hp=463051e6165f4d560d36c94b45e4c044f7867684;hpb=a861d8e4e8a484679865bf5cd4e26954f76452da;p=bertos.git

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")