Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

More aggressively clear out darcs backup files when importing conflic…

…ting patches
  • Loading branch information...
commit e86c9c03367d01257f2470b9e1caada64d7aa84c 1 parent 2edca09
@purcell authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 darcs-to-git
6 darcs-to-git
@@ -118,9 +118,9 @@ OPTIONS
opts.on('--version', "Output version information and exit") do
puts <<-EOF
-darcs-to-git 0.1
+darcs-to-git 0.2
-Copyright (c) 2009 Steve Purcell,
+Copyright (c) 2009-#{} Steve Purcell,
License MIT: <>
This is free software: you are free to change and redistribute it.
@@ -337,7 +337,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-backup0' -exec rm -f {} \\;") # darcs2 creates these
+ run("find . -name '*-darcs-backup[0-9]' -exec rm -rf {} \\;") # darcs2 creates these
unless darcs_reports_clean_repo?
system("darcs whatsnew -sl")
raise "Failed to clean repo, see above"
Please sign in to comment.
Something went wrong with that request. Please try again.