From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: trunk r115910: Fix previous change Date: Wed, 08 Jan 2014 08:24:51 +0100 Message-ID: <87mwj7x7ek.fsf@bzg.ath.cx> References: <87k3ebg1p7.fsf@bzg.ath.cx> <87bnzng15o.fsf@bzg.ath.cx> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389165906 18528 80.91.229.3 (8 Jan 2014 07:25:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Jan 2014 07:25:06 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 08 08:25:13 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W0nVm-0002wW-Mc for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 08:25:10 +0100 Original-Received: from localhost ([::1]:45384 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0nVm-0001UY-34 for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 02:25:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0nVe-0001R9-GQ for emacs-devel@gnu.org; Wed, 08 Jan 2014 02:25:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0nVZ-0003dg-5n for emacs-devel@gnu.org; Wed, 08 Jan 2014 02:25:02 -0500 Original-Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]:52689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0nVY-0003dY-V8 for emacs-devel@gnu.org; Wed, 08 Jan 2014 02:24:57 -0500 Original-Received: by mail-wg0-f46.google.com with SMTP id m15so1053606wgh.13 for ; Tue, 07 Jan 2014 23:24:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=+oBTtymDSc6JEh67tHhjwrQiIKPKg+vGYdjsn0by+Nc=; b=qNMfqUoR1kZhAAf/j9h7rOuV9v+gKGnZtwh4d1N+FY3GxYmIp+CBwtNBjlc21yx00d gjDqSaPH3uUB2ewkCWgZQ7T5WHvsvvk1xa2k5LAmy1tQ0dvBylmUt+xVj0KYzcZRZoLS /kpwOxW8rCk48mL9wTnZs/mYITg349vUb00ZBktofRnXzoQ5//ZXEt3W8olGmbiAp2PK ndbMpnYO/eodp41aohzEr5RfPZU0a8/mNNVsI6osGX4Hkeroc56LxqqBtxRfnhFE8cWX cm0v7TJlyKCjBpOvQEhhRQ9H9zdQjHLnSVgf5SDKzMGVeOLU8K5ImPqq31s4seIMHyt7 yopw== X-Received: by 10.180.187.229 with SMTP id fv5mr20141649wic.24.1389165895996; Tue, 07 Jan 2014 23:24:55 -0800 (PST) Original-Received: from bzg.localdomain (mar75-2-81-56-68-112.fbx.proxad.net. [81.56.68.112]) by mx.google.com with ESMTPSA id mt2sm7343269wic.7.2014.01.07.23.24.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jan 2014 23:24:54 -0800 (PST) Original-Received: by bzg.localdomain (Postfix, from userid 1000) id 8F9961C20717; Wed, 8 Jan 2014 08:24:51 +0100 (CET) In-Reply-To: (Stefan Monnier's message of "Tue, 07 Jan 2014 22:07:50 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:167711 Archived-At: Stefan Monnier writes: >> I never found the time to learn how to setup a proper >> merge system, and with bzr being replaced soonish, I'll >> wait until then to see how I can merge the clean way. > > It's easy: note down somewhere the Git revision of the last sync. > Then for a new sync do: > > git diff -r | (cd ..../emacs/lisp/org; patch) Noted, thanks, -- Bastien