From owner-freebsd-hackers@FreeBSD.ORG Mon Dec 1 17:21:22 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 897EB1065672 for ; Mon, 1 Dec 2008 17:21:22 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.freebsd.org (Postfix) with ESMTP id EE37D8FC25 for ; Mon, 1 Dec 2008 17:21:21 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from kobe.laptop (adsl144-35.kln.forthnet.gr [195.74.243.35]) (authenticated bits=128) by igloo.linux.gr (8.14.3/8.14.3/Debian-5) with ESMTP id mB1HL5Ef013580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 1 Dec 2008 19:21:12 +0200 Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id mB1HL55T049783; Mon, 1 Dec 2008 19:21:05 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id mB1HL3Gm049748; Mon, 1 Dec 2008 19:21:03 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) From: Giorgos Keramidas To: Eygene Ryabinkin References: <4931CB02.9070904@gmail.com> <4932E8CF.9040501@freebsd.org> <49337f04.p8QqvfzTga07ypa6%perryh@pluto.rain.com> <200812010830.17259.max@love2party.net> Date: Mon, 01 Dec 2008 19:21:03 +0200 In-Reply-To: (Eygene Ryabinkin's message of "Mon, 1 Dec 2008 11:23:40 +0300") Message-ID: <874p1nlslc.fsf@kobe.laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-MailScanner-ID: mB1HL5Ef013580 X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-3.825, required 5, autolearn=not spam, ALL_TRUSTED -1.80, AWL 0.57, BAYES_00 -2.60) X-Hellug-MailScanner-From: keramida@ceid.upatras.gr X-Spam-Status: No 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 17:21:22 -0000 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. Conflicts... 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. I like Mercurial myself, but it's some times a pain to refresh patches that touch lines near "$FreeBSD$". > The only issue I do see is about '$FreeBSD$', but plain Subversion > clients shouldn't mess with it. Bingo :)