From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?us-ascii?Q?=3D=3Futf-8=3FQ=3F=3DC3=3D93scar=5FFuentes=3F=3D?= Newsgroups: gmane.emacs.devel Subject: Re: patch vs. overwrite in bzr Date: Tue, 03 Apr 2012 17:02:45 +0200 Message-ID: <87wr5wc0yy.fsf_-_@wanadoo.es> 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 1333465387 6151 80.91.229.3 (3 Apr 2012 15:03:07 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 15:03:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 17:03:07 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 1SF5GC-0008Af-Kc for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 17:03:04 +0200 Original-Received: from localhost ([::1]:49141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF5GB-00013z-VC for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 11:03:03 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:36754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF5G5-00013b-P8 for emacs-devel@gnu.org; Tue, 03 Apr 2012 11:03:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF5Fz-0001j5-Sc for emacs-devel@gnu.org; Tue, 03 Apr 2012 11:02:57 -0400 Original-Received: from impaqm5.telefonica.net ([213.4.138.21]:34953 helo=telefonica.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF5Fz-0001i3-HV for emacs-devel@gnu.org; Tue, 03 Apr 2012 11:02:51 -0400 Original-Received: from IMPmailhost5.adm.correo ([10.20.102.126]) by IMPaqm5.telefonica.net with bizsmtp id tJ331i00t2jdgqJ3RT2opN; Tue, 03 Apr 2012 17:02:48 +0200 Original-Received: from qcore ([81.43.220.215]) by IMPmailhost5.adm.correo with BIZ IMP id tT2m1i00X4fSLgp1lT2nzi; Tue, 03 Apr 2012 17:02:48 +0200 X-Brightmail-Tracker: AAAAAA== X-original-sender: 981711563@telefonica.net 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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 213.4.138.21 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:149334 Archived-At: Bastien writes: > The problem is: how to create a patch from Org git repo that can be > easily applied to Emacs bzr repo. I don't know how the file structure of Org maps to Emacs' but this should work for obtaining the changes made to `lisp' directory of Org: `git diff COMMIT1 COMMIT2 lisp > changes-in-org-lisp.patch' where COMMIT1 is the range of revisions containing the changes you want to incorporate into Emacs. Then, on the Emacs source tree, cd to lisp/org and patch -p 2 < changes-in-org-lisp.patch Watch for conflicts. Repeat for `doc' and other directories to be synched. Review the changes with `bzr diff' and commit. There should be no conflicts if you previously followed the same procedure but in the Emacs -> Org direction.