Re: preserving branch log messages when merging into trunk

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.

Thanks for your response,
-Emin

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-25 15:19:57 CET