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: merging etc Date: Mon, 27 Aug 2007 14:46:57 +0900 Message-ID: References: <200708211523.l7LFNnVl000876@oogie-boogie.ics.uci.edu> <200708220820.l7M8KbIt026014@oogie-boogie.ics.uci.edu> <87lkc3qe2z.fsf@jurta.org> Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1188193638 30077 80.91.229.12 (27 Aug 2007 05:47:18 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 27 Aug 2007 05:47:18 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 27 07:47:16 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IPXRT-0000V1-LL for ged-emacs-devel@m.gmane.org; Mon, 27 Aug 2007 07:47:15 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IPXRS-00074L-U5 for ged-emacs-devel@m.gmane.org; Mon, 27 Aug 2007 01:47:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IPXRP-00073v-0L for emacs-devel@gnu.org; Mon, 27 Aug 2007 01:47:11 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IPXRN-00073f-HA for emacs-devel@gnu.org; Mon, 27 Aug 2007 01:47:10 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IPXRN-00073c-Ao for emacs-devel@gnu.org; Mon, 27 Aug 2007 01:47:09 -0400 Original-Received: from tyo201.gate.nec.co.jp ([202.32.8.193]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IPXRK-0004nX-3Q; Mon, 27 Aug 2007 01:47:06 -0400 Original-Received: from relay31.aps.necel.com ([10.29.19.54]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id l7R5kFlO014049; Mon, 27 Aug 2007 14:46:58 +0900 (JST) Original-Received: from relay11.aps.necel.com ([10.29.19.20] [10.29.19.20]) by relay31.aps.necel.com with ESMTP; Mon, 27 Aug 2007 14:46:58 +0900 Original-Received: from dhapc248.dev.necel.com ([10.114.98.116] [10.114.98.116]) by relay11.aps.necel.com with ESMTP; Mon, 27 Aug 2007 14:46:58 +0900 Original-Received: by dhapc248.dev.necel.com (Postfix, from userid 31295) id F075B3A3; Mon, 27 Aug 2007 14:46:57 +0900 (JST) System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: (Richard Stallman's message of "Sat\, 25 Aug 2007 21\:08\:22 -0400") Original-Lines: 39 X-Detected-Kernel: Solaris 8 (1) 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:77259 Archived-At: Richard Stallman writes: > I think that there are other issues. For instance, when I make > related changes in several files, I put them together in the ChangeLog > file. But CVS wouldn't know that. > > CVS could know that if the files were checked in together, > but I can't do that with VC, which is the only way I know. It looks like Stefan has slowly been extending VC to handle multiple files in various operations, but I don't know if there's a user-interface for this functionality yet. However, I don't think that would help -- AFAIK, CVS has essentially no notion of "multiple file commits", and treats multiple files committed together more or less as if you had committed them separately (with the same log message).[1] If getting rid of ChangeLogs is desirable (and I'm not sure I agree that it is, even though ChangeLogs are a big pain for merging), really the only sane thing to do is switch to a better source-control system than CVS -- and I also think the one that makes sense for Emacs is "git", though for the time being I'm still using arch for my work on emacs.[2] [1] There do seem to be ways you can notice the difference, e.g. commit email messages seem to batch files which are committed together, and perhaps the locking behavior is slightly different, but once things have been committed, I think that information disappears [2] Incidentally, since you (Richard) spend a lot of time in "disconnected" mode, I think you'd personally benefit a lot from something like git -- it would allow you to do all operations (committing, merging, log-checking, etc) operations locally, with easy synchronization once you have access to a network again. -Miles -- "I distrust a research person who is always obviously busy on a task." --Robert Frosch, VP, GM Research