From owner-freebsd-hackers@FreeBSD.ORG Mon Dec 1 19:56:06 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 37F3B1065670; Mon, 1 Dec 2008 19:56:06 +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 D2A4C8FC08; Mon, 1 Dec 2008 19:56:05 +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=RLOS9rV5PUgvYSw8LsZWH/LXESEeYZZN8a0wAXxdY6sziAZsUf8hF5jQDf3JGpLRkXEQm6GIrdPAMqW2n4IC0NoV6cHFnukd0+nHhsJoZugzkc77WQk4bNZNwRgcquqtj6ymNZmRaCBG5WCNj8YKy+2VOps1gY/IF2Qvqc9BjjY=; Received: from phoenix.codelabs.ru (ppp91-78-248-236.pppoe.mtu-net.ru [91.78.248.236]) by 0.mx.codelabs.ru with esmtpsa (TLSv1:AES256-SHA:256) id 1L7EsG-0007D9-Af; Mon, 01 Dec 2008 22:56:04 +0300 Date: Mon, 1 Dec 2008 22:56:02 +0300 From: Eygene Ryabinkin To: Giorgos Keramidas Message-ID: <8S1yocfZ0YutMO/GCIC1bN8RXQ0@kjaK+/sQ5DW5981v71UogZJPf/0> References: <4931CB02.9070904@gmail.com> <4932E8CF.9040501@freebsd.org> <49337f04.p8QqvfzTga07ypa6%perryh@pluto.rain.com> <200812010830.17259.max@love2party.net> <874p1nlslc.fsf@kobe.laptop> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RhUH2Ysw6aD5utA4" Content-Disposition: inline In-Reply-To: <874p1nlslc.fsf@kobe.laptop> Sender: rea-fbsd@codelabs.ru Cc: Max Laier , kientzle@freebsd.org, perryh@pluto.rain.com, 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: Mon, 01 Dec 2008 19:56:06 -0000 --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 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--