Re: preserving branch log messages when merging into trunk

Emin.shopper Martinian.shopper wrote:
> On Jan 24, 2008 3:03 PM, Blair Zajac <blair_at_orcaware.com> wrote:
>>
>> 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.
>
> Thanks for pointing that out, but that's not quite what I want.
> Imagine I have hundreds of commits on the branch (after all the whole
> point of the branch is to be able to commit before merging into
> trunk). Then if the log for each file gets merged into one gigantic
> log that gets used for the merge, looking at post-merge logs will be
> extremely painful.
>
> Currently we have a script that pulls out the log messages for each
> file on the branch and separately merges each file with the
> appropriate log messages, but this loses the concept of the whole
> changeset.

What you're doing will be the same volume of log messages as what I'm suggesting.

With svnmerge.py you won't end up with N*M copies of log messages, where N =
number of revisions merged into trunk and M = number of files. You'll only end
up with N in the merged commit message.

With svnmerge.py, you merge whole revisions over, not just single files.

As practice, also, using per-revision merging is better then
per-revision-and-per-file merging, at least until 1.5, when it can do
merge-tracking on the per file basis. If you use svnmerge.py, it'll do
merge-tracking on revisisions

Blair

-- 
Blair Zajac, Ph.D.
CTO, OrcaWare Technologies
<blair_at_orcaware.com>
Subversion training, consulting and support
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