Date: Mon, 1 Dec 2008 22:56:02 +0300 From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> To: Giorgos Keramidas <keramida@ceid.upatras.gr> Cc: Max Laier <max@love2party.net>, kientzle@freebsd.org, perryh@pluto.rain.com, freebsd-hackers@freebsd.org Subject: Re: keeping track of local modifications Message-ID: <8S1yocfZ0YutMO/GCIC1bN8RXQ0@kjaK%2B/sQ5DW5981v71UogZJPf/0> In-Reply-To: <874p1nlslc.fsf@kobe.laptop> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
--RhUH2Ysw6aD5utA4
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Giorgos, good day.
Mon, Dec 01, 2008 at 07:21:03PM +0200, Giorgos Keramidas wrote:
> On Mon, 1 Dec 2008 11:23:40 +0300, Eygene Ryabinkin <rea-fbsd@codelabs.ru=
> wrote:
> > May be I am missing something, but what's wrong with the patches from
> > other VCS, providing that with Subversion you can exchange only by the
> > plain diffs? Yes, Git/Mercurial patches should be applied with 'patch
> > -p1', but that's all. Subversion has no notion simular to 'git
> > format-patch' and 'git am', if I am not messing the things up, so the
> > only way to exchange with others are the patches themselves.
>=20
> Conflicts...
>=20
> 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.
Thanks for clarification!
--=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
{_.-``-' {_/ #
--RhUH2Ysw6aD5utA4
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (FreeBSD)
iEYEARECAAYFAkk0QVEACgkQthUKNsbL7YgV1wCcDeOXAA9ToMioINp7oM2xZqcS
O7UAnja9iZIfUr4esi/gJJgEwwlSZhdn
=Y8eQ
-----END PGP SIGNATURE-----
--RhUH2Ysw6aD5utA4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8S1yocfZ0YutMO/GCIC1bN8RXQ0>