<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
<title></title>
</head>
<body bgcolor="#ffffff" text="#000000">
Jelmer,<br>
<br>
I gave bz svn-push --merged a whirl, but it just sat there, chugged,
for a while, then nothing. No errors, but it didn't do anything either
(that I could see). Maybe it's my setup that's wrong...<br>
<br>
Here's how I'm set up:<br>
<br>
SVN repo on the interwebs<br>
<br>
Local checkout of svn repo ~/repos/svn/myProj/trunk<br>
<br>
Local development branch of local checkout ~/www/myProj<br>
<br>
I commit a couple revs to the local development branch ~/www/myProj/bzr
commit<br>
I then merge those into the local checkout:
~/repos/svn/myProj/trunk/bzr merge ~/www/myProj<br>
Then I ran: ~/repos/svn/myProj/trunk/bzr svn-push --merged
svn+ssh://pathToRepo<br>
<br>
It sits there "determining changes", then nada.<br>
<br>
So the only thing that's working for me is commit, but that bunches the
merged revs into a single commit, which is bad when trying to tie the
revisions to particular issues/bug reports.<br>
<br>
David<br>
<br>
Jelmer Vernooij wrote:
<blockquote
cite="mid:%3C1234285232.22449.2.camel@ganieda.vernstok.nl%3E"
type="cite">
<pre wrap="">On Tue, 2009-02-10 at 10:51 -0600, Brian de Alwis wrote:
</pre>
<blockquote type="cite">
<pre wrap="">On 9-Feb-2009, at 6:22 PM, James Henstridge wrote:
</pre>
<blockquote type="cite">
<pre wrap="">When you merge a branch, the actual commits are imported into your
branch too. The "bzr log" output will show the merged revisions
indented, so you don't need to repeat their commit messages in the
message for your merge revision.
</pre>
</blockquote>
<pre wrap="">
That's unfortunately not true if you're merging to a non-bzr format,
such as through bzr-svn.
</pre>
</blockquote>
<pre wrap=""><!---->bzr-svn can push these other commits as well, they can be committed in
other branches - see bzr svn-push --merged. This can be appropriately
displayed if you have a svn viewer that uses the svn mergeinfo that was
added in svn 1.5.
Cheers,
Jelmer
</pre>
</blockquote>
<br>
</body>
</html>