From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: On the subject of Git, Bazaar, and the future of Emacs development Date: Wed, 27 Mar 2013 14:58:35 +0100 Message-ID: <87wqsteygk.fsf@engster.org> References: <87y5d9p5td.fsf@dex.adm.naquadah.org> <87vc8dtbcb.fsf@lifelogs.com> <871ub1gmdf.fsf@engster.org> <87d2ulovd0.fsf@dex.adm.naquadah.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1364392729 26034 80.91.229.3 (27 Mar 2013 13:58:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Mar 2013 13:58:49 +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 Mar 27 14:59:15 2013 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 1UKqsf-0003jc-3n for ged-emacs-devel@m.gmane.org; Wed, 27 Mar 2013 14:59:09 +0100 Original-Received: from localhost ([::1]:48237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKqsH-0000kj-5Q for ged-emacs-devel@m.gmane.org; Wed, 27 Mar 2013 09:58:45 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:49773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKqsD-0000ke-Gf for emacs-devel@gnu.org; Wed, 27 Mar 2013 09:58:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKqsB-00066p-NU for emacs-devel@gnu.org; Wed, 27 Mar 2013 09:58:41 -0400 Original-Received: from randomsample.de ([83.169.19.17]:49593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKqsB-00066X-C7 for emacs-devel@gnu.org; Wed, 27 Mar 2013 09:58:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=ApY+IPL/LgVdE8psK8KesmIFzKCUpfp09PpaVv2kisg=; b=CDSj+Aj8Ct/VxNXW37MJsJcxIXqTj29I140sDBPtkya+U6L14Gx+spBvBGSL5QXXQYaYxAkEuKWKhtNRyjE0pbyUcoJ9ACMD2wJu7WURFa8S5wAT26aVJkhGjs4/0gyL; Original-Received: from dslc-082-082-160-233.pools.arcor-ip.net ([82.82.160.233] helo=spaten) by randomsample.de with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1UKqs8-00041d-Ae; Wed, 27 Mar 2013 14:58:36 +0100 In-Reply-To: (Stefan Monnier's message of "Wed, 27 Mar 2013 09:39:43 -0400") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3 (gnu/linux) Mail-Followup-To: Stefan Monnier , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 83.169.19.17 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:158304 Archived-At: Stefan Monnier writes: >>> Well, I don't believe that git will make cross-project merges easier, at >>> least not until someone shows me how (and don't just say "submodules", >>> please ;-) ). >> I'm pretty sure it does make this easier: >> http://git-scm.com/book/en/Git-Tools-Subtree-Merging > > The core of the problem is bidirectional merging. AFAIK none of the > current DVCS have an answer for that. Subtree merging is nice, but it's > still unidirectional. Exactly. The other problem is this little "one of the projects maps to a subdirectory of the other one", which AFAIK must be taken literally. > For bidirectional merging, you end up having to do some of the work > outside of the DVCS proper, in which case having Bazaar on one side and > Git on the other doesn't make much difference. Especially since you can > use things like bzr-git to translate a branch from one system to > the other. Let me also point to http://felipec.wordpress.com/2012/11/13/git-remote-hg-bzr-2/ which is pretty magic (and *almost* manages to convert the CEDET repo). But in the end, you just do the 'diff | patch' game, no matter which VCS. -David