$ arc patch --force D222 Created and checked out branch arcpatch-D222. Checking patch Source/Installer/Installer.ism... Checking patch Source/Installer/Script Files/Setup.Rul => Source/Installer/Script Files/Setup.rul... error: Source/Installer/Script Files/Setup.rul: already exists in working directory Applied patch Source/Installer/Installer.ism cleanly. Patch Failed! Usage Exception: Unable to apply patch!
I understand that there's an underlying problem where git sucks at this on Windows all on its own, but arc complicates things by being case-sensitive internally even when the file system isn't:
$ git mv "Source/Installer/Script Files/Setup.Rul" tmp $ git mv tmp "Source/Installer/Script Files/Setup.rul" $ git commit -m "Just the rename" [master 75c1116] Just the rename 1 file changed, 0 insertions(+), 0 deletions(-) rename Source/Installer/Script Files/{Setup.Rul => Setup.rul} (100%) $ arc patch --force --nobranch --trace D222 ... >>> [8] <exec> $ git show -s --format=%H "7e14f647cf7a194d8fd38c6c90dab282300bdb4d" -- <<< [8] <exec> 108,397 us >>> [9] <exec> $ git branch --no-color <<< [9] <exec> 107,420 us >>> [10] <exec> $ git rev-parse --verify "arcpatch-D222" <<< [10] <exec> 104,492 us >>> [11] <exec> $ git show -s --format=%H "7e14f647cf7a194d8fd38c6c90dab282300bdb4d" -- <<< [11] <exec> 105,468 us >>> [12] <exec> $ git checkout -b "arcpatch-D222" "7e14f647cf7a194d8fd38c6c90dab282300bdb4d" <<< [12] <exec> 511,718 us [2015-01-30 13:23:52] EXCEPTION: (CommandException) Command failed with error #1! COMMAND git checkout -b "arcpatch-D222" "7e14f647cf7a194d8fd38c6c90dab282300bdb4d" STDOUT (empty) STDERR error: The following untracked working tree files would be overwritten by checkout: Source/Installer/Script Files/Setup.Rul Please move or remove them before you can switch branches. Aborting at [<phutil>\src\future\exec\ExecFuture.php:397] #0 ExecFuture::resolvex() called at [<arcanist>\src\repository\api\ArcanistRepositoryAPI.php:394] #1 ArcanistRepositoryAPI::execxLocal(string, string, string) called at [<arcanist>\src\workflow\ArcanistPatchWorkflow.php:290] #2 ArcanistPatchWorkflow::createBranch(ArcanistBundle, boolean) called at [<arcanist>\src\workflow\ArcanistPatchWorkflow.php:431] #3 ArcanistPatchWorkflow::run() called at [<arcanist>\src\workflow\ArcanistPatchWorkflow.php:375] #4 ArcanistPatchWorkflow::run() called at [<arcanist>\scripts\arcanist.php:364] $ git status On branch master Your branch is ahead of 'origin/master' by 1 commit. (use "git push" to publish your local commits) nothing to commit, working directory clean