[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git to Bzr - what works?
From: |
Eli Zaretskii |
Subject: |
Re: Git to Bzr - what works? |
Date: |
Wed, 15 Aug 2012 20:56:01 +0300 |
> Date: Wed, 15 Aug 2012 00:08:16 -0300
> From: Fabian Ezequiel Gallina <address@hidden>
> Cc: BT Templeton <address@hidden>, address@hidden
>
> 2012/8/14 Eli Zaretskii <address@hidden>:
> >
> > But fastimport doesn't quite work, does it? So in practice, it isn't
> > a solution, either.
> >
> > Did someone try to merge from git repository to bzr repository using
> > the bzr-git plugin?
> >
>
> That's exactly how I merged python.el from github to the bzr repo.
>
> I generated the patches from git repo with git format-patch, modified
> paths in patch files with sed to match Emacs file structure, and then
> used bzr git-apply with no problems, except for the fact that I had to
> create a commit adding a blank lisp/progmodes/python.el after deleting
> the old one in order for bzr git-apply to apply patches successfully.
That's not what I had in mind. But since yours is a real-life
experience, while my idea is a purely theoretical one, perhaps what I
say below is much less important.
What I had in mind was this:
. Use bzr-git to make a bzr branch out of the git repo. (This part
does work, I'm successfully tracking several projects that use git
this way.)
. When you have changes in the bzr repo:
. "bzr pull" from the git repo to the bzr branch created above
. "bzr merge" to another bzr branch that tracks the Emacs trunk
. "bzr ci" or "bzr push" (depending on whether the latter branch
is or isn't bound) to the master bzr repo
Again, I never tried this, so it might not work at all.
If the above works, one could try pushing directly from the bzr branch
created from git, thus avoiding another branch and another merge.
- Git to Bzr - what works?, Daniel Colascione, 2012/08/13
- Re: Git to Bzr - what works?, John Wiegley, 2012/08/14
- Re: Git to Bzr - what works?, Eli Zaretskii, 2012/08/14
- Re: Git to Bzr - what works?, BT Templeton, 2012/08/14
- Re: Git to Bzr - what works?, Eli Zaretskii, 2012/08/14
- Re: Git to Bzr - what works?, Fabian Ezequiel Gallina, 2012/08/14
- Re: Git to Bzr - what works?, Stephen J. Turnbull, 2012/08/15
- Re: Git to Bzr - what works?,
Eli Zaretskii <=
- Re: Git to Bzr - what works?, Stefan Monnier, 2012/08/15
- Re: Git to Bzr - what works?, Daniel Colascione, 2012/08/15
- Re: Git to Bzr - what works?, Eli Zaretskii, 2012/08/15
- Re: Git to Bzr - what works?, John Wiegley, 2012/08/15
- Re: Git to Bzr - what works?, Eli Zaretskii, 2012/08/16
- Re: Git to Bzr - what works?, Julien Danjou, 2012/08/16
- Re: Git to Bzr - what works?, Andreas Schwab, 2012/08/16
- Re: Git to Bzr - what works?, Daniel Colascione, 2012/08/16
- Re: Git to Bzr - what works?, Daniel Colascione, 2012/08/17
- Re: Git to Bzr - what works?, Stefan Monnier, 2012/08/21