From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: CVS commits and logs Date: Sat, 11 Nov 2006 12:24:16 +0900 Message-ID: <87mz6y8y3j.fsf@catnip.gol.com> References: <87r6wh1o5h.fsf@olgas.newt.com> <87bqnk74d1.fsf@catnip.gol.com> <87irhqho6w.fsf@catnip.gol.com> Reply-To: Miles Bader NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1163215490 27168 80.91.229.2 (11 Nov 2006 03:24:50 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 11 Nov 2006 03:24:50 +0000 (UTC) Cc: wohler@newt.com, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 11 04:24:46 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 1GijU5-0002F0-2Q for ged-emacs-devel@m.gmane.org; Sat, 11 Nov 2006 04:24:45 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GijU4-0003pT-BL for ged-emacs-devel@m.gmane.org; Fri, 10 Nov 2006 22:24:44 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GijTq-0003p1-JK for emacs-devel@gnu.org; Fri, 10 Nov 2006 22:24:30 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GijTo-0003ns-10 for emacs-devel@gnu.org; Fri, 10 Nov 2006 22:24:29 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GijTn-0003np-Tn for emacs-devel@gnu.org; Fri, 10 Nov 2006 22:24:27 -0500 Original-Received: from [203.216.5.72] (helo=smtp02.dentaku.gol.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1GijTk-0007TX-AH; Fri, 10 Nov 2006 22:24:24 -0500 Original-Received: from 203-216-104-224.dsl.gol.ne.jp ([203.216.104.224] helo=catnip.gol.com) by smtp02.dentaku.gol.com with esmtpa (Dentaku) id 1GijTf-0002yk-CE; Sat, 11 Nov 2006 12:24:19 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id CCE6C2F43; Sat, 11 Nov 2006 12:24:16 +0900 (JST) Original-To: rms@gnu.org System-Type: i686-pc-linux-gnu In-Reply-To: (Richard Stallman's message of "Fri\, 10 Nov 2006 21\:11\:30 -0500") Original-Lines: 33 X-Abuse-Complaints: abuse@gol.com 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:62060 Archived-At: Richard Stallman writes: > 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." > > That seems to make the file's CVS log rather useless. Or is the idea > that those changesets remain visible in the file's CVS log? In that > case, they are a sort of indirection to the other change log items, > and that is ok. Well, that sort of indirection is the idea, and it's currently possible to find the source log entries, but not using CVS alone: the changeset information in the merge log refers to _arch_ changesets (CVS doesn't even have the notion of a changeset), so one would have to look in the arch repository to find the source log entries. It would be possible to encode this information in CVS as well, by making a unique CVS tag for each merge (the tag would be in the branch merged _from_, so the log entry in the branch merged _to_ would say basically merged from ..., see tag "trunk-merge-source-x-y-z"). That would bloat the tag lists somewhat though, which might annoy people (CVS spits out lists of tags at times, e.g. if you do "cvs log", and if there are 10,000 almost identical tags ...). Even with these tags, it would still be somewhat annoying for someone to track down the exact original commit logs, but I don't think there's really any practical alternative. -Miles -- `The suburb is an obsolete and contradictory form of human settlement'