diff options
| -rw-r--r-- | lisp/vc-svn.el | 2 | ||||
| -rw-r--r-- | lisp/vc.el | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 51b49b84589..31d346ea87a 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el | |||
| @@ -300,8 +300,6 @@ This is only possible if SVN is responsible for FILE's directory.") | |||
| 300 | (vc-file-setprop file 'vc-working-revision nil) | 300 | (vc-file-setprop file 'vc-working-revision nil) |
| 301 | (apply 'vc-svn-command nil 0 file | 301 | (apply 'vc-svn-command nil 0 file |
| 302 | "update" | 302 | "update" |
| 303 | ;; default for verbose checkout: clear the sticky tag so | ||
| 304 | ;; that the actual update will get the head of the trunk | ||
| 305 | (cond | 303 | (cond |
| 306 | ((null rev) "-rBASE") | 304 | ((null rev) "-rBASE") |
| 307 | ((or (eq rev t) (equal rev "")) nil) | 305 | ((or (eq rev t) (equal rev "")) nil) |
diff --git a/lisp/vc.el b/lisp/vc.el index 71a71aa7b8d..c219f6fc604 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -677,6 +677,7 @@ | |||
| 677 | ;; | 677 | ;; |
| 678 | ;; - vc-create-snapshot and vc-retrieve-snapshot should update the | 678 | ;; - vc-create-snapshot and vc-retrieve-snapshot should update the |
| 679 | ;; buffers that might be visiting the affected files. | 679 | ;; buffers that might be visiting the affected files. |
| 680 | ;; | ||
| 680 | ;; - Using multiple backends needs work. Given a CVS directory with some | 681 | ;; - Using multiple backends needs work. Given a CVS directory with some |
| 681 | ;; files checked into git (but not all), using C-x v l to get a log file | 682 | ;; files checked into git (but not all), using C-x v l to get a log file |
| 682 | ;; from a file only present in git, and then typing RET on some log entry, | 683 | ;; from a file only present in git, and then typing RET on some log entry, |