From owner-freebsd-git@FreeBSD.ORG Thu Nov 13 00:54:52 2014 Return-Path: Delivered-To: git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B00523A for ; Thu, 13 Nov 2014 00:54:52 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CA57324 for ; Thu, 13 Nov 2014 00:54:52 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id sAD0sqVt093483 for ; Thu, 13 Nov 2014 00:54:52 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id sAD0sqKi093482 for git@freebsd.org; Thu, 13 Nov 2014 00:54:52 GMT (envelope-from bdrewery) Received: (qmail 94744 invoked from network); 12 Nov 2014 18:54:47 -0600 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 12 Nov 2014 18:54:47 -0600 Message-ID: <54640157.70500@FreeBSD.org> Date: Wed, 12 Nov 2014 18:54:47 -0600 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Alfred Perlstein , Baptiste Daroussin , git@freebsd.org Subject: Re: Making git-svn first class citizen of FreeBSD's repos. References: <5463FFBC.9050609@freebsd.org> In-Reply-To: <5463FFBC.9050609@freebsd.org> OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="k5gXUnSIapBiogGDBikvSAPk9k37tigxf" X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Nov 2014 00:54:52 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --k5gXUnSIapBiogGDBikvSAPk9k37tigxf Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable 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. >=20 > Those two minor exceptions may have been fixed today. >=20 > The two exceptions: > 1) When adding new files svn props are a problem. Specifically two iss= ues: > 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. >=20 > I have what appears to be solutions to all three of these problems. >=20 > 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=3D%H foo.c > Then "git svn dcommit" will set that for you on commit hook. >=20 > 1.2) Autoprops, this is simple: > Edit ~/.subversion/config > Add the following lines: > enable-auto-props =3D yes > [auto-props] > *.c =3D svn:keywords=3DFreeBSD=3D%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. > ... >=20 > 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. >=20 > 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. >=20 Note it's been discussed upstream in *2009*: http://marc.info/?l=3Dgit&m=3D125259772625008&w=3D2 > Let me know if you have any questions. >=20 > -Alfred --=20 Regards, Bryan Drewery --k5gXUnSIapBiogGDBikvSAPk9k37tigxf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJUZAFXAAoJEDXXcbtuRpfPO5QH/2f56cgPn8cKuKPPPE5xCGYl CkBZChMGwnhPCAL/Pr+Z3WWPaXppi8RhwTcspres9SWICH+O07F1PLlKWEglNwSy KFBk8zbQWpqdkyEz4wrUOdbt7NfvXlJM2NwTM4VuLCm5vOvenuZAbi5OyL0a0r9w AJyDc0RfUhO9xTe4lvRcMj3hFAa6t4qM1k5xZnz06QF7KoUJlotBdM038qXvQZlq p2xtgDG8PZfHmjZ1a5xw9jptQyjpsOUWXK2fe2TYRxE3I0LepYFpV1z46FHBg7F7 0bsps1Fer1Bb2dxCLM/wU7lM861u4BX5gnpl2KI8ij1xbsX40jY+om5SmZ6Jbbg= =o1Pt -----END PGP SIGNATURE----- --k5gXUnSIapBiogGDBikvSAPk9k37tigxf--