Add rebase and add-conflict handling

Author: ppotepa

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.1.17] - 2026-06-07
+
+### Added
+
+- Added `rpack rebase` for rewriting existing packages against the current target repository working tree and producing a new package.
+- Added conflict policy options for already-present added files in `check` and `apply`:
+  - `--resolve-added-file-conflicts <abort|skip|modify|overwrite>`
+  - `--allow-existing-added-files <same>`
+  - `as-modify` is accepted as an alias of `modify`.
+- Added automatic `ADD`-to-`MODIFY` rewrite during package application when a new-file patch conflicts with an existing file and policy allows conversion.
+
+### Changed
+
+- Rebase and add-conflict handling are now exposed and documented in CLI usage and README.
+- `rpack` still does not alter git history; `rebase` rewrites patch content only.
+
 ## [0.1.16] - 2026-06-07
 
 ### Added

README.md

@@ -6,12 +6,13 @@
 
 **Repository Pack**: portable, validated patch packages for Git working trees.
 
-`rpack` is a small CLI tool for moving code changes between repositories as a single `.rpack` file. It does not create commits, branches, tags, rebases, or otherwise modify Git history. It only validates and applies patches to the working tree.
+`rpack` is a small CLI tool for moving code changes between repositories as a single `.rpack` file. It does not create commits, branches, or otherwise modify Git history. It only validates and applies patches to the working tree.
 
 ```bash
 rpack create -o change.rpack
 rpack inspect change.rpack
 rpack check change.rpack
+rpack rebase change.rpack
 rpack apply change.rpack
 rpack undo
 ```
@@ -38,7 +39,7 @@ Implemented:
 - `.rpack` as ZIP
 - `manifest.json`
 - one or more ordered `git diff --binary` patches
-- `create`, `inspect`, `check`, `apply`, `undo`, `history`
+- `create`, `inspect`, `check`, `rebase`, `apply`, `undo`, `history`
 - `open` for guided package application
 - checksum verification
 - clean working tree requirement by default
@@ -90,7 +91,7 @@ dotnet pack src/Rpack.Cli -c Release
 Build Windows MSI locally (both variants at once):
 
 ```powershell
-.\scripts\build-windows-msi.ps1 -Version 0.1.16
+.\scripts\build-windows-msi.ps1 -Version 0.1.17
 ```
 
 This creates two installers:
@@ -101,8 +102,8 @@ This creates two installers:
 Build only one variant when needed:
 
 ```powershell
-.\scripts\build-windows-msi.ps1 -Version 0.1.16 -Variant framework-dependent
-.\scripts\build-windows-msi.ps1 -Version 0.1.16 -Variant self-contained
+.\scripts\build-windows-msi.ps1 -Version 0.1.17 -Variant framework-dependent
+.\scripts\build-windows-msi.ps1 -Version 0.1.17 -Variant self-contained
 ```
 
 ## Usage
@@ -127,6 +128,12 @@ Create a package from a revision range, still as a working tree patch:
 rpack create --from HEAD~2 --to HEAD -o change.rpack
 ```
 
+Rebase a package against another repository working tree:
+
+```bash
+rpack rebase change.rpack ./other-repo -o change-rebased.rpack
+```
+
 Inspect a package without applying it:
 
 ```bash
@@ -185,6 +192,17 @@ Apply a package to the current repository:
 rpack apply change.rpack
 ```
 
+Handle existing-file add conflicts explicitly when needed:
+
+```bash
+rpack apply change.rpack --allow-existing-added-files modify
+rpack apply change.rpack --resolve-added-file-conflicts as-modify
+rpack apply change.rpack --allow-existing-added-files skip
+rpack apply change.rpack --allow-existing-added-files overwrite
+```
+
+By default, `rpack` fails on added-file conflicts (`abort`).
+
 Open a package with a guided inspect/check/apply flow:
 
 ```bash

scripts/build-windows-msi.ps1

