Date: Mon, 01 Dec 2008 19:21:03 +0200 From: Giorgos Keramidas <keramida@ceid.upatras.gr> To: Eygene Ryabinkin <rea-fbsd@codelabs.ru> 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: <874p1nlslc.fsf@kobe.laptop> In-Reply-To: <gFpinjQW6hEatbsT%2BXzE0kSsZf0@kjaK%2B/sQ5DW5981v71UogZJPf/0> (Eygene Ryabinkin's message of "Mon, 1 Dec 2008 11:23:40 %2B0300") 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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. 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 :)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?874p1nlslc.fsf>