[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el [emacs-unicode-2] |
Date: |
Fri, 27 Aug 2004 07:23:54 -0400 |
Index: emacs/lisp/vc-svn.el
diff -c emacs/lisp/vc-svn.el:1.11.2.2 emacs/lisp/vc-svn.el:1.11.2.3
*** emacs/lisp/vc-svn.el:1.11.2.2 Mon Jun 28 07:28:47 2004
--- emacs/lisp/vc-svn.el Fri Aug 27 07:00:26 2004
***************
*** 1,6 ****
;;; vc-svn.el --- non-resident support for Subversion version-control
! ;; Copyright (C) 1995,98,99,2000,2001,02,2003 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <address@hidden>
--- 1,7 ----
;;; 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)
;; Maintainer: Stefan Monnier <address@hidden>
***************
*** 363,369 ****
(append (vc-switches nil 'diff) '("/dev/null")))
;; Even if it's empty, it's locally modified.
1)
! (let* ((switches (vc-switches 'SVN 'diff))
(async (and (vc-stay-local-p file)
(or oldvers newvers) ; Svn diffs those locally.
(fboundp 'start-process))))
--- 364,373 ----
(append (vc-switches nil 'diff) '("/dev/null")))
;; Even if it's empty, it's locally modified.
1)
! (let* ((switches
! (if vc-svn-diff-switches
! (vc-switches 'SVN 'diff)
! (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
(async (and (vc-stay-local-p file)
(or oldvers newvers) ; Svn diffs those locally.
(fboundp 'start-process))))
***************
*** 371,378 ****
(if async 'async 0)
file "diff"
(append
! (when switches
! (list "-x" (mapconcat 'identity switches " ")))
(when oldvers
(list "-r" (if newvers (concat oldvers ":" newvers)
oldvers)))))
--- 375,381 ----
(if async 'async 0)
file "diff"
(append
! switches
(when oldvers
(list "-r" (if newvers (concat oldvers ":" newvers)
oldvers)))))
***************
*** 504,508 ****
(provide 'vc-svn)
! ;;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
;;; vc-svn.el ends here
--- 507,511 ----
(provide 'vc-svn)
! ;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
;;; vc-svn.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el [emacs-unicode-2],
Miles Bader <=