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-cvs.el,v


From: Eric S. Raymond
Subject: [Emacs-diffs] Changes to emacs/lisp/vc-cvs.el,v
Date: Thu, 01 May 2008 19:13:19 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   08/05/01 19:13:16

Index: vc-cvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- vc-cvs.el   29 Apr 2008 15:32:56 -0000      1.123
+++ vc-cvs.el   1 May 2008 19:13:14 -0000       1.124
@@ -838,7 +838,7 @@
          ((string-match "Locally Modified" status)             'edited)
          ((string-match "Needs Merge" status)                  'needs-merge)
          ((string-match "Needs \\(Checkout\\|Patch\\)" status)
-          (if missing 'missing 'needs-patch))
+          (if missing 'missing 'needs-update))
          ((string-match "Locally Added" status)                'added)
          ((string-match "Locally Removed" status)              'removed)
          ((string-match "File had conflicts " status)          'conflict)
@@ -903,7 +903,7 @@
                   ((string-match "Locally Modified" status-str) 'edited)
                   ((string-match "Needs Merge" status-str) 'needs-merge)
                   ((string-match "Needs \\(Checkout\\|Patch\\)" status-str)
-                   (if missing 'missing 'needs-patch))
+                   (if missing 'missing 'needs-update))
                   ((string-match "Locally Added" status-str) 'added)
                   ((string-match "Locally Removed" status-str) 'removed)
                   ((string-match "File had conflicts " status-str) 'conflict)
@@ -922,7 +922,7 @@
   ;;                  (?M . edited)
   ;;                  (?P . needs-merge)
   ;;                  (?R . removed)
-  ;;                  (?U . needs-patch))))
+  ;;                  (?U . needs-update))))
   ;;   (goto-char (point-min))
   ;;   (while (not (eobp))
   ;;     (if (looking-at "^[ACMPRU?] \\(.*\\)$")




reply via email to

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