From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: patch vs. overwrite in bzr Date: Wed, 04 Apr 2012 18:06:19 -0400 Message-ID: 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> <87ehs4yrhz.fsf@gnu.org> <83k41vctyg.fsf@gnu.org> <83aa2rcnww.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333577856 1543 80.91.229.3 (4 Apr 2012 22:17:36 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 4 Apr 2012 22:17:36 +0000 (UTC) Cc: bzg@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 05 00:17:35 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 1SFYWE-0008RI-83 for ged-emacs-devel@m.gmane.org; Thu, 05 Apr 2012 00:17:34 +0200 Original-Received: from localhost ([::1]:44260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFYLo-0003p9-9T for ged-emacs-devel@m.gmane.org; Wed, 04 Apr 2012 18:06:48 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFYLk-0003oK-UW for emacs-devel@gnu.org; Wed, 04 Apr 2012 18:06:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFYLg-0002HX-BQ for emacs-devel@gnu.org; Wed, 04 Apr 2012 18:06:44 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:1564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFYLR-0002E2-FE; Wed, 04 Apr 2012 18:06:25 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AicFAKU/KE9FpZV7/2dsb2JhbACBX5x7eYhwnhmGGQSbGYQJ X-IronPort-AV: E=Sophos;i="4.73,1,1325480400"; d="scan'208";a="172183032" Original-Received: from 69-165-149-123.dsl.teksavvy.com (HELO pastel.home) ([69.165.149.123]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 04 Apr 2012 18:06:19 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 278EF59339; Wed, 4 Apr 2012 18:06:19 -0400 (EDT) In-Reply-To: <83aa2rcnww.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 04 Apr 2012 22:11:43 +0300") 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: 206.248.154.183 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:149387 Archived-At: > Would the problem be solved if such cherry-picking weren't needed? To a large extent, yes, but the cases we're talking about can't do that (which is why we're talking about that). > That is, if the branches were exactly identical, but kept in two > different VCSes? If this would solve the problem, then that's what > I'd suggest doing. After all, all those differences sound very minor; > e.g., why not rename the files as the other guy does? The `emacs' branch includes tons of other things that aren't in the `org' branch for obvious reasons. > Did anyone consider using bzr-git as part of this? I started using it for some `elpa' packages, yes. Using a different VCS is not the problem: differences between the branches's contents is the problem. Stefan