[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r112922: * doc/emacs/maintaining.texi (VC Directory
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r112922: * doc/emacs/maintaining.texi (VC Directory Commands): Copyedit. |
Date: |
Tue, 11 Jun 2013 06:42:23 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112922
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-10 23:42:15 -0700
message:
* doc/emacs/maintaining.texi (VC Directory Commands): Copyedit.
(Branches): Put back milder version of pre 2013-06-07 text.
modified:
doc/emacs/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6227
doc/emacs/maintaining.texi
maintaining.texi-20091113204419-o5vbwnq5f7feedwu-6262
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2013-06-07 14:00:27 +0000
+++ b/doc/emacs/ChangeLog 2013-06-11 06:42:15 +0000
@@ -1,7 +1,11 @@
+2013-06-11 Glenn Morris <address@hidden>
+
+ * maintaining.texi (VC Directory Commands): Copyedit.
+ (Branches): Put back milder version of pre 2013-06-07 text.
+
2013-06-07 Xue Fuqiao <address@hidden>
- * maintaining.texi (Branches): Remove text copied from other
- sources.
+ * maintaining.texi (Branches): Remove text copied from other sources.
2013-06-05 Alan Mackenzie <address@hidden>
=== modified file 'doc/emacs/maintaining.texi'
--- a/doc/emacs/maintaining.texi 2013-06-07 14:00:27 +0000
+++ b/doc/emacs/maintaining.texi 2013-06-11 06:42:15 +0000
@@ -1204,7 +1204,7 @@
@item x
Hide files with @samp{up-to-date} status
(@code{vc-dir-hide-up-to-date}). With a prefix argument, hide items
-that are in state of item at point from display.
+whose state is that of the item at point.
@end table
@findex vc-dir-mark
@@ -1267,7 +1267,10 @@
@cindex branch (version control)
One use of version control is to support multiple independent lines
-of development, which are called @dfn{branches}.
+of development, which are called @dfn{branches}. Amongst other
+things, branches can be used for maintaining separate ``stable'' and
+``development'' versions of a program, and for developing unrelated
+features in isolation from one another.
VC's support for branch operations is currently fairly limited. For
decentralized version control systems, it provides commands for
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r112922: * doc/emacs/maintaining.texi (VC Directory Commands): Copyedit.,
Glenn Morris <=