* tramp.el (tramp-do-copy-or-rename-file-directly): Overwrite

always the tmpfile.  (Bug#2962).

lisp/ChangeLog

+2009-04-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.el (tramp-do-copy-or-rename-file-directly): Overwrite
+	always the tmpfile.  (Bug#2962).
+
 2009-04-11  Chong Yidong  <cyd@stupidchicken.com>
 	* files.el (dir-locals-directory-cache): Change format to include

lisp/net/tramp.el

@@ -3287,11 +3287,11 @@ the uid and gid from FILENAME."
 		     (t2
 		      (if (eq op 'copy)
 			  (tramp-compat-copy-file
-			   localname1 tmpfile ok-if-already-exists
+			   localname1 tmpfile t
 			   keep-date preserve-uid-gid)
 			(tramp-run-real-handler
 			 'rename-file
-			 (list localname1 tmpfile ok-if-already-exists)))
+			 (list localname1 tmpfile t)))
 		      ;; We must change the ownership as local user.
 		      (tramp-set-file-uid-gid
 		       tmpfile
@@ -7758,9 +7758,6 @@ Only works for Bourne-like shells."
 ;; Functions for file-name-handler-alist:
 ;; diff-latest-backup-file -- in diff.el
 ;; dired-uncache -- this will be needed when we do insert-directory caching
-;; file-name-sans-versions -- use primitive?
-;; get-file-buffer -- use primitive
-;; vc-registered
 
 ;; arch-tag: 3a21a994-182b-48fa-b0cd-c1d9fede424a
 ;;; tramp.el ends here