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: patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Date: Tue, 03 Apr 2012 15:42:24 +0200 Message-ID: <87pqbpj5j3.fsf@altern.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1333460833 31918 80.91.229.3 (3 Apr 2012 13:47:13 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 13:47:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 15:47:11 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 1SF44l-0008Fh-JB for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 15:47:11 +0200 Original-Received: from localhost ([::1]:34428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF3zN-00009W-SO for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 09:41:37 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:44642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF3zD-00005q-6u for emacs-devel@gnu.org; Tue, 03 Apr 2012 09:41:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF3z7-00044W-OR for emacs-devel@gnu.org; Tue, 03 Apr 2012 09:41:26 -0400 Original-Received: from incoming2.cnam.fr ([163.173.128.34]:21778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF3z7-000432-Hp for emacs-devel@gnu.org; Tue, 03 Apr 2012 09:41:21 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ag0KABj9ek+jrT4T/2dsb2JhbABEtl4DgQ+BB4IJAQEEATIBOA4FCwsNCwklDwEEGDETG4dpBLs1i0mFHQSOAodhhhKKHoJp X-IronPort-AV: E=Sophos;i="4.75,362,1330902000"; d="scan'208";a="30420325" Original-Received: from unknown (HELO myhost.localdomain) ([163.173.62.19]) by outgoing2.cnam.fr with ESMTP; 03 Apr 2012 15:41:08 +0200 Original-Received: by myhost.localdomain (Postfix, from userid 1000) id 3F587856E; Tue, 3 Apr 2012 15:42:24 +0200 (CEST) In-Reply-To: <871uo5c7r0.fsf@wanadoo.es> (=?iso-8859-1?Q?=22=D3scar?= Fuentes"'s message of "Tue, 03 Apr 2012 14:36:19 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 163.173.128.34 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:149325 Archived-At: Óscar Fuentes writes: > Roland Winkler writes: > >> On Sun, Apr 01 2012, Stefan Monnier wrote: >>>> At a first glance, there are places where copyright notices and other >>>> boilerplate are overwritten with older text. The most glaring case is >>>> this: >>> >>> Once again: please *never ever* overwrite files. Always apply >>> a patch instead. >> >> I read this at several occassions. -- I am not an expert with bzr and I >> was wondering whether "never overwriting files" translates into a >> recommended work flow with bzr. > > 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. Thanks! -- Bastien