launchpad-dev team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

On Thursday 17 September 2009 10:12:14 Gavin Panella wrote:
> If your rocketfuel-get breaks today, as mine did, when "Updating
> dulwich", it seems to be because the dulwich branch has diverged, and
> a regular bzr pull complains:
> 
>   gavin@bungo:~/.../sourcecode/dulwich$ bzr pull
>   Using saved parent location:
>   bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/dulwich/devel/ bzr:
>   ERROR: These branches have diverged. Use the missing command to see
>   how. Use the merge command to reconcile them.
> 
> In this case I think it's better to simply do:
> 
>   gavin@bungo:~/.../sourcecode/dulwich$ bzr pull --overwrite

I get the same problem.

Did someone uncommit a revision on the LP branch?  I can't think of another 
reason for this.