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 Date: Wed, 04 Apr 2012 07:45:38 +0200 Message-ID: <87iphgyrr1.fsf@gnu.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> <87aa2szgig.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333518278 20991 80.91.229.3 (4 Apr 2012 05:44:38 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 4 Apr 2012 05:44:38 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 04 07:44:37 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 1SFJ1E-0000B4-MY for ged-emacs-devel@m.gmane.org; Wed, 04 Apr 2012 07:44:32 +0200 Original-Received: from localhost ([::1]:50495 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFJ1E-0001om-0n for ged-emacs-devel@m.gmane.org; Wed, 04 Apr 2012 01:44:32 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:42391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFJ1A-0001o9-EF for emacs-devel@gnu.org; Wed, 04 Apr 2012 01:44:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFJ18-0005tt-IV for emacs-devel@gnu.org; Wed, 04 Apr 2012 01:44:27 -0400 Original-Received: from mail-wi0-f169.google.com ([209.85.212.169]:60171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFJ18-0005tY-9E; Wed, 04 Apr 2012 01:44:26 -0400 Original-Received: by wibhm17 with SMTP id hm17so156634wib.0 for ; Tue, 03 Apr 2012 22:44:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=7fRuRoJRRWXc+BWM5rAnc0082KaLQEVyJPdzPL6SEEk=; b=qJXu88BhENOpo3MzeHSv+0HtPIKaoEBK5+GC5AfAqWdy9fm83vC07aJ223WVtvvqGC mNVXBGu2VrgD3iK9ysw1H904g7mcQh7sMXGIpMEJkM2ognlanUHvEBTje9wF2nRBYHD/ X2vuZTduXSctVy6Z7oWSFxVV4ZLRRHj0AznEJUcnJDjlBZBKP2iKRU27YJhwqoob2Iq8 hQFrjAK8yB/vJSHn4a+ysFXsQlvMWOv+2atakCjxL6QcfLIGo8VCNe+41aPubXpEstD7 bjMRLRSV4HLqvDwy7SEGBln59+9EG4rDEfg7Wiuh0gtcwx/d5YRMqjiIVhT0ZNDrjbay Iy5A== Original-Received: by 10.180.97.41 with SMTP id dx9mr1999167wib.9.1333518263217; Tue, 03 Apr 2012 22:44:23 -0700 (PDT) Original-Received: from myhost.localdomain (pha75-11-82-236-86-204.fbx.proxad.net. [82.236.86.204]) by mx.google.com with ESMTPS id ff9sm2059068wib.2.2012.04.03.22.44.22 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Apr 2012 22:44:22 -0700 (PDT) Original-Received: by myhost.localdomain (Postfix, from userid 1000) id 8AA3F856E; Wed, 4 Apr 2012 07:45:38 +0200 (CEST) In-Reply-To: (Stefan Monnier's message of "Tue, 03 Apr 2012 20:26:15 -0400") 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: 209.85.212.169 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:149363 Archived-At: Stefan Monnier writes: >> Finally, I'm curious to know whether you, Juanma and Paul would be >> willing to commit fixes directly in the "hotfix" branch of Org's git. >> This is the branch that is sync'ed with Emacs trunk, and committing >> small fixes there first would remove 90% of the pain. > > If you let people commit to that branch it might become more difficult > to use it for the sync. Why? E.g. If Paul committed spelling fixes to the hotfix branch of Org, then merging this branch to Emacs would trigger less merge conflicts. It doesn't remove the need for double-checking and for committing patches instead of overwriting files, but it certainly alleviate the maintainance burden. I must be missing something. -- Bastien