Dulwich on Launchpad

[Russel Winder]

Jelmer,

I branched Dulwich from lp:dulwich which gave me bzr
+ssh://bazaar.launchpad.net/~vcs-imports/dulwich/trunk.  All I ever do
is "bzr pull" since what I have should always be a mirror.  However I
regularly get:

        bzr: ERROR: These branches have diverged. Use the missing command to see how.                                                                
        Use the merge command to reconcile them.

My usual reaction is to remove the current branch and re-branch.  Today
though I thought I would investigate.

        |> bzr missing
        Using saved parent location: bzr+ssh://bazaar.launchpad.net/~vcs-imports/dulwich/trunk/
        You have 1 extra revision(s):
        ------------------------------------------------------------
        revno: 465
        git commit: bef15e295157b60cc9d3383257becc06f2e3a3f8
        committer: Jelmer Vernooij <jelmer at samba.org>
        timestamp: Sun 2010-02-28 18:46:33 +0100
        message:
          Fix memory leaks in error paths.
        
        
        
        You are missing 3 revision(s):
        ------------------------------------------------------------                                                                                 
        revno: 467
        git commit: 74fca0d0065da3c727d9d0e523342cc4a5d8b7f3
        committer: Jelmer Vernooij <jelmer at samba.org>
        timestamp: Sun 2010-02-28 18:46:33 +0100
        message:
          Fix memory leaks in error paths.
        ------------------------------------------------------------                                                                                 
        revno: 466
        git commit: 921769dfb485afa6bae7e998dc3fd0147c6e0953
        committer: Jelmer Vernooij <jelmer at samba.org>
        timestamp: Mon 2010-03-01 20:24:35 +0100
        message:
          Change license of dul-web to GPLv2 or later, consistent with the rest of Dulwich. Thanks to Dave for licensing this as GPLv2+.
        ------------------------------------------------------------
        revno: 465 [merge]
        git commit: b4495a08872e784b9967342265869eff99a83735
        committer: Jelmer Vernooij <jelmer at samba.org>
        timestamp: Sat 2010-02-27 17:16:29 +0100
        message:
          Add --pure option to setup.py.

So there must have been a rebase that changed the structure.  This means
"bzr pull" is not feasible as a way of following Dulwich.  So what is
the official one liner that does the right thing?  Which in this case is
I just want a mirror of what you have so I know when I have to
reinstall.

Thanks.


-- 
Russel.
=============================================================================
Dr Russel Winder      Partner
                                            xmpp: russel at russel.org.uk
Concertant LLP        t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,   f: +44 8700 516 084   voip: sip:russel.winder at ekiga.net
London SW11 1EN, UK   m: +44 7770 465 077   skype: russel_winder
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100302/335a8bd4/attachment.pgp