Comment 3 for bug 250480

The original problem was, I have been working on a branch for a few weeks at

http://www.johnstowers.co.nz/bzr/conduit-gio/

This was originally branched from trunk

http://bzr-mirror.gnome.org/conduit/trunk/

About a week ago it became impossible to merge in trunks changes into that branch.

bzr: ERROR: Revision {<email address hidden>} not present in "951@1811c9d2-c306-0410-a128-ae57aa55c946:trunk:conduit%2Fmodules%2FFileModule".

I dont understand the relevance of using http://bzr-playground.gnome.org/~jstowers/conduit/devel, as excluding delays in bzr-plyground updating trunk from svn, it should usually be the same as trunk anyway.

Unfortunately, due to above errors, the conduit-gio branch at johnstowers.co.nz became unbranchable. Lifeless instructed me to branch my local copy to /tmp, and then push this again (to deep copy the history, or something, IIRC). This is now available at

bzr branch http://www.johnstowers.co.nz/bzr/test-bzr-conduit

I want to be able to merge trunk changes into

http://www.johnstowers.co.nz/bzr/test-bzr-conduit or
http://www.johnstowers.co.nz/bzr/conduit-gio/

And then push that to http://bzr-playground.gnome.org/jstowers/... for people to actually test, and because It will go into trunk in a few weeks