svn commit: r331722 - in stable/11: bin/cat bin/chflags bin/chmod bin/cp bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/hostname bin/kill bin/ln bin/ls bin/mkdir bin/mv bin/pax bin/ps bi...

[Glen Barber]

On Mon, Apr 16, 2018 at 01:00:21PM -0600, Ian Lepore wrote:
> On Sun, 2018-04-15 at 18:08 -0700, Eitan Adler wrote:
> > On 15 April 2018 at 17:53, Kyle Evans <kevans at freebsd.org> wrote:
> > > 
> > > On Sun, Apr 15, 2018 at 7:28 PM, Rodney W. Grimes
> > > <freebsd at pdx.rh.cn85.dnsmgr.net> wrote:
> > > > 
> > > > > 
> > > > > On Wed, 2018-03-28 at 20:17 -0700, Rodney W. Grimes wrote:
> > > > > > 
> > > > > > [...]
> > > > > > I tried to get this slowed down until we could get to a concenses,
> > > > > > I think our mess is as big now as it was before.
> > > > > > 
> > > > > Or bigger. I've just discovered this commit reverted stuff that wasn't
> > > > > part of the bad original MFC commit. Things I MFC'd to 11 before this
> > > > > revert are now missing changes and the symptoms don't show up until a
> > > > > module fails to load due to missing symbols.
> > > > > 
> > > > > I guess every change on the stable-11 branch between r330897 and
> > > > > r331722 needs to be audited to see if MFC'd or changed code has been
> > > > > unintentionally reverted.
> > > > > 
> > > > > Here's the example I've just run across...
> > > > > 
> > > > > r330897 merged this:
> > > > > 
> > > > > https://svnweb.freebsd.org/base/stable/11/sys/dev/spibus/ofw_spibus.c?r1=302408&r2=330897
> > > > > 
> > > > > Then I did some MFCing, then r331722 "reverted" this:
> > > > > 
> > > > > https://svnweb.freebsd.org/base/stable/11/sys/dev/spibus/ofw_spibus.c?r1=331506&r2=331722
> > > > *sigh*  Ok, I can at least do an audit of the r331722
> > > > that was suppose to be a revert and see what else I find.
> > > > 
> > > > I'll start on this tomarrow and get the first pass audit out fairly early
> > > > in the morning my time (PST)
> > > > 
> > > > Do we revert the attempted revert, then properly revert the original?
> > I am beyond confused. How did
> > svn merge -c-r330897 .
> > fail?
> > 
> 
> If that's literally the command you entered, it may have been the extra
> '-r' that caused a problem. To backout a single changelist, the command
> is
> 
>   svn merge -c -330897 .
> 
> I wonder if that extra -r separated the changelist number from the -c
> option, and in effect did a reverse-merge by revision number of
> everything back to r330897?
> 

In this example, both '-rNNNNNN' and '-NNNNNN' are synonymous.

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20180416/d7662263/attachment.sig>