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: Sun, 12 Nov 2006 18:45:28 +0900 Message-ID: <87odrd3snb.fsf@catnip.gol.com> References: <87r6wh1o5h.fsf@olgas.newt.com> <87bqnk74d1.fsf@catnip.gol.com> <87irhqho6w.fsf@catnip.gol.com> <87mz6y8y3j.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 1163324770 22034 80.91.229.2 (12 Nov 2006 09:46:10 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 12 Nov 2006 09:46:10 +0000 (UTC) Cc: wohler@newt.com, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 12 10:46:07 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 1GjBua-000570-RF for ged-emacs-devel@m.gmane.org; Sun, 12 Nov 2006 10:46:01 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GjBua-0000nd-8i for ged-emacs-devel@m.gmane.org; Sun, 12 Nov 2006 04:46:00 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GjBuF-0000nY-3Y for emacs-devel@gnu.org; Sun, 12 Nov 2006 04:45:39 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GjBuE-0000nI-0i for emacs-devel@gnu.org; Sun, 12 Nov 2006 04:45:38 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GjBuD-0000nF-PU for emacs-devel@gnu.org; Sun, 12 Nov 2006 04:45:37 -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 1GjBuB-0007Tm-RD; Sun, 12 Nov 2006 04:45:36 -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 1GjBu8-0005DY-NB; Sun, 12 Nov 2006 18:45:32 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id ADF222F43; Sun, 12 Nov 2006 18:45:29 +0900 (JST) Original-To: rms@gnu.org System-Type: i686-pc-linux-gnu In-Reply-To: (Richard Stallman's message of "Sun\, 12 Nov 2006 00\:14\:07 -0500") Original-Lines: 47 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:62102 Archived-At: Richard Stallman writes: > 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 > > Why does merging one CVS branch into another have anything to do with > arch? > > What does arch have to do with this anyway? Arch is the tool I use -- it makes the process _much_ easier. I wouldn't do it if had to use CVS only (CVS is not particular good at this sort of thing). > 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. > > One practical alternative is that we stop using arch. Not only would using CVS only be a lot more work (it's not something I want to do), but it _would not fix the problem_. If arch were dropped, assuming you could find somebody to do merges using CVS (I wouldn't), they'd be in exactly the same position we are today: they'd need to either find an acceptable way of recording "indirection" (probably via tags as I mentioned before), or write tools to grovel through the commit logs constructing new logs for merging, and do file-by-file merges. > Maybe there are others -- such as changing your merge process > so that it extracts proper CVS log info out of the arch data. If somebody has a concrete suggestion, by all means give it. I've made one (adding CVS tags to allow doing the the necessary "indirection" without worrying about arch), which I think is imperfect, but certainly a workable solution. I think it's also worth thinking about this though: has there ever been even a _single_ instance of a developer being inconvenienced by the current state of things? How much pain is it worth to "fix" something which hasn't actually had any noticeably bad effect? -Miles -- o The existentialist, not having a pillow, goes everywhere with the book by Sullivan, _I am going to spit on your graves_.