aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-07-22 04:39:27 +0000
committerDan Nicolaescu2008-07-22 04:39:27 +0000
commitf6ff0e873f079835957f8d5cc15cf2c99513ec5d (patch)
treebcedd08657c2fceaae577ea0295cdd145e10a739
parent748766149b657b5e86f861a277e7e054406ec87c (diff)
downloademacs-f6ff0e873f079835957f8d5cc15cf2c99513ec5d.tar.gz
emacs-f6ff0e873f079835957f8d5cc15cf2c99513ec5d.zip
(Todo): Update.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc.el10
2 files changed, 5 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 045dc939ec9..d26d6e09c0b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12008-07-22 Dan Nicolaescu <dann@ics.uci.edu> 12008-07-22 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc.el (Todo): Update.
4
3 * vc-hooks.el: Remove obsolete comment. 5 * vc-hooks.el: Remove obsolete comment.
4 6
5 * vc-git.el (vc-git-status-printer): Update the directory display 7 * vc-git.el (vc-git-status-printer): Update the directory display
diff --git a/lisp/vc.el b/lisp/vc.el
index c27688e669c..315217c7538 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -82,9 +82,6 @@
82;; vc's back is turned, or move/rename master files while vc is running, 82;; vc's back is turned, or move/rename master files while vc is running,
83;; vc may get seriously confused. Don't do these things! 83;; vc may get seriously confused. Don't do these things!
84;; 84;;
85;; Developer's notes on some concurrency issues are included at the end of
86;; the file.
87;;
88;; ADDING SUPPORT FOR OTHER BACKENDS 85;; ADDING SUPPORT FOR OTHER BACKENDS
89;; 86;;
90;; VC can use arbitrary version control systems as a backend. To add 87;; VC can use arbitrary version control systems as a backend. To add
@@ -619,9 +616,6 @@
619;; `diff-add-change-log-entries-other-window' to create a detailed 616;; `diff-add-change-log-entries-other-window' to create a detailed
620;; skeleton for the log... 617;; skeleton for the log...
621;; 618;;
622;; - The *vc-dir* buffer needs to be updated properly after VC
623;; operations on directories that change the file VC state.
624;;
625;; - most vc-dir backends need more work. They might need to 619;; - most vc-dir backends need more work. They might need to
626;; provide custom headers, use the `extra' field and deal with all 620;; provide custom headers, use the `extra' field and deal with all
627;; possible VC states. 621;; possible VC states.
@@ -643,6 +637,8 @@
643;; 637;;
644;; - vc-dir toolbar needs more icons. 638;; - vc-dir toolbar needs more icons.
645;; 639;;
640;; - The backends should avoid using `vc-file-setprop' and `vc-file-getprop'.
641;;
646;;; Code: 642;;; Code:
647 643
648(require 'vc-hooks) 644(require 'vc-hooks)
@@ -1299,7 +1295,7 @@ After check-out, runs the normal hook `vc-checkout-hook'."
1299 (with-vc-properties 1295 (with-vc-properties
1300 files 1296 files
1301 (vc-call-backend backend 'mark-resolved files) 1297 (vc-call-backend backend 'mark-resolved files)
1302 ;; XXX: Is this TRTD? Might not be. 1298 ;; FIXME: Is this TRTD? Might not be.
1303 `((vc-state . edited)))) 1299 `((vc-state . edited))))
1304 1300
1305(defun vc-steal-lock (file rev owner) 1301(defun vc-steal-lock (file rev owner)