From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: org changes lost Date: Mon, 24 Nov 2008 21:50:02 -0500 Message-ID: References: <18730.4893.357634.127478@fencepost.gnu.org> <878wr9lqtr.fsf@catnip.gol.com> <9EC5D47F-0BFB-4188-B955-FDF018289DA6@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1227581426 21775 80.91.229.12 (25 Nov 2008 02:50:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 25 Nov 2008 02:50:26 +0000 (UTC) Cc: Glenn Morris , Emacs developers , Juanma Barranquero , Miles Bader To: Carsten Dominik Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 25 03:51:28 2008 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 1L4o1N-0007PM-QQ for ged-emacs-devel@m.gmane.org; Tue, 25 Nov 2008 03:51:26 +0100 Original-Received: from localhost ([127.0.0.1]:59677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4o0E-0003DG-9t for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2008 21:50:14 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4o0A-0003CP-AL for emacs-devel@gnu.org; Mon, 24 Nov 2008 21:50:10 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4o09-0003CC-P3 for emacs-devel@gnu.org; Mon, 24 Nov 2008 21:50:10 -0500 Original-Received: from [199.232.76.173] (port=47450 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4o09-0003C8-Id for emacs-devel@gnu.org; Mon, 24 Nov 2008 21:50:09 -0500 Original-Received: from ironport2-out.pppoe.ca ([206.248.154.182]:16584 helo=ironport2-out.teksavvy.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L4o06-0000ep-OS; Mon, 24 Nov 2008 21:50:06 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtEEAOP2KknO+J+z/2dsb2JhbACBbdAtgXSBCIEd X-IronPort-AV: E=Sophos;i="4.33,661,1220241600"; d="scan'208";a="30256744" Original-Received: from 206-248-159-179.dsl.teksavvy.com (HELO pastel.home) ([206.248.159.179]) by ironport2-out.teksavvy.com with ESMTP; 24 Nov 2008 21:50:05 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id EEACD8107; Mon, 24 Nov 2008 21:50:02 -0500 (EST) In-Reply-To: <9EC5D47F-0BFB-4188-B955-FDF018289DA6@gmail.com> (Carsten Dominik's message of "Mon, 24 Nov 2008 13:31:12 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:106128 Archived-At: > My skills in version control my not be sufficient to do this, jumping > between different version control worlds. You just need to reflect the branch of one into a branch of the other (one-way only), so it's not that difficult. E.g. you can commit (via naive overwrite&commit) your externally-maintaned code into a special branch in the CVS, and then use cvs to merge the changes from that branch into the trunk. Or you can do it the other way around and take a copy of Emacs's trunk every once in a while, commit it onto a special branch in your main VCS (e.g. Bzr or Git), and then merge that branch into your main branch. The safer thing to do (when working between VCS or without VCS) is to never copy files, but only ever take diffs and apply them. It's not like taking diffs is safer but it forces you to think "diff between what and what", so it makes it more likely that you'll do the right thing. > So I work by applying changed in Emacs to my local copy and reserve the > right to undo changes made in Emacs (not that this has been necessary > recently). Usually this works OK, occasionally, like yesterday, > I miss something. To avoid this, try to do a "diff since last sync" and apply that to Emacs's repository. This may result in conflicts, but only if there are concurrent changes that you need to pay attention to. > For me the biggest improvement would be to get an email copy > of all changes to files where I am the maintainer, not buried > in the general commits digest (where I do overlook things), > but a personalized one. I am sure that such emails could be > generated automatically, but I don't know how. That would be good indeed. Maybe someone could setup such a service: register to emacs-diffs, and then use a table that maps file names to maintainers's email addresses to figure out to whom to send the email. The table can be rebuilt daily by looking at the Elisp files's "Maintainer:" or "Author:" line and the admin/MAINTAINERS (which is a bit out-of-date, AFAIK). This data tends to be out-of-date, tho, so while this doesn't mean it's a bad idea, it means your email filter should be careful to handle such things gracefully (whatever that means, my guess is that it'll just work without having to do anything special, other than add a little blurb to the email to explain how to "unsubscribe"). Stefan