diff options
| author | Xue Fuqiao | 2013-06-02 19:50:47 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-06-02 19:50:47 +0800 |
| commit | 67a3c09b083e4b4850740e3d822528809c49e4ae (patch) | |
| tree | 1a7f1042fcf40bdabbfc606dbcb3c04a88fca580 /doc | |
| parent | fe054b631715c00872fcda7c02f9483aec026916 (diff) | |
| download | emacs-67a3c09b083e4b4850740e3d822528809c49e4ae.tar.gz emacs-67a3c09b083e4b4850740e3d822528809c49e4ae.zip | |
* maintaining.texi (Branches): Add motivations for branching.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b1f9fb2a40d..133ab83e2fb 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-02 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * maintaining.texi (Branches): Add motivations for branching. | ||
| 4 | |||
| 1 | 2013-06-01 Glenn Morris <rgm@gnu.org> | 5 | 2013-06-01 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * programs.texi (Semantic): Fix typo. | 7 | * programs.texi (Semantic): Fix typo. |
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 33e398ebf75..6a1f049325f 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -1266,10 +1266,16 @@ bring them back at a later time). | |||
| 1266 | @cindex branch (version control) | 1266 | @cindex branch (version control) |
| 1267 | 1267 | ||
| 1268 | One use of version control is to support multiple independent lines | 1268 | One use of version control is to support multiple independent lines |
| 1269 | of development, which are called @dfn{branches}. Branches are used | 1269 | of development, which are called @dfn{branches}. Branches allow for |
| 1270 | for maintaining separate ``stable'' and ``development'' versions of a | 1270 | parts of software to be developed in parallel. Large projects require |
| 1271 | program, and for developing unrelated features in isolation from one | 1271 | many roles to be filled, including developers, build managers, and |
| 1272 | another. | 1272 | quality assurance personnel. Further, multiple releases on different |
| 1273 | operating system platforms may have to be maintained. Branches allow | ||
| 1274 | contributors to isolate changes without destabilizing the codebase, | ||
| 1275 | for example, fixes for bugs, new features, and versions | ||
| 1276 | integration. These changes may be later merged (resynchronized) after | ||
| 1277 | testing. | ||
| 1278 | |||
| 1273 | 1279 | ||
| 1274 | VC's support for branch operations is currently fairly limited. For | 1280 | VC's support for branch operations is currently fairly limited. For |
| 1275 | decentralized version control systems, it provides commands for | 1281 | decentralized version control systems, it provides commands for |