From owner-freebsd-git@FreeBSD.ORG Thu Nov 13 00:48:06 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 94F49FDE; Thu, 13 Nov 2014 00:48:06 +0000 (UTC) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 2489C22C; Thu, 13 Nov 2014 00:48:03 +0000 (UTC) Received: from AlfredMacbookAir.local (c-76-21-10-192.hsd1.ca.comcast.net [76.21.10.192]) by elvis.mu.org (Postfix) with ESMTPSA id 78334341F844; Wed, 12 Nov 2014 16:47:57 -0800 (PST) Message-ID: <5463FFBC.9050609@freebsd.org> Date: Wed, 12 Nov 2014 16:47:56 -0800 From: Alfred Perlstein Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Baptiste Daroussin , Bryan Drewery , git@freebsd.org Subject: Making git-svn first class citizen of FreeBSD's repos. Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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:48:06 -0000 git-svn work nicely with the FreeBSD repositories with two minor exceptions. 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 ... 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. Let me know if you have any questions. -Alfred