@@ -1,5 +1,5 @@
 param(
-    [string] $Version = "0.1.16",
+    [string] $Version = "0.1.17",
     [string] $Runtime = "win-x64",
     [string] $Configuration = "Release",
     [string] $OutputDirectory = "artifacts",

src/Rpack.Cli/Program.cs

@@ -27,6 +27,7 @@
         "diagnose" => RunDiagnose(args.Skip(1).ToArray(), service),
         "lint" => RunLint(args.Skip(1).ToArray(), service),
         "apply" => RunApply(args.Skip(1).ToArray(), service),
+        "rebase" => RunRebase(args.Skip(1).ToArray(), service),
         "open" => RunOpen(args.Skip(1).ToArray(), service, gitClient),
         "undo" => RunUndo(args.Skip(1).ToArray(), service),
         "history" => RunHistory(args.Skip(1).ToArray(), service),
@@ -142,6 +143,34 @@ static int RunCheck(string[] args, RpackPackageService service)
         AllowDirty = options.Has("--allow-dirty"),
         StrictBase = options.Has("--strict-base"),
         PathPrefix = options.Value("--path-prefix"),
+        AddedFileConflictResolution = ResolveAddedFileConflictResolution(options),
+        IgnoreSpaceChange = ResolveIgnoreSpaceChange(options)
+    });
+
+    return PrintResult(result);
+}
+
+static int RunRebase(string[] args, RpackPackageService service)
+{
+    var options = CliOptions.Parse(args);
+    if (options.Positionals.Count < 1)
+    {
+        return Fail("Usage: rpack rebase <package.rpack> [repo] -o <package-rebased.rpack>");
+    }
+
+    var output = options.Value("-o") ?? options.Value("--output");
+    if (string.IsNullOrWhiteSpace(output))
+    {
+        return Fail("Missing output path. Use -o package-rebased.rpack.");
+    }
+
+    var result = service.Rebase(new RebasePackageOptions
+    {
+        PackagePath = options.Positionals[0],
+        RepositoryPath = ResolveRepositoryArgument(options),
+        OutputPath = output,
+        PathPrefix = options.Value("--path-prefix"),
+        AddedFileConflictResolution = ResolveAddedFileConflictResolution(options),
         IgnoreSpaceChange = ResolveIgnoreSpaceChange(options)
     });
 
@@ -163,6 +192,7 @@ static int RunApply(string[] args, RpackPackageService service)
         AllowDirty = options.Has("--allow-dirty"),
         StrictBase = options.Has("--strict-base"),
         PathPrefix = options.Value("--path-prefix"),
+        AddedFileConflictResolution = ResolveAddedFileConflictResolution(options),
         IgnoreSpaceChange = ResolveIgnoreSpaceChange(options)
     });
 
@@ -184,6 +214,7 @@ static int RunDiagnose(string[] args, RpackPackageService service)
         AllowDirty = options.Has("--allow-dirty"),
         StrictBase = options.Has("--strict-base"),
         PathPrefix = options.Value("--path-prefix"),
+        AddedFileConflictResolution = ResolveAddedFileConflictResolution(options),
         IgnoreSpaceChange = ResolveIgnoreSpaceChange(options)
     });
 
@@ -261,6 +292,7 @@ static int RunOpen(string[] args, RpackPackageService service, GitClient gitClie
         AllowDirty = allowDirty,
         StrictBase = strictBase,
         PathPrefix = pathPrefix,
+        AddedFileConflictResolution = ResolveAddedFileConflictResolution(options),
         AllowedDirtyPaths = allowedDirtyPaths,
         IgnoreSpaceChange = ignoreSpaceChange
     });
@@ -446,8 +478,9 @@ rpack create --from <rev> --to <rev> -o <package.rpack> [--repo <repo>]
       rpack inspect <package.rpack> [--path-prefix <prefix>]
       rpack check <package.rpack> [repo] [--allow-dirty] [--strict-base] [--path-prefix <prefix>] [--strict]
       rpack diagnose <package.rpack> [repo] [--allow-dirty] [--strict-base] [--path-prefix <prefix>] [--strict]
+      rpack rebase <package.rpack> [repo] -o <package-rebased.rpack> [--path-prefix <prefix>] [--strict]
       rpack lint <package.rpack> [--path-prefix <prefix>]
-      rpack apply <package.rpack> [repo] [--allow-dirty] [--strict-base] [--path-prefix <prefix>] [--strict]
+      rpack apply <package.rpack> [repo] [--allow-dirty] [--strict-base] [--path-prefix <prefix>] [--strict] [--resolve-added-file-conflicts <mode>] [--allow-existing-added-files <mode>]
       rpack open <package.rpack> [repo] [--allow-dirty] [--strict-base] [--path-prefix <prefix>] [--strict] [--yes]
       rpack undo [repo] [--allow-dirty]
       rpack history [repo]
