[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: preserving branch log messages when merging into trunk

From: Emin.shopper Martinian.shopper <emin.shopper_at_gmail.com>
Date: Fri, 25 Jan 2008 15:46:15 -0500

On Jan 25, 2008 11:30 AM, Blair Zajac <blair_at_orcaware.com> wrote:
> 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.

Thanks, I understand that part. I'm not concerned about the volume of
log messages, I'm concerned about the usefulness of log messages.
Specifically, at some point after the merge, I'd like to be able to
look at the log for file XXX and see the commit messages just for XXX
instead of the log messages for every single file that was involved in
the previous merge.

> As practice, also, using per-revision merging is better then
> per-revision-and-per-file merging,

I generally agree except that it either loses the individual log
messages for a file in favor of the per-revision log message or it
bloats the log message for a file with the log message for all the
other files in the merge.

> at least until 1.5, when it can do merge-tracking on the per file basis.

OK, it sounds like the answer is to wait until 1.5 and see if that
improves things.

Thanks for taking the time to respond.


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 21:46:37 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.