From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Date: Tue, 03 Apr 2012 14:36:19 +0200 Message-ID: <871uo5c7r0.fsf@wanadoo.es> References: <87k42cwys8.fsf@gnu.org> <87limhuldm.fsf@gnu.org> <871uo7g4j6.fsf@gnu.org> <87iphjhbm8.fsf@wanadoo.es> <87398lgrat.fsf_-_@niu.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333456612 29520 80.91.229.3 (3 Apr 2012 12:36:52 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 12:36:52 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 14:36:52 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 1SF2yf-0000vS-Ia for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 14:36:49 +0200 Original-Received: from localhost ([::1]:39057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF2ye-0003hv-Ut for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 08:36:48 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF2yW-0003ez-Hu for emacs-devel@gnu.org; Tue, 03 Apr 2012 08:36:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF2yM-0000oX-Dd for emacs-devel@gnu.org; Tue, 03 Apr 2012 08:36:40 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:47468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF2yM-0000oQ-6g for emacs-devel@gnu.org; Tue, 03 Apr 2012 08:36:30 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SF2yK-0000jd-4r for emacs-devel@gnu.org; Tue, 03 Apr 2012 14:36:28 +0200 Original-Received: from 215.red-81-43-220.staticip.rima-tde.net ([81.43.220.215]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 03 Apr 2012 14:36:28 +0200 Original-Received: from ofv by 215.red-81-43-220.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 03 Apr 2012 14:36:28 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 21 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 215.red-81-43-220.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) Cancel-Lock: sha1:kw4BzcVgPZOPOrkvJOFHxQvfawg= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:149322 Archived-At: 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.) [snip]