Couple of bzr-svn related issues...

John Szakmeister john at szakmeister.net
Mon Mar 9 18:35:42 GMT 2009


On Mon, Mar 9, 2009 at 8:36 AM, Jelmer Vernooij <jelmer at samba.org> wrote:
[snip]
> This is a bug that needs fixing in both bzr and bzr-svn; the bzr-svn
> side of it has been fixed, the bzr bit is in progress
> (http://bundlebuggy.aaronbentley.com/project/bzr/request/%
> 3C1236270730.1559.10.camel%40charis.vernstok.nl%3E). As a workaround,
> you can use the svn-push command.

I didn't realize svn-push was still around (didn't show up in bzr help
commands).  I'll try that.

>> The other issue I ran into is that bzr-svn backtraces if I try to bzr
>> push into the top-level of the repo (a sibling to trunk).  I found
>> this out because I was just trying to get a feel for how things would
>> look pushing an entirely new branch into Subversion that wasn't
>> originally branched from there.  So I created an empty test repo...
>> and you can see where that went.
> Please file a bug report about this and how to reproduce it.

See: https://bugs.launchpad.net/bzr-svn/+bug/340081

>> Finally, I'm curious if it's possible that in a normal workflow (of
>> branching trunk, making changes and pushing to the branches area of
>> Subversion) if it's possible to get that extra copy step of trunk to
>> branches with no other changes.
> I'm not sure I understand what you mean? What operation of bzr-svn in
> this situation is problematic here?

Sorry, I should have been more specific.  Pushing to a new branch in
the repository.  The creation of the branch and the edits get
committed all at once.  This is problematic if you want to merge the
branch using the svn client (and not bzr).  I've attached a script to
demonstrate the issue.  In the script, I try to get the svn command
line client to give me a diff, but it fails.  If we can make that pass
(and show the actual diff), then we'd be able to merge the bzr branch
back into svn's trunk using the svn command line tool.

I'd create the branch in svn first, but since I'm often offsite from
those repositories, it doesn't work very well to employ that strategy.

-John
-------------- next part --------------
A non-text attachment was scrubbed...
Name: create-new-branch.sh
Type: application/x-sh
Size: 535 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090309/c4178bcb/attachment.sh 


More information about the bazaar mailing list