From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Xue Fuqiao Newsgroups: gmane.emacs.devel Subject: Re: changes in r112843 Date: Wed, 5 Jun 2013 07:12:24 +0800 Message-ID: References: <8bvc5tlqpa.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1370387563 15540 80.91.229.3 (4 Jun 2013 23:12:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 4 Jun 2013 23:12:43 +0000 (UTC) Cc: emacs-devel To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jun 05 01:12:43 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Uk0PD-000196-By for ged-emacs-devel@m.gmane.org; Wed, 05 Jun 2013 01:12:43 +0200 Original-Received: from localhost ([::1]:58119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uk0PC-0001E4-RK for ged-emacs-devel@m.gmane.org; Tue, 04 Jun 2013 19:12:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uk0P5-0001D0-OZ for emacs-devel@gnu.org; Tue, 04 Jun 2013 19:12:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uk0P1-0000yP-0N for emacs-devel@gnu.org; Tue, 04 Jun 2013 19:12:35 -0400 Original-Received: from mail-ie0-x22e.google.com ([2607:f8b0:4001:c03::22e]:57505) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uk0Ov-0000pk-CR; Tue, 04 Jun 2013 19:12:25 -0400 Original-Received: by mail-ie0-f174.google.com with SMTP id aq17so1869644iec.19 for ; Tue, 04 Jun 2013 16:12:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=sZAy2XYYnXCP6MTi/h0JV3fXmlBTe2HiRiynLUSyMEY=; b=dNk6ndjw+2R4EcPlEM/OiVCsiWpNdd799mfoHBAdB8VvKJnsSx38VRQGwKNrYn0yWb MQLRviVJDTWxAc1cL+zeLbfLAUDneYqQcdQObmVcdV+Vikuczdlvs/5JiYHwaz0eHr3X vFU1BBhhIh1Ou5Zjgm5/PERELnhkGXv5uQI/o0XkfC+mLZBmzMXGthl3Pl6uRH4OOPB8 JytdvBbn1J9i7Besmv5ILvUdS1AAc8Wcse1TRgeTwv+QyZQxFAbL1JdBNjIrGaCqvYWf +lo1Oqq53FCW96PEdaDJV7Nc3UY86TQBJqtQxAflMU1xanERgJNjuqQdLodgCCCb+Wb5 s6Aw== X-Received: by 10.50.118.37 with SMTP id kj5mr1983177igb.70.1370387544125; Tue, 04 Jun 2013 16:12:24 -0700 (PDT) Original-Received: by 10.42.121.138 with HTTP; Tue, 4 Jun 2013 16:12:24 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::22e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:160090 Archived-At: On Wed, Jun 5, 2013 at 6:59 AM, Xue Fuqiao wrote: > On Wed, Jun 5, 2013 at 1:40 AM, Glenn Morris wrote: >> >> *** doc/emacs/maintaining.texi 2013-05-30 09:27:55 +0000 >> --- doc/emacs/maintaining.texi 2013-06-02 11:56:39 +0000 >> *************** >> *** 1266,1275 **** >> @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. >> >> VC's support for branch operations is currently fairly limited. For >> decentralized version control systems, it provides commands for >> --- 1267,1282 ---- >> @cindex branch (version control) >> >> One use of version control is to support multiple independent lines >> ! 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. > >> The new text is copied verbatim from Wikipedia. >> Please just remove it, since (IMO) the Emacs manual does not need to >> explain every possible reason why people might want to use branches. > > IMHO (at least) this sentence is useful here: > > Branches allow contributors to isolate changes without destabilizing the > codebase, for example, fixes for bugs, new features, and > versions integration. Or just only leave the first sentence: One use of version control is to support multiple independent lines. Remove the (both versions) motivation of branching. -- Best regards, Xue Fuqiao. http://www.gnu.org/software/emacs/