Can someone help describe the workflow when using bzr-svn...

[John Szakmeister]

In particular, I'm interested in using Bazaar to manage my commits,
but others may be using the regular old svn client.  I'd like not to
have bzr-svn do goofy things.  For instance, if I branch trunk, make
some commits, and someone else commits to trunk in the meantime, what
actions do I need to take?  I went ahead and merged the trunk changes
in.  Then attempted to push, which undid the changes to trunk, applied
my changes, and then re-applied the other commits.  That's definitely
not desirable.

It seems like 'bzr dpush' should be the answer... if I try 'bzr dpush'
without merging in the changes from trunk, I get an error about the
branches having diverged.  If I merge in the changes from trunk first,
commit the merge, and then try to dpush, I get a traceback saying
'TypeError: cannot serialize None (type NoneType)'.  I'd give you the
whole traceback, but unfortunately, I can't due to security reasons
(we can transfer data from one LAN to the other). :-(

Line 132 in svn/push.py seems to be the start of the error in bzr-svn.
 I'm running bzr 1.14, bzr-svn 0.5.4, bzr-rebase 0.4dev (not sure
which version exactly).

I've got to imagine I'm doing something wrong here... I'd love to know what. :-)

Thanks in advance!

-John