summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/ChangeLog11
-rw-r--r--man/files.texi8
2 files changed, 18 insertions, 1 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 10e6e800ea3..7f284eb1f10 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-18 Richard M. Stallman <rms@gnu.org>
+
+ * files.texi (Registering): Mention @@ in mode line.
+
+ * mini.texi (Minibuffer File): Clarify previous change. Add @findex.
+
+2005-11-08 Aaron S. Hawley <Aaron.Hawley@uvm.edu> (tiny change)
+
+ * files.texi (Renaming and VC): Some back-ends don't
+ handle renaming.
+
2005-11-18 Carsten Dominik <dominik@science.uva.nl>
* org.texi: (FAQ): Document `org-table-tab-jumps-over-hlines'.
diff --git a/man/files.texi b/man/files.texi
index b42bf52fb39..f5adc28f168 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -1762,7 +1762,8 @@ this situation.
If locking is in use, @kbd{C-x v i} leaves the file unlocked and
read-only. Type @kbd{C-x v v} if you wish to start editing it. After
registering a file with CVS, you must subsequently commit the initial
-version by typing @kbd{C-x v v}.
+version by typing @kbd{C-x v v}. Until you do that, the version
+appears as @samp{@@@@} in the mode line.
@vindex vc-default-init-version
@cindex initial version number to register
@@ -2573,6 +2574,11 @@ mention the file, so that they use the new name; despite this, the
snapshot thus modified may not completely work (@pxref{Snapshot
Caveats}).
+ Some backends do not provide an explicit rename operation to their
+repositories. After issuing @code{vc-rename-file}, use @kbd{C-x v v}
+on the original and renamed buffers and provide the necessary edit
+log.
+
You cannot use @code{vc-rename-file} on a file that is locked by
someone else.