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

[John Szakmeister]

On Thu, Apr 30, 2009 at 5:54 PM, Jelmer Vernooij <jelmer at samba.org> wrote:
[snip]
> 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).

I realize that... nut it's awkward for svn users to see.  It looks
like I changed much more than I actually did.  And makes merging that
much more difficult, because you don't know which revision of the
commit to apply to a branch.  We ran into this in one case, and
decided it was we definitely didn't want to directly push our local
branches back into trunk after that.

[snip]
> Can you specify a bit more information? Even just the backtrace with any
> private data removed would be a big help.

Unfortunately, I can't do that.  But I did take the time to reproduce
it in a script.  The short form: you make have an svn:author value
set.  When I was playing with this stuff locally, I just gave anon
write access to make things go.  Turns out that's what causes the
backtrace.  I've attached a script demonstrating this.  If you
uncomment the commented lines (and remove the one svn ci line), you'll
see everything work as expected.

> 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.

I thought I had done the rebase and dpush thing before, and wasn't so
sure when I encountered the backtrace.  But looking at my scripts, I
tested all this stuff before... but was more interested in maintaining
a separate branch, so I didn't play with this much.  It absolutely
looks like 'bzr rebase' and 'bzr dpush' are what I want to use.

Thanks Jelmer!

-John
-------------- next part --------------
A non-text attachment was scrubbed...
Name: kill-bzr-svn.sh
Type: application/x-sh
Size: 1004 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090430/0f6cf21b/attachment.sh