diff options
| author | Xue Fuqiao | 2013-06-07 22:00:27 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-06-07 22:00:27 +0800 |
| commit | 04362df8bb3100c4b480b8b61630f810846bf321 (patch) | |
| tree | 14c8dc8e2062c1706e164c01b7328fe641839a21 | |
| parent | ce8209d4fe5fef08a4d7e835066770e6ead28a43 (diff) | |
| download | emacs-04362df8bb3100c4b480b8b61630f810846bf321.tar.gz emacs-04362df8bb3100c4b480b8b61630f810846bf321.zip | |
* maintaining.texi (Branches): Remove text copied from other sources.
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 9361ae19a57..079f6f01d9d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-06-07 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * maintaining.texi (Branches): Remove text copied from other | ||
| 4 | sources. | ||
| 5 | |||
| 1 | 2013-06-05 Alan Mackenzie <acm@muc.de> | 6 | 2013-06-05 Alan Mackenzie <acm@muc.de> |
| 2 | 7 | ||
| 3 | * search.texi (Isearch Scroll): Rename to "Not Exiting Isearch". | 8 | * search.texi (Isearch Scroll): Rename to "Not Exiting Isearch". |
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 17c04fe74e3..dbcd08ee017 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -1267,16 +1267,7 @@ bring them back at a later time). | |||
| 1267 | @cindex branch (version control) | 1267 | @cindex branch (version control) |
| 1268 | 1268 | ||
| 1269 | One use of version control is to support multiple independent lines | 1269 | One use of version control is to support multiple independent lines |
| 1270 | of development, which are called @dfn{branches}. Branches allow for | 1270 | of development, which are called @dfn{branches}. |
| 1271 | parts of software to be developed in parallel. Large projects require | ||
| 1272 | many roles to be filled, including developers, build managers, and | ||
| 1273 | quality assurance personnel. Further, multiple releases on different | ||
| 1274 | operating system platforms may have to be maintained. Branches allow | ||
| 1275 | contributors to isolate changes without destabilizing the codebase, | ||
| 1276 | for example, fixes for bugs, new features, and versions | ||
| 1277 | integration. These changes may be later merged (resynchronized) after | ||
| 1278 | testing. | ||
| 1279 | |||
| 1280 | 1271 | ||
| 1281 | VC's support for branch operations is currently fairly limited. For | 1272 | VC's support for branch operations is currently fairly limited. For |
| 1282 | decentralized version control systems, it provides commands for | 1273 | decentralized version control systems, it provides commands for |