[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r112949: Merge: Doc fix for VC.
From: |
Xue Fuqiao |
Subject: |
[Emacs-diffs] trunk r112949: Merge: Doc fix for VC. |
Date: |
Wed, 12 Jun 2013 12:16:45 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112949 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-12 20:16:07 +0800
message:
Merge: Doc fix for VC.
modified:
doc/emacs/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6227
doc/emacs/vc1-xtra.texi
vc1xtra.texi-20091113204419-o5vbwnq5f7feedwu-6281
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/vc/vc-cvs.el vccvs.el-20091113204419-o5vbwnq5f7feedwu-1927
lisp/vc/vc-hooks.el vchooks.el-20091113204419-o5vbwnq5f7feedwu-501
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2013-06-11 06:42:15 +0000
+++ b/doc/emacs/ChangeLog 2013-06-12 12:12:47 +0000
@@ -3,6 +3,11 @@
* maintaining.texi (VC Directory Commands): Copyedit.
(Branches): Put back milder version of pre 2013-06-07 text.
+2013-06-09 Xue Fuqiao <address@hidden>
+
+ * vc1-xtra.texi (Revision Tags): Add a cross reference.
+ (CVS Options): Fix the default value of `vc-cvs-stay-local'.
+
2013-06-07 Xue Fuqiao <address@hidden>
* maintaining.texi (Branches): Remove text copied from other sources.
=== modified file 'doc/emacs/vc1-xtra.texi'
--- a/doc/emacs/vc1-xtra.texi 2013-01-01 09:11:05 +0000
+++ b/doc/emacs/vc1-xtra.texi 2013-06-09 11:15:54 +0000
@@ -199,21 +199,28 @@
and hg) have a native tag facility, and VC uses it where available;
those tags will be visible even when you bypass VC.
- In a file-oriented VCS, when you rename a registered file you need
-to rename its master along with it; the command @code{vc-rename-file}
-will do this automatically. If you are using SCCS, you must also
-update the records of the tag, to mention the file by its new name
-(@code{vc-rename-file} does this, too). An old tag that refers to a
-master file that no longer exists under the recorded name is invalid;
-VC can no longer retrieve it. It would be beyond the scope of this
-manual to explain enough about RCS and SCCS to explain how to update
-the tags by hand. Using @code{vc-rename-file} makes the tag remain
-valid for retrieval, but it does not solve all problems. For example,
-some of the files in your program probably refer to others by name.
-At the very least, the makefile probably mentions the file that you
-renamed. If you retrieve an old tag, the renamed file is retrieved
-under its new name, which is not the name that the makefile expects.
-So the program won't really work as retrieved.
+ In file-based version control systems, when you rename a registered
+file you need to rename its master along with it; the command
address@hidden will do this automatically
address@hidden
+(@pxref{VC Delete/Rename,,,emacs, the Emacs Manual}).
address@hidden iftex
address@hidden
+(@pxref{VC Delete/Rename}).
address@hidden ifnottex
+If you are using SCCS, you must also update the records of the tag, to
+mention the file by its new name (@code{vc-rename-file} does this,
+too). An old tag that refers to a master file that no longer exists
+under the recorded name is invalid; VC can no longer retrieve it. It
+would be beyond the scope of this manual to explain enough about RCS
+and SCCS to explain how to update the tags by hand. Using
address@hidden makes the tag remain valid for retrieval, but it
+does not solve all problems. For example, some of the files in your
+program probably refer to others by name. At the very least, the
+makefile probably mentions the file that you renamed. If you retrieve
+an old tag, the renamed file is retrieved under its new name, which is
+not the name that the makefile expects. So the program won't really
+work as retrieved.
@node Version Headers
@subsubsection Inserting Version Control Headers
@@ -377,12 +384,12 @@
only about @code{vc-cvs-stay-local}, but everything applies to
@code{vc-stay-local} as well.
- If @code{vc-cvs-stay-local} is @code{t} (the default), VC determines
-the version control status of each file using only the entry in the
-local CVS subdirectory and the information returned by previous CVS
-commands. As a consequence, if you have modified a file and somebody
-else has checked in other changes, you will not be notified of the
-conflict until you try to commit.
+ If @code{vc-cvs-stay-local} is @code{only-file} (the default), VC
+determines the version control status of each file using only the
+entry in the local CVS subdirectory and the information returned by
+previous CVS commands. As a consequence, if you have modified a file
+and somebody else has checked in other changes, you will not be
+notified of the conflict until you try to commit.
If you change @code{vc-cvs-stay-local} to @code{nil}, VC queries the
remote repository @emph{before} it decides what to do in
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-06-12 11:42:12 +0000
+++ b/lisp/ChangeLog 2013-06-12 12:12:47 +0000
@@ -139,6 +139,11 @@
* epa.el (epa-read-file-name): New function. (Bug#14510)
(epa-decrypt-file): Make plain-file optional. Use epa-read-file-name.
+2013-06-09 Xue Fuqiao <address@hidden>
+
+ * vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
+ * vc/vc-hooks.el (vc-stay-local): Doc fix.
+
2013-06-09 Aidan Gauland <address@hidden>
* eshell/em-term.el (eshell-visual-command-p): Fix bug that caused
=== modified file 'lisp/vc/vc-cvs.el'
--- a/lisp/vc/vc-cvs.el 2013-05-28 07:47:11 +0000
+++ b/lisp/vc/vc-cvs.el 2013-06-09 11:15:54 +0000
@@ -115,7 +115,7 @@
This avoids slow queries over the network and instead uses heuristics
and past information to determine the current status of a file.
-If value is the symbol `only-file' `vc-dir' will connect to the
+If value is the symbol `only-file', `vc-dir' will connect to the
server, but heuristics will be used to determine the status for
all other VC operations.
=== modified file 'lisp/vc/vc-hooks.el'
--- a/lisp/vc/vc-hooks.el 2013-02-07 08:50:04 +0000
+++ b/lisp/vc/vc-hooks.el 2013-06-09 11:15:54 +0000
@@ -128,7 +128,7 @@
This avoids slow queries over the network and instead uses heuristics
and past information to determine the current status of a file.
-If value is the symbol `only-file' `vc-dir' will connect to the
+If value is the symbol `only-file', `vc-dir' will connect to the
server, but heuristics will be used to determine the status for
all other VC operations.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r112949: Merge: Doc fix for VC.,
Xue Fuqiao <=