keeping track of local modifications
Giorgos Keramidas
keramida at ceid.upatras.gr
Mon Dec 1 09:21:22 PST 2008
On Mon, 1 Dec 2008 11:23:40 +0300, Eygene Ryabinkin <rea-fbsd at 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 :)
More information about the freebsd-hackers
mailing list