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 <[EMAIL PROTECTED]> 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.
Ahm, yes. "sed -e's|$FreeBSD: [^$]* \$|$FreeBSD$|g'" should help
in this case.
Thanks for clarification!
--
Eygene
_ ___ _.--. #
\`.|\..----...-'` `-._.-'_.-'` # Remember that it is hard
/ ' ` , __.--' # to read the on-line manual
)/' _/ \ `-_, / # while single-stepping the kernel.
`-'" `"\_ ,_.-;_.-\_ ', fsc/as #
_.-'_./ {_.' ; / # -- FreeBSD Developers handbook
{_.-``-' {_/ #
pgpO62QVqPGS4.pgp
Description: PGP signature
