unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Ken Raeburn <raeburn@raeburn.org>
To: Jonas Bernoulli <jonas@bernoulli.cc>
Cc: emacs-devel@gnu.org
Subject: Re: emacs bzr and git-bzr
Date: Wed, 6 Jan 2010 10:19:03 -0500	[thread overview]
Message-ID: <B1739324-AA92-4724-879E-F28EEC4BFDCF@raeburn.org> (raw)
In-Reply-To: <201bac3a1001050907y53e05fd7rd902c5ced0cef154@mail.gmail.com>

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




      reply	other threads:[~2010-01-06 15:19 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-05 13:44 emacs bzr and git-bzr Ken Raeburn
2010-01-05 15:26 ` Stefan Monnier
2010-01-05 17:07   ` Jonas Bernoulli
2010-01-06 15:19     ` Ken Raeburn [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=B1739324-AA92-4724-879E-F28EEC4BFDCF@raeburn.org \
    --to=raeburn@raeburn.org \
    --cc=emacs-devel@gnu.org \
    --cc=jonas@bernoulli.cc \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).