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

[Jelmer Vernooij]

John Szakmeister wrote:
> 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.
>   
This matches the actual contents in your local branch though; only the
last revision in your branch would contain the other revisions on
mainline that you merged (see the output of "bzr log" on your local branch).
> 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)'. 
Can you specify a bit more information? Even just the backtrace with any
private data removed would be a big help.

If you don't want mainline to be changed you definitely don't want to
use merge on the mainline that you're going to push to. You can e.g. use
rebase with dpush. Or you can use a checkout and work in a svn-like manner.

Cheers,

Jelmer