Permalink
Browse files

Also handle new-style ".~0~" darcs backup file suffixes

Closes #16
  • Loading branch information...
purcell committed Nov 10, 2013
1 parent 379c5bf commit d41c488758ef7525efbdfc30b1a39886c413e1b5
Showing with 1 addition and 1 deletion.
  1. +1 −1 darcs-to-git
View
@@ -344,7 +344,7 @@ class DarcsPatch
if OPTIONS[:do_checks] and not 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-backup[0-9]' -exec rm -rf {} \\;") # darcs2 creates these
+ run("find . -name '*-darcs-backup[0-9]' -o -name '*.~[0-9]~' -exec rm -rf {} \\;") # darcs2 creates these
unless darcs_reports_clean_repo?
system("darcs whatsnew -sl")
raise "Failed to clean repo, see above"

0 comments on commit d41c488

Please sign in to comment.