Date: Tue, 2 Dec 2008 10:44:56 +0300 From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> To: perryh@pluto.rain.com Cc: keramida@ceid.upatras.gr, max@love2party.net, kientzle@freebsd.org, freebsd-hackers@freebsd.org Subject: Re: keeping track of local modifications Message-ID: <oXnJun8c8OjxYDoPVy/fflpCqp4@1sSz4QqKMwRgwtJOiEEAoKyoIV0> In-Reply-To: <4934c2c9./%2BHbbGwhphjtaXAT%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%2BXzE0kSsZf0@kjaK%2B/sQ5DW5981v71UogZJPf/0> <874p1nlslc.fsf@kobe.laptop> <8S1yocfZ0YutMO/GCIC1bN8RXQ0@kjaK%2B/sQ5DW5981v71UogZJPf/0> <4934c2c9./%2BHbbGwhphjtaXAT%perryh@pluto.rain.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?oXnJun8c8OjxYDoPVy/fflpCqp4>