From owner-freebsd-hackers@FreeBSD.ORG Tue Dec 2 11:52:59 2008 Return-Path: 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 CA5E41065670 for ; Tue, 2 Dec 2008 11:52:59 +0000 (UTC) (envelope-from keramida@freebsd.org) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.freebsd.org (Postfix) with ESMTP id 25A0C8FC17 for ; Tue, 2 Dec 2008 11:52:58 +0000 (UTC) (envelope-from keramida@freebsd.org) Received: from kobe.laptop (adsl142-13.kln.forthnet.gr [195.74.241.13]) (authenticated bits=128) by igloo.linux.gr (8.14.3/8.14.3/Debian-5) with ESMTP id mB2BqiWf022769 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 2 Dec 2008 13:52:50 +0200 Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id mB2BqiX1009829; Tue, 2 Dec 2008 13:52:44 +0200 (EET) (envelope-from keramida@freebsd.org) Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id mB2BqgMO009828; Tue, 2 Dec 2008 13:52:42 +0200 (EET) (envelope-from keramida@freebsd.org) From: Giorgos Keramidas To: perryh@pluto.rain.com References: <4931CB02.9070904@gmail.com> <4932E8CF.9040501@freebsd.org> <49337f04.p8QqvfzTga07ypa6%perryh@pluto.rain.com> <200812010830.17259.max@love2party.net> <874p1nlslc.fsf@kobe.laptop> <8S1yocfZ0YutMO/GCIC1bN8RXQ0@kjaK+/sQ5DW5981v71UogZJPf/0> <4934c2c9./+HbbGwhphjtaXAT%perryh@pluto.rain.com> Date: Tue, 02 Dec 2008 13:52:42 +0200 In-Reply-To: <4934c2c9./+HbbGwhphjtaXAT%perryh@pluto.rain.com> (perryh@pluto.rain.com's message of "Mon, 01 Dec 2008 21:08:25 -0800") Message-ID: <87ej0q23qt.fsf@kobe.laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-MailScanner-ID: mB2BqiWf022769 X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-4.205, required 5, autolearn=not spam, ALL_TRUSTED -1.80, AWL 0.19, BAYES_00 -2.60) X-Hellug-MailScanner-From: keramida@freebsd.org X-Spam-Status: No Cc: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Dec 2008 11:52:59 -0000 On Mon, 01 Dec 2008 21:08:25 -0800, perryh@pluto.rain.com wrote: >>> 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. You are right, of course. The fact that `$FreeBSD$' is extracted in unexpanded form by the current svn->hg converter is a limitation of the Python bindings of Subversion. They do not support expansion of the svn:keywords property of checked out files.