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:
ga...@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: ga...@bungo:~/.../sourcecode/dulwich$ bzr pull --overwrite Gavin. _______________________________________________ Mailing list: https://launchpad.net/~launchpad-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-dev More help : https://help.launchpad.net/ListHelp
