CVS update by scop packages/unsupported/scop/vc ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/02/11 19:53:32

  Modified:    packages/unsupported/scop/vc ChangeLog vc-svn.el
Log:
Sync vc with upstream.

Revision  Changes    Path
1.81      +1 -1      XEmacs/packages/unsupported/scop/STATUS

Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- STATUS	2007/02/03 13:13:12	1.80
+++ STATUS	2007/02/11 18:53:30	1.81
@@ -17,7 +17,7 @@ generic-modes: generic.el and generic-x.
 - Compiles, seems to work, auto-mode-alist and autoloads may need spanking.
 
 vc: vc*.el and a few other related files from GNU Emacs, vc-git.el from git
-- Up to date with GNU Emacs CVS HEAD, git upstream as of 2007-02-03.
+- Up to date with GNU Emacs CVS HEAD, git upstream as of 2007-02-11.
 - Approaching usable state.
 - smerge-mode.el needs work.
 - Pre-2007-02-03 versions used to cause autoload related crashing with



1.70      +4 -0      XEmacs/packages/unsupported/scop/vc/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- ChangeLog	2007/02/03 13:13:13	1.69
+++ ChangeLog	2007/02/11 18:53:32	1.70
@@ -1,3 +1,7 @@
+2007-02-11  Ville Skyttä  <scop at xemacs.org>
+
+	* vc-svn.el: Sync with upstream.
+
 2007-02-03  Ville Skyttä  <scop at xemacs.org>
 
 	* Makefile (VERSION): 0.90.



1.19      +8 -3      XEmacs/packages/unsupported/scop/vc/vc-svn.el

Index: vc-svn.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-svn.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- vc-svn.el	2007/02/03 13:08:39	1.18
+++ vc-svn.el	2007/02/11 18:53:32	1.19
@@ -350,18 +350,23 @@ The changes are between FIRST-VERSION an
         (if (looking-at "At revision")
             0 ;; there were no news; indicate success
           (if (re-search-forward
-               (concat "^\\([CGDU]  \\)?"
+               ;; Newer SVN clients have 3 columns of chars (one for the
+               ;; file's contents, then second for its properties, and the
+               ;; third for lock-grabbing info), before the 2 spaces.
+               ;; We also used to match the filename in column 0 without any
+               ;; meta-info before it, but I believe this can never happen.
+               (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)?  \\)"
                        (regexp-quote (file-name-nondirectory file)))
                nil t)
               (cond
                ;; Merge successful, we are in sync with repository now
-               ((string= (match-string 1) "U  ")
+               ((string= (match-string 2) "U")
                 (vc-file-setprop file 'vc-state 'up-to-date)
                 (vc-file-setprop file 'vc-checkout-time
                                  (nth 5 (file-attributes file)))
                 0);; indicate success to the caller
                ;; Merge successful, but our own changes are still in the file
-               ((string= (match-string 1) "G  ")
+               ((string= (match-string 2) "G")
                 (vc-file-setprop file 'vc-state 'edited)
                 0);; indicate success to the caller
                ;; Conflicts detected!