From owner-svn-src-stable@FreeBSD.ORG  Tue Mar  6 14:16:10 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 353ED106564A;
	Tue,  6 Mar 2012 14:16:10 +0000 (UTC)
	(envelope-from remko@elvandar.org)
Received: from mailout.jr-hosting.nl (mailout.jr-hosting.nl
	[IPv6:2a01:4f8:141:5ffd::1:25])
	by mx1.freebsd.org (Postfix) with ESMTP id C2B178FC14;
	Tue,  6 Mar 2012 14:16:09 +0000 (UTC)
Received: from mailgate.jr-hosting.nl (unknown [IPv6:2a01:4f8:141:5061::25])
	by mailout.jr-hosting.nl (Postfix) with ESMTP id D9E673902868;
	Tue,  6 Mar 2012 14:16:07 +0000 (UTC)
Received: from www.jr-hosting.nl (mail.jr-hosting.nl [78.47.69.234])
	by mailgate.jr-hosting.nl (Postfix) with ESMTPSA id 3B7463F44F;
	Tue,  6 Mar 2012 15:16:07 +0100 (CET)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8;
 format=flowed
Content-Transfer-Encoding: 7bit
Date: Tue, 06 Mar 2012 15:16:06 +0100
From: Remko Lodder <remko@elvandar.org>
To: Remko Lodder <remko@freebsd.org>
In-Reply-To: <201203061413.q26EDOf9043745@svn.freebsd.org>
References: <201203061413.q26EDOf9043745@svn.freebsd.org>
Message-ID: <e8742b5900771f52aeed3800030da281@evilcoder.org>
X-Sender: remko@elvandar.org
User-Agent: Roundcube Webmail/0.7.1
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
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2012 14:16:10 -0000

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