Skip to content
Browse files

Merge [5914] from trunk. References #7015.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5915 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 06c7584 commit 18857ca2cb1a6ad05bfb4a3b21e3b170b7955159 @jeremy jeremy committed
Showing with 6 additions and 1 deletion.
  1. +5 −0 railties/CHANGELOG
  2. +1 −1 railties/lib/rails_generator/commands.rb
View
5 railties/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Generator: use destination path for diff tempfiles. #7015 [alfeld]
+
+
*1.2.0 RC2* (r5847, January 4th, 2007)
* Fixed that webrick would strip leading newlines and hang connection #4156 [psross]
View
2 railties/lib/rails_generator/commands.rb
@@ -96,7 +96,7 @@ def force_file_collision?(destination, src, dst, file_options = {}, &block)
$stdout.print "overwrite #{destination}? [Ynaqd] "
case $stdin.gets
when /d/i
- Tempfile.open(File.basename(destination), File.dirname(destination)) do |temp|
+ Tempfile.open(File.basename(destination), File.dirname(dst)) do |temp|
temp.write render_file(src, file_options, &block)
temp.rewind
$stdout.puts `#{diff_cmd} #{dst} #{temp.path}`

0 comments on commit 18857ca

Please sign in to comment.
Something went wrong with that request. Please try again.