Date: Wed, 12 Nov 2014 17:08:38 -0800 From: Alfred Perlstein <alfred@freebsd.org> To: Bryan Drewery <bdrewery@FreeBSD.org>, Baptiste Daroussin <bapt@FreeBSD.org>, git@freebsd.org Subject: Re: Making git-svn first class citizen of FreeBSD's repos. Message-ID: <54640496.90603@freebsd.org> In-Reply-To: <54640157.70500@FreeBSD.org> References: <5463FFBC.9050609@freebsd.org> <54640157.70500@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 11/12/14, 4:54 PM, Bryan Drewery wrote: > On 11/12/2014 6:47 PM, Alfred Perlstein wrote: >> git-svn work nicely with the FreeBSD repositories with two minor >> exceptions. > Thanks for working on this. I'd be happy to be able to use git-svn. > >> Those two minor exceptions may have been fixed today. >> >> The two exceptions: >> 1) When adding new files svn props are a problem. Specifically two issues: >> 1.1) There was no way to add properties to existing files. >> 1.2) Autoprops did not seem to work. >> 2) Removing directories in git-svn would not result in the directories >> being removed on the server. >> >> I have what appears to be solutions to all three of these problems. >> >> 1) Props: >> 1.1) A patch to git-svn is ports is here: >> https://github.com/splbio/git/compare/v2.1.2-git-svn-propset >> With this patch you can now do: >> git svn propset svn:keywords FreeBSD=%H foo.c >> Then "git svn dcommit" will set that for you on commit hook. >> >> 1.2) Autoprops, this is simple: >> Edit ~/.subversion/config >> Add the following lines: >> enable-auto-props = yes >> [auto-props] >> *.c = svn:keywords=FreeBSD=%H > I think we need a 'propdel' as well. Too many times I've gotten into > situations where I needed to cleanup from bad auto-props. Hmm, well maybe soon. > >> ... >> >> 2) Removing directories: >> Set the config var: git config svn.rmdir true >> Now when you remove a directory, git-svn will remove it on the svn >> server as well. >> >> I'd like to update the wiki page and get the at >> (https://github.com/splbio/git/compare/v2.1.2-git-svn-propset) into the >> FreeBSD ports tree, and possibly upstream it to git. >> > Note it's been discussed upstream in *2009*: > http://marc.info/?l=git&m=125259772625008&w=2 Oh, yes, that's where I got the props patch itself. It's been forward ported. I didn't see any follow up on the lists. So I will poke the git people and see what is up. >> Let me know if you have any questions. >> >> -Alfred >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?54640496.90603>