summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-01-23 16:35:18 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-01-23 16:35:18 +0000
commit3b3cb3369582bf9ab53425b40b64373a2ce576cc (patch)
tree2fd6b481ed11d8882a4c717deaafa86a9a44f7be /lisp
parent8e62d5e855c245b2d576b7e1ce7aa11e94061cbd (diff)
downloademacs-3b3cb3369582bf9ab53425b40b64373a2ce576cc.tar.gz
emacs-3b3cb3369582bf9ab53425b40b64373a2ce576cc.tar.bz2
emacs-3b3cb3369582bf9ab53425b40b64373a2ce576cc.zip
Add TODO items.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc.el19
2 files changed, 21 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ca82203e2f..acfe79e8b38 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-23 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * vc.el: Add TODO items.
+
2008-01-23 Carsten Dominik <dominik@science.uva.nl>
* replace.el (occur-mode-find-occurrence-hook): New hook that can
diff --git a/lisp/vc.el b/lisp/vc.el
index 38338d7f395..aaac484fb7b 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -530,8 +530,10 @@
;; - vc-update/vc-merge should deal with VC systems that don't
;; update/merge on a file basis, but on a whole repository basis.
;;
-;; - vc-register should register multiple files at a time. The
-;; `register' backend function already supports that.
+;; - the backend sometimes knows when a file it opens has been marked
+;; by the VCS as having a "conflict". Find a way to pass this info -
+;; to VC so that it can turn on smerge-mode when opening such a
+;; file.
;;
;; - the *VC-log* buffer needs font-locking.
;;
@@ -541,11 +543,24 @@
;; - make vc-state for all backends return 'unregistered instead of
;; nil for unregistered files, then update vc-next-action.
;;
+;; - add a generic mechanism for remembering the current branch names,
+;; display the branch name in the mode-line. Replace
+;; vc-cvs-sticky-tag with that.
+;;
+;; - vc-register should register a fileset at a time. The backends
+;; already support this, only the front-end needs to be change to
+;; handle multiple files at a time.
+;;
+;; - add a mechanism to for ignoring files.
+;;
;; - deal with push/pull operations.
;;
;; - decide if vc-status should replace vc-dired.
;;
;; - vc-status needs a menu, mouse bindings and some color bling.
+;;
+;; - "snapshots" should be renamed to "branches", and thoroughly reworked.
+;;
;;; Code: