Fixing diff problems by providing source block and checking for

directories in diff
2015-02-24 21:04:21 -05:00
parent 42f661cfbf
commit 978416d1e4
3 changed files with 7 additions and 4 deletions
--- a/lib/homesick/actions/file_actions.rb
+++ b/lib/homesick/actions/file_actions.rb
@@ -73,7 +73,7 @@ module Homesick
        when :conflict
          say_status :conflict, "#{destination} exists", :red

-          if collision_accepted?(destination)
+          if collision_accepted?(destination, source)
            FileUtils.rm_r destination, force: true unless options[:pretend]
            FileUtils.ln_s source, destination, force: true unless options[:pretend]
          end