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

Re: Auditing Design - v1 (was: Re: [merge-tracking] 'svn blame' auditing)

From: Stefan Haller <haller_at_ableton.com>
Date: 2007-02-25 11:35:08 CET

Daniel Rall <dlr@collab.net> wrote:

> As far as the original log messages go (for 'log --merge-sensitive
> --verbose'), we could do something like svnmerge.py's generated log
> messages:
>
> $ cat svnmerge-commit-message.txt
> Merged revisions 23490 via svnmerge from
> https://svn.collab.net/repos/svn/trunk
>
> ........
> r23490 | dlr | 2007-02-23 18:19:06 -0800 (Fri, 23 Feb 2007) | 1 line
>
> * www/merge-tracking/design.html (data-structures): Add new section.
> ........
>
> It indents the original log message, and adds separators between them.
> This seems like a reasonable style of output to me.

Note, however, that the information can be recursive; if r23490 is in
turn a merge of some other revisions, the original revisions of that
merge would have to be printed too, with another level of indentation.
(This is not a contrived case, it happens in practice all the time for
us.)

My feeling is that it may be good enough to leave out r23490 itself in
that case, and only print all the original revisions (i.e. the leaf
nodes in the merge tree) in one flat list. I'm not sure if all users
would agree with that though.

-- 
Stefan Haller
Ableton
http://www.ableton.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 25 11:35:36 2007

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