From owner-svn-src-user@FreeBSD.ORG  Mon Jun 24 19:14:09 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B289638A;
 Mon, 24 Jun 2013 19:14:09 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A4FD119C5;
 Mon, 24 Jun 2013 19:14:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5OJE9xC003937;
 Mon, 24 Jun 2013 19:14:09 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5OJE9gh003936;
 Mon, 24 Jun 2013 19:14:09 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201306241914.r5OJE9gh003936@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Mon, 24 Jun 2013 19:14:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r252171 - user/uqs/git_conv
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jun 2013 19:14:09 -0000

Author: uqs
Date: Mon Jun 24 19:14:09 2013
New Revision: 252171
URL: http://svnweb.freebsd.org/changeset/base/252171

Log:
  Fix git conversion after the recent vendor areay shuffle.

Modified:
  user/uqs/git_conv/freebsd-base.rules

Modified: user/uqs/git_conv/freebsd-base.rules
==============================================================================
--- user/uqs/git_conv/freebsd-base.rules	Mon Jun 24 19:12:17 2013	(r252170)
+++ user/uqs/git_conv/freebsd-base.rules	Mon Jun 24 19:14:09 2013	(r252171)
@@ -85,17 +85,18 @@ match /user/simon/test.txt
 end match
 match /user/peter/foo.txt
 end match
+# Not a branch, ignore
+match /user/peterj/.*
+end match
 # Cannot put .git directories into git, makes it unhappy
 match /user/uqs/git_conv
 end match
-match /vendor/atf/(README.txt|FREEBSD-Xlist)
+match /vendor/(atf|v4l)/README.*
 end match
-match /vendor/(bzip2|flex)/FREEBSD-(Xlist|upgrade)
+match /vendor/(apr|apr-util|atf|bzip2|flex|serf|subversion)/FREEBSD-(Xlist|upgrade)
 end match
 match /vendor/libregex/libgnuregex_prep.sh
 end match
-match /vendor/v4l/README
-end match
 
 # fixup trailing dot
 match /vendor/(clang|llvm)/(clang|llvm)-(r73070)\./