Dulwich on Launchpad

[Jelmer Vernooij]

On Tue, 2010-03-02 at 18:30 -0600, John Arbash Meinel wrote:
> Jelmer Vernooij wrote:
> > On Wed, 2010-03-03 at 10:33 +1100, Ben Finney wrote:
> >> Jelmer Vernooij <jelmer at samba.org> writes:
> >>> On 03/02/10 22:34, Ben Finney wrote:
> >>>> What is it about your personal setup that necessitates this? I've
> >>>> never had the need for rebase; branching and merging have met all
> >>>> the needs that people have cited for rebase, without the
> >>>> history-loss problems.
> >>>>
> >>>> Can you switch to using branching and merging for the same
> >>>> operations, at least on public repositories?
> >>> Dulwich is maintained in parallel in both Bazaar and Git. Since
> >>> bzr-git doesn't support roundtripping yet, I have to dpush to get the
> >>> changes into Git.
> >>>
> >>> Usually I remember to dpush to Git before I push to Bazaar (so the
> >>> rebase isn't visible to anybody) but sometimes I forget, and I have to
> >>> push --overwrite later after I've dpushed to Git.
> >> I might be missing something, but I don't understand how this answers my
> >> questions above.
> > Have you used dpush? It rebases.
> > 
> > Cheers,
> > 
> > Jelmer
> 
> Jelmer does his work in a Bazaar branch. However, he also maintains an
> exact copy of the history in git. However, 'bzr-git' supports pulling
> but not pushing (it can convert git => bzr, but bzr=>git recreates the
> commits 'from scratch' in git).
> 
> So you can't 'bzr push git://...'. You *can* 'bzr dpush git://...' which
> recreates all of your commits into the git repo (rebase), and then pulls
> that data back into your Bazaar branch.
> 
> Basically:
> 
>  a) Jelmer codes in a bzr branch, but
>  b) the git rebased mirror is actually the 'official' trunk and
>  c) he mirrors that trunk back into his working bzr branch, which he
>  d) pushes to launchpad (or to the public bzr branch which is then
>     mirrored to lp)
Thanks John, I couldn't have explained it better. 

We seem to be getting quite a few outside contributions to Dulwich now
that hg-git and several other projects have picked it up.

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100303/659ab88f/attachment.pgp