Commit comments when merging

[David Muir]

Jelmer,

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

Here's how I'm set up:

SVN repo on the interwebs

Local checkout of svn repo ~/repos/svn/myProj/trunk

Local development branch of local checkout ~/www/myProj

I commit a couple revs to the local development branch ~/www/myProj/bzr 
commit
I then merge those into the local checkout: ~/repos/svn/myProj/trunk/bzr 
merge ~/www/myProj
Then I ran: ~/repos/svn/myProj/trunk/bzr svn-push --merged 
svn+ssh://pathToRepo

It sits there "determining changes", then nada.

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.

David

Jelmer Vernooij wrote:
> On Tue, 2009-02-10 at 10:51 -0600, Brian de Alwis wrote:
>   
>> On 9-Feb-2009, at 6:22 PM, James Henstridge wrote:
>>     
>>> 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.
>>>       
>> That's unfortunately not true if you're merging to a non-bzr format,  
>> such as through bzr-svn.
>>     
> 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
>   

-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090211/1b7f671d/attachment.htm