Fix back-merge release artifact reconciliation

Author: alexphillips-dev

scripts/sync_main_to_dev.sh

@@ -23,19 +23,56 @@ release_only_path() {
 }
 
 restore_release_only_paths_from_previous() {
+  reconcile_release_only_paths_from_ref HEAD^ "$@"
+}
+
+path_exists_at_ref() {
+  local ref="${1:-}"
+  local path="${2:-}"
+  git cat-file -e "${ref}:${path}" 2>/dev/null
+}
+
+reconcile_release_only_paths_from_ref() {
+  local source_ref="${1:-}"
+  shift || true
   local file=""
   local -a restore_paths=()
+  local -a remove_paths=()
   for file in "$@"; do
     if release_only_path "${file}"; then
-      if git cat-file -e "HEAD^:${file}" 2>/dev/null; then
+      if path_exists_at_ref "${source_ref}" "${file}"; then
         restore_paths+=("${file}")
+      else
+        remove_paths+=("${file}")
       fi
     fi
   done
-  if [ "${#restore_paths[@]}" -eq 0 ]; then
-    return 0
+  if [ "${#restore_paths[@]}" -gt 0 ]; then
+    git restore --source="${source_ref}" --staged --worktree -- "${restore_paths[@]}"
   fi
-  git restore --source=HEAD^ --staged --worktree -- "${restore_paths[@]}"
+  if [ "${#remove_paths[@]}" -gt 0 ]; then
+    git rm -f --ignore-unmatch -- "${remove_paths[@]}" >/dev/null 2>&1 || true
+  fi
+}
+
+commit_paths_for_sync() {
+  local commit="${1:-}"
+  local status=""
+  local first_path=""
+  local second_path=""
+  while IFS=$'\t' read -r status first_path second_path; do
+    if [ -z "${status}" ]; then
+      continue
+    fi
+    case "${status}" in
+      R*|C*)
+        printf '%s\n' "${first_path}" "${second_path}"
+        ;;
+      *)
+        printf '%s\n' "${first_path}"
+        ;;
+    esac
+  done < <(git show --pretty=format: --name-status --find-renames "${commit}")
 }
 
 latest_dev_merge_into_main() {
@@ -44,6 +81,8 @@ latest_dev_merge_into_main() {
 
 resolve_release_only_conflicts() {
   local path=""
+  local -a commit_paths=("$@")
+  local -a reconcile_paths=()
   mapfile -t CONFLICT_PATHS < <(git diff --name-only --diff-filter=U || true)
   if [ "${#CONFLICT_PATHS[@]}" -eq 0 ]; then
     return 1
@@ -53,8 +92,8 @@ resolve_release_only_conflicts() {
       return 1
     fi
   done
-  git checkout --ours -- "${CONFLICT_PATHS[@]}"
-  git add -- "${CONFLICT_PATHS[@]}"
+  reconcile_paths=("${commit_paths[@]}" "${CONFLICT_PATHS[@]}")
+  reconcile_release_only_paths_from_ref HEAD "${reconcile_paths[@]}"
   return 0
 }
 
@@ -104,7 +143,7 @@ fi
 applied_commits=0
 
 for COMMIT in "${MAIN_ONLY_COMMITS[@]}"; do
-  mapfile -t COMMIT_PATHS < <(git show --pretty=format: --name-only "${COMMIT}" | sed '/^[[:space:]]*$/d')
+  mapfile -t COMMIT_PATHS < <(commit_paths_for_sync "${COMMIT}" | sed '/^[[:space:]]*$/d')
   if [ "${#COMMIT_PATHS[@]}" -eq 0 ]; then
     continue
   fi
@@ -124,14 +163,37 @@ for COMMIT in "${MAIN_ONLY_COMMITS[@]}"; do
     continue
   fi
 
+  commit_applied=0
+
   if ! git cherry-pick -x "${COMMIT}"; then
-    if resolve_release_only_conflicts && git cherry-pick --continue; then
-      :
+    if resolve_release_only_conflicts "${COMMIT_PATHS[@]}"; then
+      mapfile -t REMAINING_CONFLICT_PATHS < <(git diff --name-only --diff-filter=U || true)
+      if [ "${#REMAINING_CONFLICT_PATHS[@]}" -gt 0 ]; then
+        echo "Cherry-pick failed for ${COMMIT}; aborting auto back-merge." >&2
+        git cherry-pick --abort
+        exit 1
+      fi
+      if git diff --cached --quiet && git diff --quiet; then
+        git cherry-pick --skip
+        continue
+      elif git cherry-pick --continue; then
+        commit_applied=1
+      else
+        echo "Cherry-pick failed for ${COMMIT}; aborting auto back-merge." >&2
+        git cherry-pick --abort
+        exit 1
+      fi
     else
       echo "Cherry-pick failed for ${COMMIT}; aborting auto back-merge." >&2
       git cherry-pick --abort
       exit 1
     fi
+  else
+    commit_applied=1
+  fi
+
+  if [ "${commit_applied}" -eq 0 ]; then
+    continue
   fi
 
   if [ "${commit_touched_release_paths}" -eq 1 ]; then

tests/sync-main-to-dev.test.mjs

@@ -0,0 +1,89 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { execFileSync } from 'node:child_process';
+
+const repoRoot = path.resolve(process.cwd());
+const syncMainToDevPath = path.join(repoRoot, 'scripts/sync_main_to_dev.sh');
+
+function runGit(args, cwd) {
+    return execFileSync('git', args, {
+        cwd,
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'pipe']
+    }).trim();
+}
+
+function writeFile(targetPath, contents) {
+    fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+    fs.writeFileSync(targetPath, contents);
+}
+
+test('sync_main_to_dev keeps dev release artifacts when main release commits rename and add release-only paths', (t) => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'fvplus-sync-main-to-dev-'));
+    t.after(() => {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    });
+
+    const remoteDir = path.join(tempDir, 'remote.git');
+    const workDir = path.join(tempDir, 'work');
+
+    runGit(['init', '--bare', remoteDir], tempDir);
+    runGit(['clone', remoteDir, workDir], tempDir);
+    runGit(['config', 'user.name', 'FolderView Plus Test'], workDir);
+    runGit(['config', 'user.email', 'folderviewplus@example.com'], workDir);
+
+    writeFile(path.join(workDir, 'scripts', 'sync_main_to_dev.sh'), fs.readFileSync(syncMainToDevPath, 'utf8'));
+    writeFile(path.join(workDir, 'app.txt'), 'base\n');
+    writeFile(path.join(workDir, 'folderview.plus.plg'), 'version=2026.04.05.12\n');
+    writeFile(path.join(workDir, 'docs', 'releases', '2026.04.05.12.md'), 'Release 12\n');
+    writeFile(path.join(workDir, 'archive', 'folderview.plus-2026.04.05.12.txz'), 'archive 12\n');
+    writeFile(path.join(workDir, 'archive', 'folderview.plus-2026.04.05.12.txz.sha256'), 'sha256 12\n');
+
+    runGit(['add', '.'], workDir);
+    runGit(['commit', '-m', 'Initial repository state'], workDir);
+    runGit(['branch', '-M', 'main'], workDir);
+    runGit(['push', '-u', 'origin', 'main'], workDir);
+
+    runGit(['checkout', '-b', 'dev'], workDir);
+    runGit(['mv', 'docs/releases/2026.04.05.12.md', 'docs/releases/2026.04.05.14.md'], workDir);
+    runGit(['mv', 'archive/folderview.plus-2026.04.05.12.txz', 'archive/folderview.plus-2026.04.05.14.txz'], workDir);
+    fs.rmSync(path.join(workDir, 'archive', 'folderview.plus-2026.04.05.12.txz.sha256'));
+    writeFile(path.join(workDir, 'archive', 'folderview.plus-2026.04.05.14.txz.sha256'), 'sha256 14\n');
+    writeFile(path.join(workDir, 'folderview.plus.plg'), 'version=2026.04.05.14\n');
+    runGit(['add', '-A'], workDir);
+    runGit(['commit', '-m', 'Dev release artifacts'], workDir);
+    runGit(['push', '-u', 'origin', 'dev'], workDir);
+
+    runGit(['checkout', 'main'], workDir);
+    writeFile(path.join(workDir, 'app.txt'), 'base\nmain change\n');
+    runGit(['mv', 'docs/releases/2026.04.05.12.md', 'docs/releases/2026.04.05.13.md'], workDir);
+    runGit(['mv', 'archive/folderview.plus-2026.04.05.12.txz', 'archive/folderview.plus-2026.04.05.13.txz'], workDir);
+    fs.rmSync(path.join(workDir, 'archive', 'folderview.plus-2026.04.05.12.txz.sha256'));
+    writeFile(path.join(workDir, 'archive', 'folderview.plus-2026.04.05.13.txz.sha256'), 'sha256 13\n');
+    writeFile(path.join(workDir, 'folderview.plus.plg'), 'version=2026.04.05.13\n');
+    runGit(['add', '-A'], workDir);
+    runGit(['commit', '-m', 'Stable release 2026.04.05.13'], workDir);
+    runGit(['push', 'origin', 'main'], workDir);
+
+    execFileSync('bash', ['scripts/sync_main_to_dev.sh'], {
+        cwd: workDir,
+        encoding: 'utf8',
+        env: {
+            ...process.env,
+            FVPLUS_BACKMERGE_LOCAL_BRANCH: 'backmerge/test'
+        },
+        stdio: ['ignore', 'pipe', 'pipe']
+    });
+
+    const diffFiles = runGit(['diff', '--name-only', 'origin/dev..backmerge/test'], workDir)
+        .split(/\r?\n/)
+        .filter(Boolean);
+    assert.deepEqual(diffFiles, ['app.txt']);
+    assert.equal(runGit(['show', 'backmerge/test:app.txt'], workDir), 'base\nmain change');
+    assert.equal(runGit(['show', 'backmerge/test:folderview.plus.plg'], workDir), 'version=2026.04.05.14');
+    assert.match(runGit(['ls-tree', '-r', '--name-only', 'backmerge/test'], workDir), /docs\/releases\/2026\.04\.05\.14\.md/);
+    assert.doesNotMatch(runGit(['ls-tree', '-r', '--name-only', 'backmerge/test'], workDir), /2026\.04\.05\.13/);
+});

