Date: Tue, 6 Mar 2012 17:29:51 +0300 From: Sergey Kandaurov <pluknet@freebsd.org> To: Remko Lodder <remko@freebsd.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r232606 - stable/8 Message-ID: <CAE-mSO%2BXB5dZFgAj64gg%2Bq2RCzZOwtJwjNo5mzJ3K4OKCkhc5A@mail.gmail.com> In-Reply-To: <201203061410.q26EAvav043586@svn.freebsd.org> References: <201203061410.q26EAvav043586@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 6 March 2012 18:10, Remko Lodder <remko@freebsd.org> wrote: > Author: remko > Date: Tue Mar =A06 14:10:57 2012 > New Revision: 232606 > URL: http://svn.freebsd.org/changeset/base/232606 > > Log: > =A0Merge r238821 > > =A0Add sticky.8 to the obsolete files since it had been > =A0moved to sticky.7 > > =A0Submitted by: maxim and pluknet > > =A0With help from: =A0 =A0 =A0 dim (because of awkward merge conflicts) > > Modified: > =A0stable/8/ObsoleteFiles.inc =A0 (contents, props changed) > Directory Properties: > =A0stable/8/ =A0 (props changed) Eh, it seems you merged r238821 to stable/8, and that's wrong. Changes to top-level files should be merged directly to that file rather than to the root of the whole tree (see rule 12). `svn diff -c 232606' gives me: Index: ObsoleteFiles.inc =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- ObsoleteFiles.inc (revision 232605) +++ ObsoleteFiles.inc (revision 232606) @@ -19,6 +19,8 @@ OLD_FILES+=3Dusr/share/man/man9/cc.9.gz # 20101123: removed subblock.h from liblzma OLD_FILES+=3Dusr/include/lzma/subblock.h +# 20110224: sticky.8 -> sticky.7 +OLD_FILES+=3Dusr/share/man/man8/sticky.8.gz # 20101114: Remove long-obsolete MAKEDEV.8 OLD_FILES+=3Dusr/share/man/man8/MAKEDEV.8.gz # 20101112: vgonel(9) has gone to private API a while ago Property changes on: ObsoleteFiles.inc ___________________________________________________________________ Modified: svn:mergeinfo Merged /head/ObsoleteFiles.inc:r219005 Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /head:r219005 --=20 wbr, pluknet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSO%2BXB5dZFgAj64gg%2Bq2RCzZOwtJwjNo5mzJ3K4OKCkhc5A>