Date: Tue, 06 Mar 2012 15:16:06 +0100 From: Remko Lodder <remko@elvandar.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-7@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r232607 - stable/7 Message-ID: <e8742b5900771f52aeed3800030da281@evilcoder.org> In-Reply-To: <201203061413.q26EDOf9043745@svn.freebsd.org> References: <201203061413.q26EDOf9043745@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 06.03.2012 15:13, Remko Lodder wrote: The commit seems to mess up with the time schedule. Normally latest entries are on top, but the merge somehow got a lot of conflicts and now it isn't on top. Anyone has a suggestion on how to properly fix this? (Same goes for stable/8!) Thanks Remko > Author: remko > Date: Tue Mar 6 14:13:23 2012 > New Revision: 232607 > URL: http://svn.freebsd.org/changeset/base/232607 > > Log: > Merge r238821 > > Add sticky.8 to the obsolete files since it had been > moved to sticky.7 > > Submitted by: maxim and pluknet > > With help from: dim (because of awkward merge conflicts) > > Modified: > stable/7/ObsoleteFiles.inc (contents, props changed) > Directory Properties: > stable/7/ (props changed) > > Modified: stable/7/ObsoleteFiles.inc > > ============================================================================== > --- stable/7/ObsoleteFiles.inc Tue Mar 6 14:10:57 2012 (r232606) > +++ stable/7/ObsoleteFiles.inc Tue Mar 6 14:13:23 2012 (r232607) > @@ -14,6 +14,8 @@ > # The file is partitioned: OLD_FILES first, then OLD_LIBS and > OLD_DIRS last. > # > > +# 20110224: sticky.8 -> sticky.7 > +OLD_FILES+=usr/share/man/man8/sticky.8.gz > # 20101114: Remove long-obsolete MAKEDEV.8 > OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz > # 20101112: vgonel(9) has gone to private API a while ago -- /"\ Best regards, | remko@FreeBSD.org \ / Remko Lodder | remko@EFnet X http://www.evilcoder.org/ | / \ ASCII Ribbon Campaign | Against HTML Mail and News
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e8742b5900771f52aeed3800030da281>