tests/versioning-guard.test.mjs

@@ -526,11 +526,14 @@ test('back-merge sync script keeps dev linear and drops stable release artifacts
     assert.match(syncMainToDev, /git rev-list --reverse --first-parent --no-merges "\$\{SYNC_BASE\}\.\.\$\{MAIN_REF\}"/);
     assert.match(syncMainToDev, /git cherry-pick -x "\$\{COMMIT\}"/);
     assert.match(syncMainToDev, /git diff --name-only --diff-filter=U/);
-    assert.match(syncMainToDev, /git checkout --ours -- "\$\{CONFLICT_PATHS\[@\]\}"/);
+    assert.match(syncMainToDev, /commit_paths_for_sync/);
+    assert.match(syncMainToDev, /git show --pretty=format: --name-status --find-renames "\$\{commit\}"/);
+    assert.match(syncMainToDev, /reconcile_release_only_paths_from_ref HEAD "\$\{reconcile_paths\[@\]\}"/);
     assert.match(syncMainToDev, /git cherry-pick --continue/);
     assert.match(syncMainToDev, /docs\/releases\/\*\.md/);
     assert.match(syncMainToDev, /restore_release_only_paths_from_previous/);
-    assert.match(syncMainToDev, /git restore --source=HEAD\^ --staged --worktree -- "\$\{restore_paths\[@\]\}"/);
+    assert.match(syncMainToDev, /git restore --source="\$\{source_ref\}" --staged --worktree -- "\$\{restore_paths\[@\]\}"/);
+    assert.match(syncMainToDev, /git rm -f --ignore-unmatch -- "\$\{remove_paths\[@\]\}"/);
     assert.doesNotMatch(syncMainToDev, /git merge --no-ff --no-commit/);
 });