Permalink
Browse files

Do third check for clean directory only if needed.

  • Loading branch information...
1 parent 15c7ac6 commit 8cdff36e4b1472b4c3293af8b5785b8fa5db4cfb @thomie thomie committed Aug 15, 2010
Showing with 2 additions and 2 deletions.
  1. +2 −2 darcs-to-git
View
@@ -306,10 +306,10 @@ class DarcsPatch
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
- end
- unless darcs_reports_clean_repo?
+ unless darcs_reports_clean_repo?
system("darcs whatsnew -sl")
raise "Failed to clean repo, see above"
+ end
end
end

0 comments on commit 8cdff36

Please sign in to comment.