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: patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Date: Tue, 03 Apr 2012 11:32:12 -0400 Message-ID: References: <87k42cwys8.fsf@gnu.org> <87limhuldm.fsf@gnu.org> <871uo7g4j6.fsf@gnu.org> <87iphjhbm8.fsf@wanadoo.es> <87398lgrat.fsf_-_@niu.edu> <871uo5c7r0.fsf@wanadoo.es> <87pqbpj5j3.fsf@altern.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333467154 21620 80.91.229.3 (3 Apr 2012 15:32:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 15:32:34 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 17:32:33 2012 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 1SF5ih-0004z4-KY for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 17:32:31 +0200 Original-Received: from localhost ([::1]:60682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF5ig-0000H4-SH for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 11:32:30 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF5iY-0000Gj-MG for emacs-devel@gnu.org; Tue, 03 Apr 2012 11:32:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF5iS-0001jX-Fb for emacs-devel@gnu.org; Tue, 03 Apr 2012 11:32:22 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:41511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF5iS-0001g9-Bh; Tue, 03 Apr 2012 11:32:16 -0400 Original-Received: from faina.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id q33FWDJu001514; Tue, 3 Apr 2012 11:32:13 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id ED617B448F; Tue, 3 Apr 2012 11:32:12 -0400 (EDT) In-Reply-To: <87pqbpj5j3.fsf@altern.org> (Bastien's message of "Tue, 03 Apr 2012 15:42:24 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4181=0 X-NAI-Spam-Version: 2.2.0.9309 : core <4181> : streams <743528> : uri <1095165> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:149338 Archived-At: > The problem is: how to create a patch from Org git repo that can be > easily applied to Emacs bzr repo. Remember somewhere which was the last revision of Org that was sync'd to Emacs, and then create the patch by diffing against that revision. Stefan PS: And after applying the patch, update the place where you remember the last revision sync'd.