From owner-freebsd-hackers@FreeBSD.ORG  Tue Dec  2 05:13:08 2008
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 59FCC1065672;
	Tue,  2 Dec 2008 05:13:08 +0000 (UTC)
	(envelope-from perryh@pluto.rain.com)
Received: from agora.rdrop.com (agora.rdrop.com [199.26.172.34])
	by mx1.freebsd.org (Postfix) with ESMTP id 3FC888FC0A;
	Tue,  2 Dec 2008 05:13:08 +0000 (UTC)
	(envelope-from perryh@pluto.rain.com)
Received: from agora.rdrop.com (66@localhost [127.0.0.1])
	by agora.rdrop.com (8.13.1/8.12.7) with ESMTP id mB25Cq7v093328
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Mon, 1 Dec 2008 21:12:54 -0800 (PST)
	(envelope-from perryh@pluto.rain.com)
Received: (from uucp@localhost)
	by agora.rdrop.com (8.13.1/8.12.9/Submit) with UUCP id mB25CqQv093327; 
	Mon, 1 Dec 2008 21:12:52 -0800 (PST)
Received: from fbsd61 by pluto.rain.com (4.1/SMI-4.1-pluto-M2060407)
	id AA07682; Mon, 1 Dec 08 21:04:54 PST
Date: Mon, 01 Dec 2008 21:08:25 -0800
From: perryh@pluto.rain.com
To: rea-fbsd@codelabs.ru, keramida@ceid.upatras.gr
Message-Id: <4934c2c9./+HbbGwhphjtaXAT%perryh@pluto.rain.com>
References: <4931CB02.9070904@gmail.com> <4932E8CF.9040501@freebsd.org>
	<49337f04.p8QqvfzTga07ypa6%perryh@pluto.rain.com>
	<200812010830.17259.max@love2party.net>
	<gFpinjQW6hEatbsT+XzE0kSsZf0@kjaK+/sQ5DW5981v71UogZJPf/0>
	<874p1nlslc.fsf@kobe.laptop>
	<8S1yocfZ0YutMO/GCIC1bN8RXQ0@kjaK+/sQ5DW5981v71UogZJPf/0>
In-Reply-To: <8S1yocfZ0YutMO/GCIC1bN8RXQ0@kjaK+/sQ5DW5981v71UogZJPf/0>
User-Agent: nail 11.25 7/29/05
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: max@love2party.net, kientzle@freebsd.org, freebsd-hackers@freebsd.org
Subject: Re: keeping track of local modifications
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Dec 2008 05:13:08 -0000

> > Git and Mercurial cannot import Subversion $FreeBSD$ lines
> > so far, and you may end up submitting patches that include
> > unexpanded forms of the "$FreeBSD: xxxx $" text.  These will
> > fail to apply if they same patch touches nearby lines.
>
> Ahm, yes.  "sed -e's|$FreeBSD: [^$]* \$|$FreeBSD$|g'" should help
> in this case.

Not sure I understand what is meant by "unexpanded" here, since
it looks as if this sed example would convert an "expanded" form
-- containing the version info -- to an "unexpanded" one that
merely shows where that info should go.

Perhaps it's my ClearCase background showing through, but I'd think
it highly desirable for a patch to include what I think of as the
expanded tag line -- including the version info, as it appears in
the distributed files under /usr/src -- thereby explicitly showing
the version on which the patch is based (the "base contributor"
in ClearCase-speak).  This should greatly simplify merging in the
(likely) event that other development has occurred on the same file
in the meantime -- provided one is using a 3-way merge tool that
understands such things.