Can someone help describe the workflow when using bzr-svn...
Jelmer Vernooij
jelmer at samba.org
Fri May 1 13:04:18 BST 2009
John Szakmeister wrote:
> 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.
>
Perhaps it needs to be mentioned more prominently in the user guide.
> [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.
>
Thanks, that's useful. This is now fixed in the 0.6 branch.
Cheers,
Jelmer
More information about the bazaar
mailing list