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: trunk r115910: Fix previous change Date: Tue, 07 Jan 2014 22:07:50 -0500 Message-ID: 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 1389150493 22696 80.91.229.3 (8 Jan 2014 03:08:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Jan 2014 03:08:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 08 04:08:19 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 1W0jVC-0004vv-8M for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 04:08:18 +0100 Original-Received: from localhost ([::1]:44619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0jVB-0004oy-Oe for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 22:08:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0jV0-0004dv-OA for emacs-devel@gnu.org; Tue, 07 Jan 2014 22:08:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0jUt-0000hj-El for emacs-devel@gnu.org; Tue, 07 Jan 2014 22:08:06 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:30504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0jUl-0000fF-Ov; Tue, 07 Jan 2014 22:07:51 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxKG9/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kiB4GsR+QDpEKA4hhnBmBXoMV X-IPAS-Result: Av4EABK/CFFFxKG9/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kiB4GsR+QDpEKA4hhnBmBXoMV X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="44445143" Original-Received: from 69-196-161-189.dsl.teksavvy.com (HELO fmsmemgm.homelinux.net) ([69.196.161.189]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 07 Jan 2014 22:07:50 -0500 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 845F7AE233; Tue, 7 Jan 2014 22:07:50 -0500 (EST) In-Reply-To: <87bnzng15o.fsf@bzg.ath.cx> (Bastien's message of "Tue, 07 Jan 2014 18:19:31 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:167691 Archived-At: > 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) -- Stefan