From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: patch vs. overwrite in bzr Date: Tue, 03 Apr 2012 17:03:30 +0200 Message-ID: <87aa2szwl9.fsf_-_@engster.org> 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; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1333465445 6644 80.91.229.3 (3 Apr 2012 15:04:05 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 15:04:05 +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:04:03 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 1SF5H7-0000Nx-QV for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 17:04:01 +0200 Original-Received: from localhost ([::1]:49774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF5H7-0001RD-6s for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 11:04:01 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF5Gy-0001Q8-0Y for emacs-devel@gnu.org; Tue, 03 Apr 2012 11:03:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF5Gm-0001yz-TX for emacs-devel@gnu.org; Tue, 03 Apr 2012 11:03:51 -0400 Original-Received: from randomsample.de ([83.169.19.17]:49081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF5Gm-0001xK-H1; Tue, 03 Apr 2012 11:03:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=H6otehtY777euDQl29fU6qAne63teidlhV1fzqJJVnI=; b=ZX2Am8tDdHfSw6y98TvLl+FLMATOxET8yZQkzyGfxu7I2K0T/o4BFotWC6V0MucwesmfSRtuT3egEr9mqXkKl/10M0z5H3hie+7U0TKXklKQ7RqxqESMke5IQ2x1NpPM; Original-Received: from dslc-082-083-063-231.pools.arcor-ip.net ([82.83.63.231] helo=spaten) by randomsample.de with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1SF5Ge-0005gP-Gv; Tue, 03 Apr 2012 17:03:32 +0200 In-Reply-To: <87pqbpj5j3.fsf@altern.org> (Bastien's message of "Tue, 03 Apr 2012 15:42:24 +0200") User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.94 (gnu/linux) Mail-Followup-To: Bastien , =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 83.169.19.17 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:149335 Archived-At: Bastien writes: > =D3scar Fuentes writes: >> Stefan's advice has nothing to do with bzr. It is about not blindly >> overwriting changes made on the emacs repo with the new version of the >> externally-maintained package (`Org' is in this case.) Applying a patch >> gives a lot more opportunities for noticing conflicts (suppossing that >> the hacker cares to examine the output of the patch command, that is.) > > The problem is: how to create a patch from Org git repo that can be > easily applied to Emacs bzr repo. > > If someone can come up with a workable solution, that'd help me a lot. > > Oscar, you said: > >> I suggest that, before syncing, you obtain a diff from the bzr (or git) >> emacs repo that contains all changes to org since your last sync, commit >> the diff onto your org sources and then proceed with the new sync. > > Which is theoretically fine... but if someone can actually *test* the > suggested workflow, I'm all ears. I'm in the process of writing a merge tool cedet-emacs-merge.el ('ceemme') for the upcoming CEDET/Emacs merges. You can find a very rough first revision in our 'newtrunk': http://cedet.bzr.sourceforge.net/bzr/cedet/code/newtrunk/files Now, it clearly cannot be used straight away for org, since we're using bzr and there are some very CEDET specific things in the code when adapting paths and stuff like that, but it might give you an idea how I'm planning to do things. Again: it's very early and I'm not using it in production yet (will happen when Eric has released the current trunk as 1.1). In a nutshell: It's more or less a GUI to do cherry picking with bzr and marking commits as 'applied', 'ignored' etc. and saving that state in the repository between sessions. In the end it will work in both directions, but currently I'm concentrating on the Emacs -> CEDET, since this will be the first thing to do next. Also, for the other direction we will probably use a dedicated branch like 'for-emacs' or something like that and not directly push into Emacs. If you or someone else would be interested into making this into a more generic cross-project merge tool - I am all ears. However, I could also imagine that there might be some git-trickery using submodules or whatever which allows a more elegant workflow. -David