all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Ken Raeburn <raeburn@raeburn.org>
To: Emacs development discussions <emacs-devel@gnu.org>
Subject: emacs bzr and git-bzr
Date: Tue, 5 Jan 2010 08:44:28 -0500	[thread overview]
Message-ID: <B130A3A3-0079-41EC-AEBF-0E0FE49DBB93@raeburn.org> (raw)

Is there a way to use one of the "git-bzr" scripts out there that's  
safe and consistent with the way we want to use bzr for emacs  
development?

> git-bzr: a bidirectional git - bazaar gateway
> =============================================
>
> This script allows you to add bazaar repositories as git branches in  
> your
> git repository. After that, you can fetch the Bazaar repo, make some
> changes, and push it back into Bazaar.

The ones I've looked at seem to use "git fast-export | bzr fast- 
import" when pushing things from git back into bzr.

It seems likely that git-bzr could be used to push back into a private  
bzr development branch, and then "bzr merge" used to pull in changes  
from there.  But then it looks like I've also got to explicitly manage  
pulling changes down from upstream using both bzr and git commands;  
and if I try to push something upstream and find upstream has changed,  
might I have to manage the (possibly non-trivial) re-merging in bzr  
instead of git where I'd be more comfortable and where I already have  
a bunch of work in progress?

I'd be more interested in a setup where git-bzr can cause things to be  
pushed back into the FSF bzr repository directly, errorring out when  
the upstream has changed so that a new merge in needed, or ideally if  
I attempt a "wrong-way" (left-vs-right-parent) merge, etc.  Kind of  
like how git-svn manages all the subversion access internally, and  
lets me fix things in git when necessary.  Is such a workflow possible  
with git-bzr?

Ken




             reply	other threads:[~2010-01-05 13:44 UTC|newest]

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

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

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

  git send-email \
    --in-reply-to=B130A3A3-0079-41EC-AEBF-0E0FE49DBB93@raeburn.org \
    --to=raeburn@raeburn.org \
    --cc=emacs-devel@gnu.org \
    /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 external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.