fixed changes from merged repo

Author: SPRINX0\prochazka

src/diflow.test.ts

@@ -191,4 +191,24 @@ describe('Git Repository Tests', () => {
     // Verify changes
     expect(mergedExists).toBe(false);
   });
+
+  test('Adding file to merged', async () => {
+    await createTestCommit(getTestRepoPath('merged'), 'outer.txt', 'outer', 'merged');
+    await createTestCommit(getTestRepoPath('merged'), 'folder/inner.txt', 'inner', 'merged');
+
+    await beforeDiflow();
+
+    const processor = new Processor(getTestRepoPath('config'), path.join(__dirname, 'workrepos'), 'master');
+    await processor.process();
+
+    await afterDiflow();
+
+    await checkStateInConfig();
+
+    expect(await fs.exists(path.join(getTestRepoPath('diff'), 'outer.txt'))).toBe(true);
+    expect(await fs.exists(path.join(getTestRepoPath('base'), 'outer.txt'))).toBe(false);
+
+    expect(await fs.exists(path.join(getTestRepoPath('diff'), 'folder/inner.txt'))).toBe(false);
+    expect(await fs.exists(path.join(getTestRepoPath('base'), 'folder/inner.txt'))).toBe(true);
+  });
 });

src/processor.ts

@@ -246,9 +246,19 @@ class CommitProcessor {
   }
 
   async processMergedFile(file: ChangeItem) {
-    if (file.action === 'M' || file.action === 'A') {
-      await copyRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.base, file.file);
-      await copyRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.diff, file.file);
+    if (file.action === 'A') {
+      if (await fs.exists(path.join(this.processor.repoPaths.diff, path.dirname(file.file)))) {
+        // if exists folder, copy to diff
+        await copyRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.diff, file.file);
+      } else {
+        await copyRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.base, file.file);
+      }
+    } else if (file.action === 'M') {
+      if (await repoFileExists(this.processor.repoPaths.diff, file.file)) {
+        await copyRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.diff, file.file);
+      } else {
+        await copyRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.base, file.file);
+      }
     } else if (file.action === 'D') {
       await removeRepoFile(this.processor.repoPaths.base, file.file);
       await removeRepoFile(this.processor.repoPaths.diff, file.file);

src/testrepo.ts

@@ -28,6 +28,7 @@ export async function createTestCommit(
   message?: string
 ) {
   console.log('Creating commit:', repoPath, 'file:', fileName, 'content:', content);
+  await fs.ensureDir(path.join(repoPath, path.dirname(fileName)));
   await fs.writeFile(path.join(repoPath, fileName), content);
   await execAsync('git add .', { cwd: repoPath });
   if (message) {