From owner-freebsd-hackers@FreeBSD.ORG Sun Jan 3 22:32:51 2010 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46F6D1065672; Sun, 3 Jan 2010 22:32:51 +0000 (UTC) (envelope-from oberman@es.net) Received: from mailgw.es.net (mail2.es.net [IPv6:2001:400:107:1::2]) by mx1.freebsd.org (Postfix) with ESMTP id 2C9CC8FC25; Sun, 3 Jan 2010 22:32:51 +0000 (UTC) Received: from ptavv.es.net (ptavv.es.net [IPv6:2001:400:910::29]) by mailgw.es.net (8.14.3/8.14.3) with ESMTP id o03MWYLP013999 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 3 Jan 2010 14:32:34 -0800 Received: from ptavv.es.net (localhost [127.0.0.1]) by ptavv.es.net (Tachyon Server) with ESMTP id 8B7C31CC0C; Sun, 3 Jan 2010 14:32:34 -0800 (PST) To: noackjr@alumni.rice.edu In-reply-to: Your message of "Sun, 03 Jan 2010 15:04:30 EST." <6b03c98ec492c38358083cfef0cfd541.squirrel@www.noacks.org> Date: Sun, 03 Jan 2010 14:32:34 -0800 From: "Kevin Oberman" Message-Id: <20100103223234.8B7C31CC0C@ptavv.es.net> X-Proofpoint-Virus-Version: vendor=fsecure engine=1.12.8161:2.4.5, 1.2.40, 4.0.166 definitions=2010-01-03_04:2009-12-31, 2010-01-03, 2010-01-03 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=5.0.0-0908210000 definitions=main-1001030160 X-Mailman-Approved-At: Mon, 04 Jan 2010 01:17:56 +0000 Cc: FreeBSD Hackers , stable@freebsd.org Subject: Re: something fails with svn X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2010 22:32:51 -0000 > Date: Sun, 3 Jan 2010 15:04:30 -0500 > From: "Jonathan Noack" > Sender: owner-freebsd-stable@freebsd.org > > On Tue, December 29, 2009 23:33, jhell wrote: > > On Tue, 29 Dec 2009 17:18, oliver.pntr@ wrote: > >> Hi list! > >> > >> Something fails, when updated the FreeBSD's svn repo to git. Since > >> yesterday I get this warning: > >> $ git svn rebase > >> > >> ... > >> M sys/boot/pc98/kgzldr/crt.s > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/head/sys/cddl/contrib/opensolaris > >> Couldn't find revmap for svn://svn.freebsd.org/base/stable/7/head/sys > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/stable/8/sys > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/user/kmacy/releng_7_2_fcs/sys > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/user/peter/kinfo/sys > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/head/sys/contrib/dev/acpica > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/head/sys/contrib/pf > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/stable/8/sys/contrib/pf > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/user/peter/kinfo/sys/contrib/pf > >> r201153 = 2a0c8903699f2e4ff17312c753e335424eeac5e3 > >> (refs/remotes/git-svn) > >> M sys/powerpc/conf/DEFAULTS > >> M sys/sparc64/conf/DEFAULTS > >> M sys/ia64/conf/DEFAULTS > >> M sys/sun4v/conf/DEFAULTS > >> M sys/pc98/conf/DEFAULTS > >> M sys/i386/conf/DEFAULTS > >> M sys/amd64/conf/DEFAULTS > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/head/sys/cddl/contrib/opensolaris > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/head/sys/contrib/dev/acpica > >> Couldn't find revmap for svn://svn.freebsd.org/base/stable/7/head/sys > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/head/sys/contrib/pf > >> r201164 = c4051399b1b56820b010acba9f5f0e2953f5be70 > >> (refs/remotes/git-svn) > >> M etc/rc.d/named > >> M etc/mtree/BIND.chroot.dist > >> M etc/namedb/named.conf > >> Couldn't find revmap for svn://svn.freebsd.org/base/stable/7/head/etc > >> r201173 = d70d011b0c38f8a35845a3a63e6ba60f2f04774b > >> (refs/remotes/git-svn) > >> M usr.sbin/zic/Theory > >> M lib/libc/stdtime/tzfile.5 > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/vendor/tzcode/dist/libc/stdtime > >> Couldn't find revmap for svn://svn.freebsd.org/base/stable/7/head > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/head/lib/libc > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/vendor/tzcode/dist/libc > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/head/usr.sbin/zic > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/vendor/tzcode/dist > >> Couldn't find revmap for > >> svn://svn.freebsd.org/base/stable/7/vendor/tzcode/dist/zic > >> r201184 = 47c9db23979a71f805ff5f11d0574ae1ed83a581 > >> (refs/remotes/git-svn) > >> ... > >> > >> > >> the git config is: > >> > >> [core] > >> repositoryformatversion = 0 > >> filemode = true > >> bare = false > >> logallrefupdates = true > >> [svn-remote "svn"] > >> url = svn://svn.freebsd.org/base/stable/7 > >> fetch = :refs/remotes/git-svn > >> > >> Is this a user error (my), or it's an mismerge or repo fail git / or > >> freebsd's svn? > > > > SVN never has problems "It's powered by FreeBSD ;)" > > > > Take a look at your git config. The problem lies there and is very > > visible. After you are done fixing that re-read the whole email that you > > posted. > > I'd appreciate an explanation -- sounds like the OP, myself, and at least > one other person haven't figured it out yet. No, the OP has it figured out, so it's just you and a a few others who may have missed the last message in the thread. The problem was a change in the importation of svn into git with the latest update to git on 12/28. It required a modification of the git configuration...otherwise the import failed. I am not git-aware, so I suggest reading the final message from Oliver sent on 1/1 at 18:24 -8. He points out the thread on the git list that explained the work-around: http://lists-archives.org/git/707921-git-svn-memoize-conversion-of-svn-merge-ticket-info-to-git-commit-ranges.html -- R. Kevin Oberman, Network Engineer Energy Sciences Network (ESnet) Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab) E-mail: oberman@es.net Phone: +1 510 486-8634 Key fingerprint:059B 2DDF 031C 9BA3 14A4 EADA 927D EBB3 987B 3751