Commit comments when merging

[Jelmer Vernooij]

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
-- 
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/20090210/90a32606/attachment.pgp