From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Carsten Dominik Newsgroups: gmane.emacs.devel Subject: Re: org changes lost Date: Tue, 25 Nov 2008 10:30:30 +0100 Message-ID: <26065E64-A12E-4F05-A76E-A10D2F273A45@gmail.com> References: <18730.4893.357634.127478@fencepost.gnu.org> <878wr9lqtr.fsf@catnip.gol.com> <9EC5D47F-0BFB-4188-B955-FDF018289DA6@gmail.com> <871vx1f5k6.fsf@cyd.mit.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v929.2) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1227605454 12188 80.91.229.12 (25 Nov 2008 09:30:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 25 Nov 2008 09:30:54 +0000 (UTC) Cc: Glenn Morris , Emacs developers , Juanma Barranquero , Miles Bader To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 25 10:31:57 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 1L4uGx-0004iy-S0 for ged-emacs-devel@m.gmane.org; Tue, 25 Nov 2008 10:31:56 +0100 Original-Received: from localhost ([127.0.0.1]:52555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4uFn-0003EB-Tm for ged-emacs-devel@m.gmane.org; Tue, 25 Nov 2008 04:30:43 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4uFh-0003Dh-Fa for emacs-devel@gnu.org; Tue, 25 Nov 2008 04:30:37 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4uFe-0003Cv-RE for emacs-devel@gnu.org; Tue, 25 Nov 2008 04:30:36 -0500 Original-Received: from [199.232.76.173] (port=52377 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4uFe-0003Cs-JN for emacs-devel@gnu.org; Tue, 25 Nov 2008 04:30:34 -0500 Original-Received: from ug-out-1314.google.com ([66.249.92.168]:21221) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L4uFd-0004yx-RF for emacs-devel@gnu.org; Tue, 25 Nov 2008 04:30:34 -0500 Original-Received: by ug-out-1314.google.com with SMTP id 36so1119506uga.17 for ; Tue, 25 Nov 2008 01:30:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:cc:message-id:from:to :in-reply-to:content-type:content-transfer-encoding:mime-version :subject:date:references:x-mailer; bh=///0UHfOWlhtZtY1Da0DccWvXU0PEhA65AjGY7jx3zk=; b=oKcqaLf+NUcqn+yuqlX8n3efG/lN/c5BxyTPI2OId4dOtlv/EbXkIccL2qNVNI4SM6 vrqGmxlaGcqszwTCZYbgUuVU2X3aYI06/QJz2ZMMZ+aBLFoCbafk98uXLOePMkKInD2j vriJXJXLmpfr5xvhgvVda0A0j9wi8+Dpkkt8I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=cc:message-id:from:to:in-reply-to:content-type :content-transfer-encoding:mime-version:subject:date:references :x-mailer; b=sy6JbGSio7Y+JaFl/ZXFP2OSqZa7TDDRKz/454cwKy2Gd6IJ+oupumlTUEpqL+WpP6 UY6JdbtWFvMMNk5POOW6hoIvWMFjPPKCu7SDt12FO1kffSW0Mp4gU6tBbddUkPDpPwCR Mvgz03QO7Ur/Ma3t+BKTnzA8wY9g1HvQsqUH0= Original-Received: by 10.67.123.8 with SMTP id a8mr2540255ugn.74.1227605432664; Tue, 25 Nov 2008 01:30:32 -0800 (PST) Original-Received: from nb-dominik2.science.uva.nl (nb-dominik2.science.uva.nl [146.50.22.167]) by mx.google.com with ESMTPS id q40sm6771456ugc.1.2008.11.25.01.30.31 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 25 Nov 2008 01:30:31 -0800 (PST) In-Reply-To: <871vx1f5k6.fsf@cyd.mit.edu> X-Mailer: Apple Mail (2.929.2) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:106138 Archived-At: On Nov 24, 2008, at 5:32 PM, Chong Yidong wrote: > 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? How would that work? I copy my new files into the lisp/org directory and then call cvs update to merge any changes from the Emacs crowd? Hmm, this means the I cannot call cvs update in between, just to get the changes in other files. OK, thinking about it. - Carsten