[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/03/28 19:32:47

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -b -r1.563 -r1.564
--- vc.el       28 Mar 2008 18:42:02 -0000      1.563
+++ vc.el       28 Mar 2008 19:32:47 -0000      1.564
@@ -560,31 +560,33 @@
 ;; - vc-update/vc-merge should deal with VC systems that don't
 ;;   update/merge on a file basis, but on a whole repository basis.
 ;;
+;; - deal with push/pull operations.
+;;
+;; - "snapshots" should be renamed to "branches", and thoroughly reworked.
+;;
 ;; - 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.
 ;;
+;; - 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.
+;;
 ;; - the *VC-log* buffer needs font-locking.
 ;;
-;; - make it easier to write logs, maybe C-x 4 a should add to the log
-;;   buffer if there's one instead of the ChangeLog.
+;; - make it easier to write logs.  Maybe C-x 4 a should add to the log
+;;   buffer, if one is present, instead of adding to the ChangeLog.
 ;;
 ;; - 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 for ignoring files.
 ;;
-;; - deal with push/pull operations.
-;;
 ;; - vc-next-action should do something about 'missing files. Maybe
 ;;   just warn, or offer to checkout.
 ;;
@@ -604,8 +606,6 @@
 ;;   vc-dired/vc-status, it is possible that these commands are called
 ;;   for unregistered/ignored files.
 ;;
-;; - "snapshots" should be renamed to "branches", and thoroughly reworked.
-;;
 ;; - do not default to RCS anymore when the current directory is not
 ;;   controlled by any VCS and the user does C-x v v
 ;;