From thierry@pompo.net  Sun Nov 25 21:35:41 2012
Return-Path: <thierry@pompo.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BAE84127
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Nov 2012 21:35:41 +0000 (UTC)
	(envelope-from thierry@pompo.net)
Received: from mx1a.lautre.net (mx1a.lautre.net [80.67.160.71])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B1E78FC1B
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Nov 2012 21:35:41 +0000 (UTC)
Received: from graf.pompo.net (graf.pompo.net [78.225.128.39])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	(Authenticated sender: thierry@pompo.net)
	by mx1a.lautre.net (Postfix) with ESMTPSA id 980D84073B;
	Sun, 25 Nov 2012 22:35:34 +0100 (CET)
Received: by graf.pompo.net (Postfix, from userid 1001)
	id 017571143A; Sun, 25 Nov 2012 22:35:33 +0100 (CET)
Message-Id: <20121125213534.017571143A@graf.pompo.net>
Date: Sun, 25 Nov 2012 22:35:33 +0100 (CET)
From: Thierry Thomas <thierry@FreeBSD.org>
Reply-To: Thierry Thomas <thierry@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: re@freebsd.org 
Subject: Mergemaster painfull due to old ident tags
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         173915
>Category:       bin
>Synopsis:       mergemaster(8) painful due to old ident tags
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 25 21:40:00 UTC 2012
>Closed-Date:    
>Last-Modified:  Sun Mar 10 05:20:56 UTC 2013
>Originator:     Thierry Thomas
>Release:        FreeBSD 9.1-PRERELEASE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r243502: Sun Nov 25 18:43:08 CET 2012 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF120125 i386


	
>Description:
	When upgrading a machine to 9.1-PRERELEASE, mergemaster is
	painfull, because many quiete recent files are replaced with
	files with old ident.

	E.g.:

$ ident /etc/hosts /etc/shells /etc/csh.cshrc
/etc/hosts:
     $FreeBSD: stable/9/etc/hosts 109997 2003-01-28 21:29:23Z dbaker $

/etc/shells:
     $FreeBSD: stable/9/etc/shells 59717 2000-04-27 21:58:46Z ache $

/etc/csh.cshrc:
     $FreeBSD: stable/9/etc/csh.cshrc 50472 1999-08-27 23:37:10Z peter $

>How-To-Repeat:
	Check ident of many files under /etc.

>Fix:
	Force commit of these oldies.

	


>Release-Note:
>Audit-Trail:
>Unformatted:
