Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Handle conflict backup files with spaces

  • Loading branch information...
commit 5e8f29236551839015fff5a08cc804b424c3d741 1 parent 4271fa3
@jmah jmah authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  darcs-to-git
View
2  darcs-to-git
@@ -297,7 +297,7 @@ class DarcsPatch
unless darcs_reports_clean_repo?
puts "Darcs reports dirty directory: assuming conflict that is fixed by a later patch... reverting"
run("darcs revert --all")
- run("find . -name '*-darcs-backup0'|xargs rm -f") # darcs2 creates these
+ run("find . -name '*-darcs-backup0' -exec rm -f {} \\;") # darcs2 creates these
end
unless darcs_reports_clean_repo?
system("darcs whatsnew -sl")
Please sign in to comment.
Something went wrong with that request. Please try again.