From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: State of the repository conversion Date: Fri, 21 Mar 2014 18:02:53 +0100 Organization: Organization?!? Message-ID: <87ha6r32o2.fsf@fencepost.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> <83fvmb5yca.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1395421398 7776 80.91.229.3 (21 Mar 2014 17:03:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Mar 2014 17:03:18 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 21 18:03:27 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 1WR2qs-0007kB-Qd for ged-emacs-devel@m.gmane.org; Fri, 21 Mar 2014 18:03:26 +0100 Original-Received: from localhost ([::1]:53879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WR2qs-0004YY-Ef for ged-emacs-devel@m.gmane.org; Fri, 21 Mar 2014 13:03:26 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WR2qk-0004YA-Ou for emacs-devel@gnu.org; Fri, 21 Mar 2014 13:03:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WR2qf-0005LR-V4 for emacs-devel@gnu.org; Fri, 21 Mar 2014 13:03:18 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:49807) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WR2qf-0005LE-Of for emacs-devel@gnu.org; Fri, 21 Mar 2014 13:03:13 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WR2qc-0007Q6-Qp for emacs-devel@gnu.org; Fri, 21 Mar 2014 18:03:10 +0100 Original-Received: from x2f52865.dyn.telefonica.de ([2.245.40.101]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 21 Mar 2014 18:03:10 +0100 Original-Received: from dak by x2f52865.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 21 Mar 2014 18:03:10 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 33 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f52865.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:9WCVDbvKszkEGxDTcy5ccIlLidg= 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:170725 Archived-At: Eli Zaretskii writes: >> 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. You probably misunderstood. A merge commit introduces a change in topology. There are even explicit merge strategies "theirs" and "ours" that lead to a merge commit having a work tree matching one of its parents. -- David Kastrup