From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ken Raeburn Newsgroups: gmane.emacs.devel Subject: Re: emacs bzr and git-bzr Date: Wed, 6 Jan 2010 10:19:03 -0500 Message-ID: References: <201bac3a1001050907y53e05fd7rd902c5ced0cef154@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1262791283 25127 80.91.229.12 (6 Jan 2010 15:21:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 6 Jan 2010 15:21:23 +0000 (UTC) Cc: emacs-devel@gnu.org To: Jonas Bernoulli Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 06 16:21:15 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NSXh9-0000Me-VD for ged-emacs-devel@m.gmane.org; Wed, 06 Jan 2010 16:21:12 +0100 Original-Received: from localhost ([127.0.0.1]:59756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSXhA-0007Fk-DP for ged-emacs-devel@m.gmane.org; Wed, 06 Jan 2010 10:21:12 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSXfM-0006CF-Oo for emacs-devel@gnu.org; Wed, 06 Jan 2010 10:19:20 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSXfH-00069b-Tg for emacs-devel@gnu.org; Wed, 06 Jan 2010 10:19:20 -0500 Original-Received: from [199.232.76.173] (port=36614 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSXfH-00069M-C2 for emacs-devel@gnu.org; Wed, 06 Jan 2010 10:19:15 -0500 Original-Received: from splat.raeburn.org ([69.25.196.39]:42513 helo=raeburn.org) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NSXf9-0004D6-DQ for emacs-devel@gnu.org; Wed, 06 Jan 2010 10:19:15 -0500 Original-Received: from squish.raeburn.org (squish.raeburn.org [10.0.0.172]) by raeburn.org (8.14.3/8.14.1) with ESMTP id o06FJ3ah004687; Wed, 6 Jan 2010 10:19:04 -0500 (EST) In-Reply-To: <201bac3a1001050907y53e05fd7rd902c5ced0cef154@mail.gmail.com> X-Mailer: Apple Mail (2.936) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:119529 Archived-At: On Jan 5, 2010, at 12:07, Jonas Bernoulli wrote: > Of course it would be nice if someone wrote a better version, > comparable to > e.g. git-svn. I might work on it in a few weeks but if someone else > wants to Sounds great! :-) I'm pretty sure I won't have time to dig into it myself right now. Nor am I familiar enough with either tool yet to do it very effectively. > git-bzr won't work for what you (Ken) would like to use it because > (a) it does > not rebase your git branch (instead you have to maintain (rebase) > your own > branch which can not be the branch used for importing (I believe)) > and (b) it > can only we used to pull and push from a local bzr repository (so > git-bzr would > not hide bzr from you as it would still be needed to push upstream. Yes, it looks like access to the remote repo would have to be done separately, with bzr. I'd be okay with rebasing in git manually, and just needing a couple of simple bzr commands, if I could arrange for all the "serious" work to be done in git with my existing repo. There's also the issue of making sure the workflow follows what's being recommended for bzr in terms of the "left parent vs right parent" history issue. Making it too easy to push a merge into the main bzr repo may not be ideal, if it's going to mess things up. Perhaps the emacs case is uncommon among bzr projects in that regard. Or maybe I'm just being overly cautious since I don't know bzr well enough yet to be confident of getting it right through some means other than the recommended workflows... > git-bzr could be used for "emacs bzr" but it wouldn't be as simple > as running > one command as it is with git-svn. Yeah, that's probably too much to hope for. :-) Ken