Couple of bzr-svn related issues...
Jelmer Vernooij
jelmer at samba.org
Mon Mar 9 19:31:24 GMT 2009
On Mon, 2009-03-09 at 13:35 -0500, John Szakmeister wrote:
> 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
Thanks; please note that this is the same issue, you need to use
svn-push. The error could be a lot clearer though.
> >> 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 would say first and foremost that this is a bug in svn diff. It has
sufficient information to display information here, there's no
ambiguity.
Other than that this is also a bzr-svn bug, can you file a bug report
about this?
Cheers,
Jelmer
--
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 315 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090309/8ceb7d79/attachment.pgp
More information about the bazaar
mailing list