From owner-svn-src-svnadmin@FreeBSD.ORG Tue Aug 11 21:18:41 2009 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9F24106564A; Tue, 11 Aug 2009 21:18:41 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C8A008FC42; Tue, 11 Aug 2009 21:18:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7BLIfK9042025; Tue, 11 Aug 2009 21:18:41 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7BLIfqV042023; Tue, 11 Aug 2009 21:18:41 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <200908112118.n7BLIfqV042023@svn.freebsd.org> From: Peter Wemm Date: Tue, 11 Aug 2009 21:18:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196099 - svnadmin/tools X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2009 21:18:42 -0000 Author: peter Date: Tue Aug 11 21:18:41 2009 New Revision: 196099 URL: http://svn.freebsd.org/changeset/base/196099 Log: Checkpoint the hacks that have accumulated over time. Usually this is because of ill-advised things like changing properties (eg: keywords) and deleting the file in the same commit. The deprecated API that the exporter uses can't represent that. Modified: svnadmin/tools/export.py Modified: svnadmin/tools/export.py ============================================================================== --- svnadmin/tools/export.py Tue Aug 11 20:39:10 2009 (r196098) +++ svnadmin/tools/export.py Tue Aug 11 21:18:41 2009 (r196099) @@ -313,7 +313,16 @@ def exportrev(pool, fs_ptr, rev, cvspath failed = do_cvs(workpath, '', "cvs -Rq co %s src" % uptag) assert not failed # at this point, the top directory and /src should exist - #print p, path, k + print p, path, k + # hacks + #if p == 'head/contrib/file/FREEBSD-upgrade' and k == 'A': + # continue + #if p == 'head/contrib/file/magic2mime' and k == 'A': + # continue + #if p == 'head/lib/libc/stdio/asprintf.c' and k == 'D': + # continue + if p == 'head/tools/build/options/WITH_BIND_LIBS' and k == 'A' and rev == 193280: + continue makedirs(workpath, _dirname(path), 'src') # Now the directory for the files must exist, and branch tag will be sticky assert os.path.isdir(os.path.join(workpath, _dirname(path))) @@ -352,6 +361,7 @@ def export(pool, repos_path, cvspath): curr_rev = fs.youngest_rev(fs_ptr) last_rev = int(fs.revision_prop(fs_ptr, 0, 'fbsd:lastexp')) if last_rev < curr_rev: + time.sleep(5) print '%d %s' % (last_rev, curr_rev) rev = '%d' % (last_rev + 1) print '==========> export rev ' + rev