@@ -465,6 +498,8 @@ rpack applies validated patch packages to the Git working tree.
       --strict               Require exact patch context whitespace.
       --strict-whitespace    Alias for --strict.
       --ignore-space-change  Compatibility no-op; this is the default mode.
+      --resolve-added-file-conflicts <mode>  How to resolve add-conflict: abort|skip|modify|overwrite.
+      --allow-existing-added-files <mode>    Alias for --resolve-added-file-conflicts.
     """);
 }
 
@@ -479,6 +514,13 @@ static bool ResolveIgnoreSpaceChange(CliOptions options)
     return !strictWhitespace;
 }
 
+static string ResolveAddedFileConflictResolution(CliOptions options)
+{
+    return options.Value("--resolve-added-file-conflicts")
+        ?? options.Value("--allow-existing-added-files")
+        ?? "abort";
+}
+
 static void PrintVersion()
 {
     var version = Assembly.GetExecutingAssembly()
@@ -502,6 +544,8 @@ internal sealed class CliOptions
         "--id",
         "--title",
         "--description",
+        "--resolve-added-file-conflicts",
+        "--allow-existing-added-files",
         "--path-prefix"
     };
 

src/Rpack.Cli/Rpack.Cli.csproj

@@ -9,7 +9,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <AssemblyName>rpack</AssemblyName>
     <RootNamespace>Rpack.Cli</RootNamespace>
-    <Version>0.1.16</Version>
+    <Version>0.1.17</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>Pawel Potepa</Authors>
     <Description>Portable, validated patch packages for Git working trees.</Description>

src/Rpack.Core/GitClient.cs

@@ -180,6 +180,17 @@ public string CreateDiff(string repositoryPath, string fromRevision, string toRe
         return result.StandardOutput;
     }
 
+    public string CreateNoIndexDiff(string repositoryPath, string leftPath, string rightPath)
+    {
+        var result = _processRunner.Run("git", ["diff", "--binary", "--no-index", "--", leftPath, rightPath], repositoryPath);
+        if (!result.Success && result.ExitCode != 1)
+        {
+            throw new InvalidOperationException(result.CombinedOutput);
+        }
+
+        return result.StandardOutput;
+    }
+
     public string CreateWorkingTreeDiff(string repositoryPath)
     {
         var result = _processRunner.Run("git", ["diff", "--binary"], repositoryPath);
@@ -287,6 +298,44 @@ public RpackResult ReverseApply(string repositoryPath, string patchPath, bool ig
             ? RpackResult.Ok("Patch reverted.")
             : RpackResult.Fail(result.CombinedOutput);
     }
+
+    public string CreateDetachedWorktree(string repositoryPath)
+    {
+        var temporaryWorktreePath = Path.Combine(Path.GetTempPath(), $"rpack-worktree-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(temporaryWorktreePath);
+        var result = _processRunner.Run("git", ["worktree", "add", "--detach", temporaryWorktreePath, "HEAD"], repositoryPath);
+        if (!result.Success)
+        {
+            Directory.Delete(temporaryWorktreePath, recursive: true);
+            throw new InvalidOperationException(result.CombinedOutput);
+        }
+
+        return temporaryWorktreePath;
+    }
+
+    public RpackResult RemoveDetachedWorktree(string repositoryPath, string worktreePath)
+    {
+        if (string.IsNullOrWhiteSpace(worktreePath))
+        {
+            return RpackResult.Ok("No worktree path provided.");
+        }
+
+        var result = _processRunner.Run("git", ["worktree", "remove", "--force", worktreePath], repositoryPath);
+        if (!result.Success)
+        {
+            try
+            {
+                Directory.Delete(worktreePath, recursive: true);
+                return RpackResult.Ok("Worktree removed.");
+            }
+            catch
+            {
+                return RpackResult.Fail(result.CombinedOutput);
+            }
+        }
+
+        return RpackResult.Ok("Worktree removed.");
+    }
 }
 
 public sealed record GitRepository(string RootPath, string StatePath);