From owner-freebsd-hackers@FreeBSD.ORG Wed Dec 3 00:15:57 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 7A0B1106564A for ; Wed, 3 Dec 2008 00:15:57 +0000 (UTC) (envelope-from jamesfrancistoy@gmail.com) Received: from mail-gx0-f19.google.com (mail-gx0-f19.google.com [209.85.217.19]) by mx1.freebsd.org (Postfix) with ESMTP id 1AF778FC19 for ; Wed, 3 Dec 2008 00:15:56 +0000 (UTC) (envelope-from jamesfrancistoy@gmail.com) Received: by gxk12 with SMTP id 12so2149421gxk.19 for ; Tue, 02 Dec 2008 16:15:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:sender :to:subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references :x-google-sender-auth; bh=+m7FIvnJ1tcHDUsX1OY3UKB/Z/UqxaAjqaIo8rEXneU=; b=UbhEO+EcJbrg1ybkWs+AwdP03grqIRwLgl3N0yNKzHCuhA0mz5t4H/TDB/weorZO3e MGdNsHAK0Qj/UpTT6uQ+ZF+CQquy8Vhnkq8nzMPEhoJcHGf5RhQXviRjGdoCKTjSMW11 Zhip98USK0AtKXyvgtavVDEcjA/4jTtlWzDx4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references:x-google-sender-auth; b=QjozaHpJW5Fk3j7yLLpkXw5GfrW6nNaNgrReDZHEego5z2tx0DFqe2XnJ4idqueNPo M/uUTpKVEUwxMypyAJzOdSktK2qjOQeGTwm1gb0Ci/uHwXrt6FQZPIoKs5HqrTv7PCNm b4uKMY5ZnEf0AYEIOtDIel43QkL32yG0KsLVE= Received: by 10.151.110.14 with SMTP id n14mr20062028ybm.136.1228263355558; Tue, 02 Dec 2008 16:15:55 -0800 (PST) Received: by 10.151.133.10 with HTTP; Tue, 2 Dec 2008 16:15:55 -0800 (PST) Message-ID: <9f8af95f0812021615s1b06f10bl3a317da64b7263e8@mail.gmail.com> Date: Tue, 2 Dec 2008 19:15:55 -0500 From: jT Sender: jamesfrancistoy@gmail.com To: "Giorgos Keramidas" In-Reply-To: <87ej0q23qt.fsf@kobe.laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline 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> <87ej0q23qt.fsf@kobe.laptop> X-Google-Sender-Auth: b1f844b90edc61ca Cc: freebsd-hackers@freebsd.org, perryh@pluto.rain.com 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: Wed, 03 Dec 2008 00:15:57 -0000 On Tue, Dec 2, 2008 at 6:52 AM, Giorgos Keramidas wrote: > 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. > > 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. > good evening Giorgos and Eygene (and list), So am i to understand that there is no automatic way to use Hg or Git? -- and as Eygene said in order to use them in such a manner special patching will be required? I too am looking to set something else up other than my SVN repository because i personally prefer Hg and Git to SVN. Thank you to all who have contributed to this conversation it has been extremely informative for me and i'm sure several others. I hope everyone is looking forward to the holidays Respectfully, -- /jT http://git.zen-sources.org/?p=kernel/zenmm.git;a=summary