Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Nov 2012 22:35:33 +0100 (CET)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        releng@FreeBSD.org
Subject:   conf/173915: Mergemaster painfull due to old ident tags
Message-ID:  <20121125213534.017571143A@graf.pompo.net>
Resent-Message-ID: <201211252140.qAPLe0O1071206@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         173915
>Category:       conf
>Synopsis:       Mergemaster painfull 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:
>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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121125213534.017571143A>