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: Mon, 24 Nov 2008 13:31:12 +0100 Message-ID: <9EC5D47F-0BFB-4188-B955-FDF018289DA6@gmail.com> References: <18730.4893.357634.127478@fencepost.gnu.org> <878wr9lqtr.fsf@catnip.gol.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v929.2) Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1227542882 25581 80.91.229.12 (24 Nov 2008 16:08:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 24 Nov 2008 16:08:02 +0000 (UTC) Cc: Glenn Morris , Juanma Barranquero , Emacs developers To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 24 17:09:04 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 1L4dzR-0004Jt-8x for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2008 17:08:45 +0100 Original-Received: from localhost ([127.0.0.1]:37945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4dyH-0003EA-OE for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2008 11:07:33 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4dkp-0002cV-N6 for emacs-devel@gnu.org; Mon, 24 Nov 2008 10:53:40 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4dkm-0002ZD-6d for emacs-devel@gnu.org; Mon, 24 Nov 2008 10:53:37 -0500 Original-Received: from [199.232.76.173] (port=46012 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4dkk-0002Gv-Az for emacs-devel@gnu.org; Mon, 24 Nov 2008 10:53:34 -0500 Original-Received: from nf-out-0910.google.com ([64.233.182.189]:53344) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L4aax-0001tI-Nm for emacs-devel@gnu.org; Mon, 24 Nov 2008 07:31:16 -0500 Original-Received: by nf-out-0910.google.com with SMTP id c7so1076211nfi.26 for ; Mon, 24 Nov 2008 04:31:14 -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=lz08SKREiauU4ifJGs1uWB8hdnfAPo6jCfWSpy5FUtc=; b=hswESHBeLb1UX3cFMEPNseSIOKchHa+4eh4N21T4UKOl4RE0TsZt/KRoF/R4/te3H9 FkPI0S8+t6xG+Duf82D8YL6WvEwtM4Y7lAA/B8jBHgb2of/L6R1CJJLroTQeoGOHuIRn gSf57iC511e5fpCMuT/k1Rxaln5sPKBDqsz/g= 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=VZ/6AVgRB/Hy6tM7TcLeWZSorhNRnKm43Pc4j7X8UKSjm5pgSfubsrWNSWes6cKx+F YLYBf3U83K4ZLzNsArN6pRUgu0VLYLRwsARvFrmn1idwPEqPKr8iImgLWi4bGPIZYJbH WC8ya+PlQgRauQuefuIEhwP/D5V0686/dqGO8= Original-Received: by 10.210.129.10 with SMTP id b10mr3528495ebd.121.1227529874415; Mon, 24 Nov 2008 04:31:14 -0800 (PST) Original-Received: from ehef100.hef.kun.nl (ehef100.hef.kun.nl [131.174.192.100]) by mx.google.com with ESMTPS id 5sm53452eyh.46.2008.11.24.04.31.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 24 Nov 2008 04:31:13 -0800 (PST) In-Reply-To: <878wr9lqtr.fsf@catnip.gol.com> 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:106077 Archived-At: On Nov 24, 2008, at 4:56 AM, Miles Bader wrote: > Glenn Morris writes: >>> The latest changes to org mode have overwritten several of my and >>> Juanma's recent small fixes (eg org-agenda.el, org.el). >> >> Also, the org.texi license was reverted to FDL 1.2. > > 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. Despite the FSF holding the copyright for these files, the "master" version is still the one in my own repository. 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. - Carsten