From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 12 May 2008 17:19:41 +0000 (+0000)
Subject: Re-add Todo item about merging.
X-Git-Tag: emacs-pretest-23.0.90~5612
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84cb74cf070bd76a81e81f597165d67875fe79a7;p=emacs.git

Re-add Todo item about merging.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index c0998be883a..54a544b2dae 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -559,6 +559,15 @@
 ;; - add a mechanism for editing the underlying VCS's list of files
 ;;   to be ignored, when that's possible.
 ;;
+;;;; Primitives that need changing:
+;;
+;; - 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-update and vc-merge assume the arguments are always files,
+;;   they don't deal with directories.  Make sure the *vc-dir* buffer
+;;   is updated after these operations. 
+;;   At least bzr, git and hg should benefit from this.
+;;
 ;;;; Improved branch and tag handling:
 ;;
 ;; - "snapshots" should be renamed to "tags", and thoroughly reworked.