diff options
| author | Dan Nicolaescu | 2008-05-12 17:19:41 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-05-12 17:19:41 +0000 |
| commit | 84cb74cf070bd76a81e81f597165d67875fe79a7 (patch) | |
| tree | dcad90ce0d2bc0c9305b830ccc5b78211ee041d8 | |
| parent | 93614fc1f83ac10ea4bf179b85722ca7e724f31e (diff) | |
| download | emacs-84cb74cf070bd76a81e81f597165d67875fe79a7.tar.gz emacs-84cb74cf070bd76a81e81f597165d67875fe79a7.zip | |
Re-add Todo item about merging.
| -rw-r--r-- | lisp/vc.el | 9 |
1 files changed, 9 insertions, 0 deletions
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 @@ | |||
| 559 | ;; - add a mechanism for editing the underlying VCS's list of files | 559 | ;; - add a mechanism for editing the underlying VCS's list of files |
| 560 | ;; to be ignored, when that's possible. | 560 | ;; to be ignored, when that's possible. |
| 561 | ;; | 561 | ;; |
| 562 | ;;;; Primitives that need changing: | ||
| 563 | ;; | ||
| 564 | ;; - vc-update/vc-merge should deal with VC systems that don't | ||
| 565 | ;; update/merge on a file basis, but on a whole repository basis. | ||
| 566 | ;; vc-update and vc-merge assume the arguments are always files, | ||
| 567 | ;; they don't deal with directories. Make sure the *vc-dir* buffer | ||
| 568 | ;; is updated after these operations. | ||
| 569 | ;; At least bzr, git and hg should benefit from this. | ||
| 570 | ;; | ||
| 562 | ;;;; Improved branch and tag handling: | 571 | ;;;; Improved branch and tag handling: |
| 563 | ;; | 572 | ;; |
| 564 | ;; - "snapshots" should be renamed to "tags", and thoroughly reworked. | 573 | ;; - "snapshots" should be renamed to "tags", and thoroughly reworked. |