From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: patch vs. overwrite in bzr Date: Thu, 05 Apr 2012 06:09:56 +0300 Message-ID: <8362dedgcb.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> <87ehs4yrhz.fsf@gnu.org> <83k41vctyg.fsf@gnu.org> <83aa2rcnww.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1333595427 9292 80.91.229.3 (5 Apr 2012 03:10:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 5 Apr 2012 03:10:27 +0000 (UTC) Cc: bzg@gnu.org, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 05 05:10:26 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 1SFd5Z-0006Go-MK for ged-emacs-devel@m.gmane.org; Thu, 05 Apr 2012 05:10:21 +0200 Original-Received: from localhost ([::1]:49114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFd5Y-00089e-LW for ged-emacs-devel@m.gmane.org; Wed, 04 Apr 2012 23:10:20 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:60225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFd5V-00089J-JJ for emacs-devel@gnu.org; Wed, 04 Apr 2012 23:10:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFd5U-0002gC-0k for emacs-devel@gnu.org; Wed, 04 Apr 2012 23:10:17 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:52673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFd5L-0002eJ-Hb; Wed, 04 Apr 2012 23:10:07 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0M1Z00600KRDO100@a-mtaout22.012.net.il>; Thu, 05 Apr 2012 06:09:41 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.229.252.114]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M1Z006B0KS44ZH0@a-mtaout22.012.net.il>; Thu, 05 Apr 2012 06:09:40 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.172 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:149391 Archived-At: > From: Stefan Monnier > Cc: bzg@gnu.org, emacs-devel@gnu.org > Date: Wed, 04 Apr 2012 18:06:19 -0400 > > > 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). If this is the primary reason for problems, then in my experience this is the first problem to tackle. Whatever the issues are that cause the branches to be different, they should be regarded as secondary, and solutions found for them that let the branches become not different. > > 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. Why should Org maintainers care about things they don't need? Let them be there, they will do no harm at all.