Re: preserving branch log messages when merging into trunk

Emin.shopper Martinian.shopper wrote:
> Dear Experts,
>
> Is there a way to preserve branch log messages when merging back into trunk?
>
> Imagine that I make a branch called foo, do lots of commits on lots of
> different files in foo, and then want to merge foo back into trunk. It
> seems like I have two choices.
>
> (1) Merge each file of foo separately. This is nice because I can use
> the per file log messages from foo when merging back into the trunk.
> That way further developers on trunk see the log messages from the
> branch. The problem is that it loses the concept of the entire
> changeset.
>
> (2) Do the merge with a single commit. This is nice because it treats
> all the changes as one changeset. But it has the disadvantage of
> requiring a single log message for the entire commit.
>
> Ideally, I'd like the advantages of (1) and (2). Is there a good way
> to do that?

If you use svnmerge.py to manage your merges, for (2), you'll have a single
commit with a single log message containing the concatenation of the log
messages that went into the merge.

http://www.orcaware.com/svn/wiki/Svnmerge.py

Regards,
Blair

-- 
Blair Zajac, Ph.D.
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org