From: Xue Fuqiao Date: Sun, 2 Jun 2013 11:50:47 +0000 (+0800) Subject: * maintaining.texi (Branches): Add motivations for branching. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~88 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67a3c09b083e4b4850740e3d822528809c49e4ae;p=emacs.git * maintaining.texi (Branches): Add motivations for branching. --- 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 @@ +2013-06-02 Xue Fuqiao + + * maintaining.texi (Branches): Add motivations for branching. + 2013-06-01 Glenn Morris * 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). @cindex branch (version control) One use of version control is to support multiple independent lines -of development, which are called @dfn{branches}. Branches are used -for maintaining separate ``stable'' and ``development'' versions of a -program, and for developing unrelated features in isolation from one -another. +of development, which are called @dfn{branches}. Branches allow for +parts of software to be developed in parallel. Large projects require +many roles to be filled, including developers, build managers, and +quality assurance personnel. Further, multiple releases on different +operating system platforms may have to be maintained. Branches allow +contributors to isolate changes without destabilizing the codebase, +for example, fixes for bugs, new features, and versions +integration. These changes may be later merged (resynchronized) after +testing. + VC's support for branch operations is currently fairly limited. For decentralized version control systems, it provides commands for