svn commit: r333503 - stable/11/sys/net

[Rodney W. Grimes]

> > On Fri, 11 May 2018, Ian Lepore wrote:
> > 
> > > On Fri, 2018-05-11 at 19:31 -0400, Jonathan T. Looney wrote:
> > >> On Fri, May 11, 2018 at 4:40 PM, Stephen Hurd <shurd at freebsd.org> wrote:
> > >>>
> > >>>
> > >>> Author: shurd
> > >>> Date: Fri May 11 20:40:26 2018
> > >>> New Revision: 333503
> > >>> URL: https://svnweb.freebsd.org/changeset/base/333503
> > >>>
> > >>> Log:
> > >>>   MFC r333329, r333366, r333373
> > >>>
> > >>>   r333329: Fix off-by-one error requesting tx interrupt
> > >>>   r333366: Cleanup queues when iflib_device_register fails
> > >>>   r333373: Log iflib_tx_structures_setup failure in function
> > >>>

I was actually discussing an aspect of this early today and
would like to see, if possible, the *actual* mergeinfo in
the commit mail message, and would really really like to have
it in the log, but that may not be possible.

For r333354 this looks like:
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r308728,314369,315243,316026,316581,316616,318359,319922,319990,321481,323232-323233,323321,323874,323955,324323,324964,325169,325488,325620,326985,326999-327001,327003,329335

(We would want to line wrap it at 80, left untouched here)

As, IMHO, this would help to catch missing mergeinfo (caused by
svn commit not in root of branch),
and merges that are more than what they claim (usually caused
by a dirty tree before svn merge commands).

This is typically 2 lines of added info,
and it IS part of the normal output from a svn diff,
but not clear to me why this is not in the commit mail message.

> > >> Is this an acceptable style for MFC logs?
> > >>
> > >> I'm asking because I actually prefer this to reading (or compiling) the
> > >> concatenated log messages from several changes. However, I never knew it
> > >> was acceptable to summarize like this. If it is, I'd like to know so I can
> > >> adopt it for run-of-the-mill MFCs.
> > >>
> > >> Jonathan
> > >
> > > This used to be my preferred format, essentially to summarize what's
> > > being mfc'd. But then I started using the MFC Tracker tool [*] and it
> > > automatically generates a commit message that contains the full text,
> > > so I stopped trying to summarize things.
> > >
> > > [*] https://mfc.kernelnomicon.org/6/
> > 
> > It was the normal style with cvs (to avoid spamming the repository as
> > well as readers).  Howver, one of many worse behaviours in svn is that
> > after checking out a branch, svn log only shows history for the branch,
> > so it is hard to find the full log messages even if you know that the
> > visible ones are only summaries.
> 
> Though I don't care much for this behavior either you can get the
> original log entry if you get the changeset number by doing a
> svn log -c XXXXXX ^/head
> without that trailing ^/head you get a null output as that change
> does not exist on your current branch.
> 
> You can also find the changeset number if the stable/X commit log
> does not have it by looking at the tail of a
> svn diff -c XXXXXX
> which has the mergeinfo in it, if it was done correctly.
> 
> For this commit it would be
> svn diff -c 333503 | tail
> 
> > Bruce
> 
> -- 
> Rod Grimes                                                 rgrimes at freebsd.org
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org