From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.emacs.devel Subject: Re: CVS commits and logs Date: Wed, 08 Nov 2006 22:01:33 -0800 Organization: Newt Software Message-ID: <21907.1163052093@olgas.newt.com> References: <87r6wh1o5h.fsf@olgas.newt.com> <87bqnk74d1.fsf@catnip.gol.com> <87irhqho6w.fsf@catnip.gol.com> NNTP-Posting-Host: main.gmane.org X-Trace: sea.gmane.org 1163052136 21927 80.91.229.2 (9 Nov 2006 06:02:16 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 9 Nov 2006 06:02:16 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 09 07:02:10 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Gi2zG-0001JS-UH for ged-emacs-devel@m.gmane.org; Thu, 09 Nov 2006 07:02:07 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Gi2zG-0005yH-Gn for ged-emacs-devel@m.gmane.org; Thu, 09 Nov 2006 01:02:06 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Gi2yw-0005wh-DR for emacs-devel@gnu.org; Thu, 09 Nov 2006 01:01:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Gi2yv-0005vE-7p for emacs-devel@gnu.org; Thu, 09 Nov 2006 01:01:45 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Gi2yu-0005um-Ez for emacs-devel@gnu.org; Thu, 09 Nov 2006 01:01:44 -0500 Original-Received: from [207.69.195.70] (helo=pop-borzoi.atl.sa.earthlink.net) by monty-python.gnu.org with esmtp (Exim 4.52) id 1Gi2yp-0003ik-I6; Thu, 09 Nov 2006 01:01:39 -0500 Original-Received: from h-68-165-5-48.snvacaid.dynamic.covad.net ([68.165.5.48] helo=olgas.newt.com) by pop-borzoi.atl.sa.earthlink.net with esmtp (Exim 3.36 #1) id 1Gi2yo-00042N-00; Thu, 09 Nov 2006 01:01:38 -0500 Original-Received: by olgas.newt.com (Postfix, from userid 1000) id 866B916FA1; Wed, 8 Nov 2006 22:01:33 -0800 (PST) Original-Received: from olgas.newt.com (localhost [127.0.0.1]) by olgas.newt.com (Postfix) with ESMTP id 8313316F9D; Wed, 8 Nov 2006 22:01:33 -0800 (PST) Original-To: Miles Bader In-reply-to: Comments: In-reply-to Miles Bader message dated "Thu, 09 Nov 2006 13:47:02 +0900." X-Mailer: MH-E 8.0; nmh 1.1; GNU Emacs 22.0.50 X-Image-URL: http://www.newt.com/wohler/images/bill-diving.png Mail-Followup-To: emacs-devel@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:61994 Archived-At: Miles Bader wrote: > Richard Stallman writes: > > Does this include the unicode-2 branch? Is it full of > > multi-file commits where the trunk has single-file commits? > > Yes. A single merge-commit to the unicode-2 branch represents many, > many changes on the trunk (hundreds of files, often multiple changes to > each file), so I don't include changelog info in the CVS log entry at > all. The CVS log entry more or less says "merge from trunk of > changesets X-Y." > > You'll find that this is _always_ how merging is done though, regardless > of who does it, because to actually track down the separate changelog > entries, package them up, and commit each file separately would be a lot > of work, very slow, and bloat the CVS logs, all for very little gain. Not to mention, you would lose vital information about which versions the merge came from. At least when merging manually, you need that information to create the next merge. I usually use the verbatim cvs/svn command in the log message which can be used to view the log messages of the source versions by simply swapping "log" for "ci". -- Bill Wohler http://www.newt.com/wohler/ GnuPG ID:610BD9AD