aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-06-09 17:20:49 +0800
committerXue Fuqiao2013-06-09 17:20:49 +0800
commit2bc4a7255ddd60597033cffe9f9cfe93b7523373 (patch)
treee9a22fe8f4fe7a5b71e512f202afda100ac8e9f7
parent04fcf1b047a388b2fb995dbedf635238faca7a58 (diff)
downloademacs-2bc4a7255ddd60597033cffe9f9cfe93b7523373.tar.gz
emacs-2bc4a7255ddd60597033cffe9f9cfe93b7523373.zip
* doc/emacs/vc1-xtra.texi (Revision Tags): Add a cross reference.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/vc1-xtra.texi37
2 files changed, 26 insertions, 15 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 079f6f01d9d..31fd58f8048 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12013-06-09 Xue Fuqiao <xfq.free@gmail.com>
2
3 * vc1-xtra.texi (Revision Tags): Add a cross reference.
4
12013-06-07 Xue Fuqiao <xfq.free@gmail.com> 52013-06-07 Xue Fuqiao <xfq.free@gmail.com>
2 6
3 * maintaining.texi (Branches): Remove text copied from other 7 * maintaining.texi (Branches): Remove text copied from other
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 4e701a580a8..0b109608725 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -199,21 +199,28 @@ through VC@. Most later systems (including CVS, Subversion, bzr, git,
199and hg) have a native tag facility, and VC uses it where available; 199and hg) have a native tag facility, and VC uses it where available;
200those tags will be visible even when you bypass VC. 200those tags will be visible even when you bypass VC.
201 201
202 In a file-oriented VCS, when you rename a registered file you need 202 In file-based version control systems, when you rename a registered
203to rename its master along with it; the command @code{vc-rename-file} 203file you need to rename its master along with it; the command
204will do this automatically. If you are using SCCS, you must also 204@code{vc-rename-file} will do this automatically
205update the records of the tag, to mention the file by its new name 205@iftex
206(@code{vc-rename-file} does this, too). An old tag that refers to a 206(@pxref{VC Delete/Rename,,,emacs, the Emacs Manual}).
207master file that no longer exists under the recorded name is invalid; 207@end iftex
208VC can no longer retrieve it. It would be beyond the scope of this 208@ifnottex
209manual to explain enough about RCS and SCCS to explain how to update 209(@pxref{VC Delete/Rename}).
210the tags by hand. Using @code{vc-rename-file} makes the tag remain 210@end ifnottex
211valid for retrieval, but it does not solve all problems. For example, 211If you are using SCCS, you must also update the records of the tag, to
212some of the files in your program probably refer to others by name. 212mention the file by its new name (@code{vc-rename-file} does this,
213At the very least, the makefile probably mentions the file that you 213too). An old tag that refers to a master file that no longer exists
214renamed. If you retrieve an old tag, the renamed file is retrieved 214under the recorded name is invalid; VC can no longer retrieve it. It
215under its new name, which is not the name that the makefile expects. 215would be beyond the scope of this manual to explain enough about RCS
216So the program won't really work as retrieved. 216and SCCS to explain how to update the tags by hand. Using
217@code{vc-rename-file} makes the tag remain valid for retrieval, but it
218does not solve all problems. For example, some of the files in your
219program probably refer to others by name. At the very least, the
220makefile probably mentions the file that you renamed. If you retrieve
221an old tag, the renamed file is retrieved under its new name, which is
222not the name that the makefile expects. So the program won't really
223work as retrieved.
217 224
218@node Version Headers 225@node Version Headers
219@subsubsection Inserting Version Control Headers 226@subsubsection Inserting Version Control Headers