From owner-freebsd-hackers@FreeBSD.ORG Tue Dec 2 07:45:01 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 BB4C01065679; Tue, 2 Dec 2008 07:45:01 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) Received: from 0.mx.codelabs.ru (0.mx.codelabs.ru [144.206.177.45]) by mx1.freebsd.org (Postfix) with ESMTP id 737098FC17; Tue, 2 Dec 2008 07:45:00 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) DomainKey-Signature: a=rsa-sha1; q=dns; c=simple; s=one; d=codelabs.ru; h=Received:Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:Sender; b=K6ayYwagZuh+3DbO35SFJVmKujFAJNSwCEZAzadqqRG/FZN0v1PjEnk6tVOmL/flGX3hHjCY/E7xi2Q2OauHW48eVq4fmirQmVNEFeri50Yz4oE43SX+iuzZcOwf8z10G65uFq57rcscUYkTQy0naCq2zfOYuE5Foq+m7M8tIJQ=; Received: from void.codelabs.ru (void.codelabs.ru [144.206.177.25]) by 0.mx.codelabs.ru with esmtpsa (TLSv1:AES256-SHA:256) id 1L7PwI-0005fR-F6; Tue, 02 Dec 2008 10:44:58 +0300 Date: Tue, 2 Dec 2008 10:44:56 +0300 From: Eygene Ryabinkin To: perryh@pluto.rain.com Message-ID: 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> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4QzzFpAwbwI4hdN6" Content-Disposition: inline In-Reply-To: <4934c2c9./+HbbGwhphjtaXAT%perryh@pluto.rain.com> Sender: rea-fbsd@codelabs.ru Cc: keramida@ceid.upatras.gr, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Dec 2008 07:45:01 -0000 --4QzzFpAwbwI4hdN6 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Perry, good day. Mon, Dec 01, 2008 at 09:08:25PM -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. >=20 > 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. If you'll look at the diffs that are provided by Subversion, you'll see that '$Id$' tags at the diff are shrinked to the '$Id' if keyword expansion is enabled. For example, ----- Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- ChangeLog (revision 40) +++ ChangeLog (working copy) @@ -1,4 +1,5 @@ $Id$ +add Current version: - Added CRL check for all certificates in chain during S/MIME ----- while original ChangeLog reads ----- $Id: ChangeLog 35 2008-04-11 10:02:37Z root $ add Current version: - Added CRL check for all certificates in chain during S/MIME verification. ----- The above sed command will normalize $FreeBSD$ tags (de-expand them, you're right that the wording was a bit ambigious). But I was out of coffee yesterday, so I missed an important thing: such diffs won't also apply, because you're really right: Subversion shrinks 'Id' (think 'FreeBSD') tags for diffs it is generating, but it has no command 'svn patch' that will shrink these tags, apply the diff and unshink them to the original form. And this matters when you're generating the diff against version N, but maintainer applies it to the version N + m. If I am correct, there is no simple automatic solution, but special patching as described above will be needed. Please, correct me if I am wrong. --=20 Eygene _ ___ _.--. # \`.|\..----...-'` `-._.-'_.-'` # Remember that it is hard / ' ` , __.--' # to read the on-line manual =20 )/' _/ \ `-_, / # while single-stepping the kernel. `-'" `"\_ ,_.-;_.-\_ ', fsc/as # _.-'_./ {_.' ; / # -- FreeBSD Developers handbook=20 {_.-``-' {_/ # --4QzzFpAwbwI4hdN6 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (FreeBSD) iEYEARECAAYFAkk053gACgkQthUKNsbL7Yi05gCghXK7xnRARUWJEhQ1NMgM5WG+ YWAAn3D/g5pkQPQnpTuk57B2l2CiZT1p =In3h -----END PGP SIGNATURE----- --4QzzFpAwbwI4hdN6--