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: State of the repository conversion Date: Fri, 21 Mar 2014 18:08:05 +0200 Message-ID: <83fvmb5yca.fsf@gnu.org> References: <20140319175124.BCCB3380835@snark.thyrsus.com> <83wqfq82ge.fsf@gnu.org> <20140319185416.GA25588@thyrsus.com> <83siqe80bj.fsf@gnu.org> <87siqdiven.fsf@uwakimon.sk.tsukuba.ac.jp> <83ior98qi4.fsf@gnu.org> <87lhw5qyx9.fsf@wanadoo.es> <83a9ck970z.fsf@gnu.org> <87ha6s4npk.fsf@dod.no> <83d2hg7gge.fsf@gnu.org> <8738ic4lw6.fsf@dod.no> <837g7o6ljk.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1395418076 28813 80.91.229.3 (21 Mar 2014 16:07:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Mar 2014 16:07:56 +0000 (UTC) Cc: sb@dod.no, emacs-devel@gnu.org To: Stefan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 21 17:08:04 2014 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 1WR1zI-0000fz-AW for ged-emacs-devel@m.gmane.org; Fri, 21 Mar 2014 17:08:04 +0100 Original-Received: from localhost ([::1]:53655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WR1zH-0001LP-Qz for ged-emacs-devel@m.gmane.org; Fri, 21 Mar 2014 12:08:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WR1z9-0001Jv-LT for emacs-devel@gnu.org; Fri, 21 Mar 2014 12:08:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WR1z4-0002sd-PX for emacs-devel@gnu.org; Fri, 21 Mar 2014 12:07:55 -0400 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:36101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WR1z4-0002sI-IC for emacs-devel@gnu.org; Fri, 21 Mar 2014 12:07:50 -0400 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0N2S00K00MST1900@mtaout24.012.net.il> for emacs-devel@gnu.org; Fri, 21 Mar 2014 18:05:43 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N2S00GS3NDIWS50@mtaout24.012.net.il>; Fri, 21 Mar 2014 18:05:43 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.180 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:170719 Archived-At: > From: Stefan > Cc: Steinar Bang , emacs-devel@gnu.org > Date: Fri, 21 Mar 2014 08:40:45 -0400 > > > What bzrmerge.el does, when we merge a fix from the branch, is > > effectively a cherry-pick, > > No, bzrmerge does not cherry pick in any sense of the word. It does > a merge. For crying out loud, Stefan, give me the benefit of the doubt that I just _might_ know this! I said "_effectively_ a cherry-pick". > > I'm not sure this will work with git, btw. > > There's nothing special in bzrmerge that should prevent it from working > in another VCS, so long as that VCS has a notion of "branch merge", basically. In some ancient discussion Linus said that a commit that doesn't bring in any diffs is "madness" and shouldn't exist. Or maybe I misunderstood.