From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: org changes lost Date: Mon, 24 Nov 2008 11:32:25 -0500 Message-ID: <871vx1f5k6.fsf@cyd.mit.edu> 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 1227552154 28893 80.91.229.12 (24 Nov 2008 18:42:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 24 Nov 2008 18:42:34 +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 Mon Nov 24 19:43:37 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 1L4gPI-0005rx-Ep for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2008 19:43:36 +0100 Original-Received: from localhost ([127.0.0.1]:44841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4gO8-00050A-Vv for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2008 13:42:25 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4eM6-0000Gz-SJ for emacs-devel@gnu.org; Mon, 24 Nov 2008 11:32:10 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4eM5-0000FH-B8 for emacs-devel@gnu.org; Mon, 24 Nov 2008 11:32:10 -0500 Original-Received: from [199.232.76.173] (port=34034 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4eM4-0000F3-Sl for emacs-devel@gnu.org; Mon, 24 Nov 2008 11:32:08 -0500 Original-Received: from cyd.mit.edu ([18.115.2.24]:57503) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L4eM1-0006h2-OG; Mon, 24 Nov 2008 11:32:05 -0500 Original-Received: by cyd.mit.edu (Postfix, from userid 1000) id 0AA3457E1C8; Mon, 24 Nov 2008 11:32:25 -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:106093 Archived-At: Carsten Dominik writes: >> Hmm maybe there should be a standard text that gets sent out to new >> committers, which includes things like "never, ever, simply upload the >> newest version of your local sources; always merge."... > > My skills in version control my not be sufficient to do this, jumping > between different version control worlds. 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. Why don't you just use `cvs update' to merge in changes?