emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/vc-svn.el


From: Stefan Monnier
Subject: [Emacs-diffs] Changes to emacs/lisp/vc-svn.el
Date: Sun, 02 Jan 2005 18:26:44 -0500

Index: emacs/lisp/vc-svn.el
diff -c emacs/lisp/vc-svn.el:1.16 emacs/lisp/vc-svn.el:1.17
*** emacs/lisp/vc-svn.el:1.16   Mon Dec 13 06:30:40 2004
--- emacs/lisp/vc-svn.el        Sun Jan  2 23:14:23 2005
***************
*** 1,6 ****
  ;;; vc-svn.el --- non-resident support for Subversion version-control
  
! ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004
  ;;           Free Software Foundation, Inc.
  
  ;; Author:      FSF (see vc.el for full credits)
--- 1,6 ----
  ;;; vc-svn.el --- non-resident support for Subversion version-control
  
! ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  ;;           Free Software Foundation, Inc.
  
  ;; Author:      FSF (see vc.el for full credits)
***************
*** 352,357 ****
--- 352,361 ----
  (defun vc-svn-diff (file &optional oldvers newvers buffer)
    "Get a difference report using SVN between two versions of FILE."
    (unless buffer (setq buffer "*vc-diff*"))
+   (if (and oldvers (equal oldvers (vc-workfile-version file)))
+       ;; Use nil rather than the current revision because svn handles it
+       ;; better (i.e. locally).
+       (setq oldvers nil))
    (if (string= (vc-workfile-version file) "0")
        ;; This file is added but not yet committed; there is no master file.
        (if (or oldvers newvers)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]