From owner-freebsd-arch@FreeBSD.ORG Tue Jul 3 18:21:21 2012 Return-Path: Delivered-To: arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C745106566C; Tue, 3 Jul 2012 18:21:21 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id 5CB348FC0A; Tue, 3 Jul 2012 18:21:21 +0000 (UTC) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.5/8.14.5) with ESMTP id q63ILJnZ076611; Tue, 3 Jul 2012 11:21:19 -0700 (PDT) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.5/8.14.5/Submit) id q63ILJwM076608; Tue, 3 Jul 2012 11:21:19 -0700 (PDT) (envelope-from obrien) Date: Tue, 3 Jul 2012 11:21:19 -0700 From: "David O'Brien" To: Warner Losh Message-ID: <20120703182118.GA70183@dragon.NUXI.org> Mail-Followup-To: obrien@freebsd.org, Warner Losh , gnn@freebsd.org, pfg@FreeBSD.org, arch@freebsd.org, Doug Barton References: <1340992732.19144.YahooMailClassic@web113501.mail.gq1.yahoo.com> <4FF11659.8060405@FreeBSD.org> <20120702210931.GB85618@dragon.NUXI.org> <86mx3gdhlk.wl%gnn@neville-neil.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="4Ckj6UjgE2iN1+kY" Content-Disposition: inline In-Reply-To: X-Operating-System: FreeBSD 10.0-CURRENT X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? User-Agent: Mutt/1.5.20 (2009-06-14) Cc: gnn@freebsd.org, pfg@freebsd.org, Doug Barton , arch@freebsd.org Subject: Re: svn commit: r237624 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize cddl/contrib/opensolaris/lib/libdtrace/common sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/c... X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@freebsd.org List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jul 2012 18:21:21 -0000 --4Ckj6UjgE2iN1+kY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jul 03, 2012 at 08:55:11AM -0600, Warner Losh wrote: > On Jul 3, 2012, at 8:50 AM, gnn@freebsd.org wrote: > > At Mon, 2 Jul 2012 14:09:31 -0700, David O'Brien wrote: > >> On Sun, Jul 01, 2012 at 08:32:41PM -0700, Doug Barton wrote: > >>> On 06/29/2012 10:58, Pedro Giffuni wrote: > >>>> Now .. David pointed out I am not respecting the code > >>>> provenance since I didn't add them to the opensolaris > >>>> vendor area, but these files are copyrighted Joyent > >>>> Inc (not even Illumos) so I cannot put them there > >>>> unless we create a new vendor for Joyent > >>> > >>> Creating a new vendor area would be the right solution, yes. > >> > >> I totally disagree -- it will cause a real pain merging. ... > > I actually agree with Doug here, but not strongly, I'd prefer to be > > better educated about this topic. Do our Repo Meisters read arch@? > > I agree with Doug as well. I think that transitioning from one vendor > tree to the other is the right thing to do. Unless we have good, > concrete reasons not to do this, I think the default assumption should > be this is a good idea. FYI, When I disagreed with Doug it was for a "new" vendor tree vs. a renamed (moved) one. In other words I disagree with having two vendor trees. > I believe that svn merge -c XXX will work because of how mergenotes > work, but I'd appreciate confirmation from our repo masters. Please see below. I'm almost sure it will not work in what would be likely situation. I expect 'svn merge -c' will likely have svn telling you it cannot find the previous revision. > I think that having the two different sources is a good thing, should > OpenSolaris ever come back to live and be a viable source of imports. > We need to keep that option open, We're never totally shut off from any option. Even if we 'svn delete vendor/opensolaris' and then later want to do an import from Oracle, we (or Repo Meisters) can resurrect it in the manner that is best for that time. But leaving vendor/opensolaris alive now, makes it too easy for someone to import there that isn't aware of the issues. > unless doing so has a real, demonstrable harm. I set up a test repository to show what I am concerned of. I used Figlet (/usr/ports/misc/figlet) as it had a fork when the original author moved on. I then did an import as if the original author returned to his own line of figlet. Roughly: 1. Import figlet 2.2.1 into vendor/figlet 2. Merge 2.2.1 to head/contrib/figlet 3. Import figlet 2.2.2 into vendor/figlet 4. Merge 2.2.2 to head/contrib/figlet 5. Copy vendor/figlet to vendor/figlet-NG [fork] 6. Import figlet 2.2.3 into vendor/figlet-NG 7. Merge 2.2.3 to head/contrib/figlet 8. Import figlet 2.2.4 into vendor/figlet [return of original author] 9. Merge 2.2.4 to head/contrib/figlet This lead to Summary of conflicts: Text conflicts: 6 Tree conflicts: 6 Which is the problem -- what do you do with the tree conflicts? Tree conflicts are quite different from the usual textual conflicts. Please see http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html Note the examples there are more simplistic than our situation. When the 2nd vendor does an new release and it is merged in, you'll get another set of tree conflicts. One thing to keep in mind with SCM's more advanced than CVS is objects are not the same just because their file names are the same. An object has a clear ancestry. Just because I am "David O'Brien", doesn't mean another "David O'Brien" of a different mother is just a newer version of me. One way to deal with this is to use "merge --ignore-ancestry". Please see http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.advanced.ancestry which directly talks to our situation. But, I really don't think we want to use --ignore-ancestry. Per the docs, it disables merge tracking (svn:mergeinfo is not considered when svn merge is determining what revisions to merge, nor is svn:mergeinfo recorded to describe the merge). It turns the 'svn merge' into a more textual 3-way diff + patch. And even if we were OK with this, we would have a very hard time documenting and getting the word out to everyone that should know about it. (i.e., every committer that ever wants to bring in new Solaris-family technologies) The other way is essentially to 'svn delete' the tree conflicts in head/vendor/figlet before doing the merge and let the merge put in files of a totally different ancestry. Then when the same tree conflicts occur again when importing from the other vendor we do the same. So we wind up with a ping-pong of ancestry and one cannot readily read the commit history of these files. Also note the textual conflicts where there should have been zero -- I made no text changes within head/contrib/figlet. I'll attach the set of commands and the 'script out sh -x' run of that so folks can first-hand test this. -- -- David (obrien@FreeBSD.org) --4Ckj6UjgE2iN1+kY Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=two-vendor-treeconflict-cmds mkdir /usr/obj/tmp svnadmin create /usr/obj/tmp/TEST-repo export R='file:///usr/obj/tmp/TEST-repo' svn co $R TEST cd TEST mkdir -p head/contrib vendor/figlet svn add * svn ci -m 'set up basic dirs' tar xf /usr/ports/distfiles/figlet221.tar.gz svn import -m 'Import Figlet version 2.2.1' figlet221 $R/vendor/figlet/dist svn copy -m 'Tag the Figlet 2.2.1 import' $R/vendor/figlet/dist $R/vendor/figlet/2.2.1 svn copy -m 'Copy import to HEAD' $R/vendor/figlet/dist $R/head/contrib/figlet svn up tar xf /usr/ports/distfiles/figlet222.tar.gz svn-vendorimport.sh figlet222 vendor/figlet/dist svn ci -m 'Import Figlet version 2.2.2' vendor/figlet/dist svn copy -m 'Tag the Figlet 2.2.2 import' $R/vendor/figlet/dist $R/vendor/figlet/2.2.2 svn up svn merge ^/vendor/figlet/dist head/contrib/figlet svn ci -m 'Merge Figlet 2.2.2 to HEAD' head ############ NEW VENDOR ################### svn copy -m 'The New Gen folks took over Figlet' $R/vendor/figlet $R/vendor/figlet-NG svn up tar xf /usr/ports/distfiles/figlet-2.2.3.tar.gz svn-vendorimport.sh figlet-2.2.3 vendor/figlet-NG/dist svn ci -m 'Import Figlet NG version 2.2.3' vendor/figlet-NG svn copy -m 'Tag the Figlet NG 2.2.3 import' $R/vendor/figlet-NG/dist $R/vendor/figlet-NG/2.2.2 svn up svn merge ^/vendor/figlet-NG/dist head/contrib/figlet svn ci -m 'Merge Figlet 2.2.3 to HEAD' head svn up ############ BACK TO OLD VENDOR ################### tar xf /usr/ports/distfiles/figlet-2.2.4.tar.gz svn-vendorimport.sh figlet-2.2.4 vendor/figlet/dist svn ci -m 'Import Figlet version 2.2.4 (Author returns!)' vendor/figlet svn copy -m 'Tag the Figlet 2.2.4 (Author returns!) import' $R/vendor/figlet/dist $R/vendor/figlet/2.2.4 svn merge ^/vendor/figlet/dist head/contrib/figlet --4Ckj6UjgE2iN1+kY Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="typescript.two-vendor-treeconflict-cmds" Script started on Tue Jul 3 11:18:55 2012 sh -x /tmp/two-vendor-treeconflict-cmds + mkdir /usr/obj/tmp mkdir: /usr/obj/tmp: File exists + svnadmin create /usr/obj/tmp/TEST-repo + export R=file:///usr/obj/tmp/TEST-repo + svn co file:///usr/obj/tmp/TEST-repo TEST Checked out revision 0. + cd TEST + mkdir -p head/contrib vendor/figlet + svn add head vendor A head A head/contrib A vendor A vendor/figlet + svn ci -m 'set up basic dirs' Adding head Adding head/contrib Adding vendor Adding vendor/figlet Committed revision 1. + tar xf /usr/ports/distfiles/figlet221.tar.gz + svn import -m 'Import Figlet version 2.2.1' figlet221 file:///usr/obj/tmp/TEST-repo/vendor/figlet/dist Adding figlet221/showfigfonts Adding figlet221/Artistic-license.txt Adding figlet221/zipio.h Adding figlet221/getopt.c Adding figlet221/crc.c Adding figlet221/fonts Adding figlet221/fonts/hz.flc Adding figlet221/fonts/slant.flf Adding figlet221/fonts/smslant.flf Adding figlet221/fonts/ushebrew.flc Adding figlet221/fonts/646-fr.flc Adding figlet221/fonts/utf8.flc Adding figlet221/fonts/646-jp.flc Adding figlet221/fonts/shadow.flf Adding figlet221/fonts/jis0201.flc Adding figlet221/fonts/smshadow.flf Adding figlet221/fonts/646-hu.flc Adding figlet221/fonts/646-no.flc Adding figlet221/fonts/block.flf Adding (bin) figlet221/fonts/bubble.flf Adding figlet221/fonts/646-ca.flc Adding figlet221/fonts/646-pt.flc Adding figlet221/fonts/646-gb.flc Adding figlet221/fonts/script.flf Adding figlet221/fonts/moscow.flc Adding figlet221/fonts/smscript.flf Adding (bin) figlet221/fonts/term.flf Adding figlet221/fonts/small.flf Adding figlet221/fonts/frango.flc Adding figlet221/fonts/8859-2.flc Adding figlet221/fonts/646-cn.flc Adding figlet221/fonts/646-irv.flc Adding figlet221/fonts/8859-3.flc Adding figlet221/fonts/8859-4.flc Adding figlet221/fonts/8859-5.flc Adding (bin) figlet221/fonts/digital.flf Adding figlet221/fonts/8859-7.flc Adding figlet221/fonts/lean.flf Adding figlet221/fonts/8859-8.flc Adding figlet221/fonts/646-ca2.flc Adding figlet221/fonts/646-pt2.flc Adding figlet221/fonts/8859-9.flc Adding figlet221/fonts/646-cu.flc Adding figlet221/fonts/646-es.flc Adding figlet221/fonts/646-se.flc Adding figlet221/fonts/uskata.flc Adding figlet221/fonts/646-it.flc Adding figlet221/fonts/646-kr.flc Adding figlet221/fonts/upper.flc Adding figlet221/fonts/koi8r.flc Adding figlet221/fonts/mini.flf Adding figlet221/fonts/ivrit.flf Adding figlet221/fonts/ilhebrew.flc Adding figlet221/fonts/standard.flf Adding figlet221/fonts/big.flf Adding figlet221/fonts/646-de.flc Adding figlet221/fonts/646-es2.flc Adding figlet221/fonts/646-se2.flc Adding figlet221/fonts/mnemonic.flf Adding figlet221/fonts/banner.flf Adding figlet221/fonts/646-yu.flc Adding figlet221/fonts/646-dk.flc Adding figlet221/fonts/646-no2.flc Adding figlet221/figlet.c Adding figlet221/crc.h Adding figlet221/README Adding figlet221/figlist Adding figlet221/inflate.c Adding figlet221/figmagic Adding figlet221/FAQ Adding figlet221/CHANGES Adding figlet221/inflate.h Adding figlet221/figfont.txt Adding figlet221/zipio.c Adding figlet221/Makefile Adding figlet221/chkfont.c Adding figlet221/figlet.6 Committed revision 2. + svn copy -m 'Tag the Figlet 2.2.1 import' file:///usr/obj/tmp/TEST-repo/vendor/figlet/dist file:///usr/obj/tmp/TEST-repo/vendor/figlet/2.2.1 Committed revision 3. + svn copy -m 'Copy import to HEAD' file:///usr/obj/tmp/TEST-repo/vendor/figlet/dist file:///usr/obj/tmp/TEST-repo/head/contrib/figlet Committed revision 4. + svn up Updating '.': A head/contrib/figlet A head/contrib/figlet/zipio.h A head/contrib/figlet/showfigfonts A head/contrib/figlet/Artistic-license.txt A head/contrib/figlet/getopt.c A head/contrib/figlet/crc.c A head/contrib/figlet/fonts A head/contrib/figlet/fonts/hz.flc A head/contrib/figlet/fonts/646-fr.flc A head/contrib/figlet/fonts/slant.flf A head/contrib/figlet/fonts/smslant.flf A head/contrib/figlet/fonts/ushebrew.flc A head/contrib/figlet/fonts/646-jp.flc A head/contrib/figlet/fonts/utf8.flc A head/contrib/figlet/fonts/jis0201.flc A head/contrib/figlet/fonts/shadow.flf A head/contrib/figlet/fonts/smshadow.flf A head/contrib/figlet/fonts/646-hu.flc A head/contrib/figlet/fonts/646-no.flc A head/contrib/figlet/fonts/block.flf A head/contrib/figlet/fonts/bubble.flf A head/contrib/figlet/fonts/646-pt.flc A head/contrib/figlet/fonts/646-ca.flc A head/contrib/figlet/fonts/646-gb.flc A head/contrib/figlet/fonts/smscript.flf A head/contrib/figlet/fonts/script.flf A head/contrib/figlet/fonts/moscow.flc A head/contrib/figlet/fonts/term.flf A head/contrib/figlet/fonts/small.flf A head/contrib/figlet/fonts/frango.flc A head/contrib/figlet/fonts/8859-2.flc A head/contrib/figlet/fonts/646-irv.flc A head/contrib/figlet/fonts/646-cn.flc A head/contrib/figlet/fonts/8859-3.flc A head/contrib/figlet/fonts/8859-4.flc A head/contrib/figlet/fonts/8859-5.flc A head/contrib/figlet/fonts/digital.flf A head/contrib/figlet/fonts/8859-7.flc A head/contrib/figlet/fonts/8859-8.flc A head/contrib/figlet/fonts/646-pt2.flc A head/contrib/figlet/fonts/646-ca2.flc A head/contrib/figlet/fonts/lean.flf A head/contrib/figlet/fonts/8859-9.flc A head/contrib/figlet/fonts/646-se.flc A head/contrib/figlet/fonts/646-cu.flc A head/contrib/figlet/fonts/646-es.flc A head/contrib/figlet/fonts/uskata.flc A head/contrib/figlet/fonts/646-it.flc A head/contrib/figlet/fonts/646-kr.flc A head/contrib/figlet/fonts/upper.flc A head/contrib/figlet/fonts/koi8r.flc A head/contrib/figlet/fonts/mini.flf A head/contrib/figlet/fonts/ivrit.flf A head/contrib/figlet/fonts/ilhebrew.flc A head/contrib/figlet/fonts/standard.flf A head/contrib/figlet/fonts/big.flf A head/contrib/figlet/fonts/646-de.flc A head/contrib/figlet/fonts/646-se2.flc A head/contrib/figlet/fonts/646-es2.flc A head/contrib/figlet/fonts/banner.flf A head/contrib/figlet/fonts/mnemonic.flf A head/contrib/figlet/fonts/646-yu.flc A head/contrib/figlet/fonts/646-no2.flc A head/contrib/figlet/fonts/646-dk.flc A head/contrib/figlet/figlet.c A head/contrib/figlet/README A head/contrib/figlet/crc.h A head/contrib/figlet/figlist A head/contrib/figlet/inflate.c A head/contrib/figlet/figmagic A head/contrib/figlet/FAQ A head/contrib/figlet/inflate.h A head/contrib/figlet/CHANGES A head/contrib/figlet/figfont.txt A head/contrib/figlet/zipio.c A head/contrib/figlet/chkfont.c A head/contrib/figlet/Makefile A head/contrib/figlet/figlet.6 A vendor/figlet/2.2.1 A vendor/figlet/2.2.1/zipio.h A vendor/figlet/2.2.1/showfigfonts A vendor/figlet/2.2.1/Artistic-license.txt A vendor/figlet/2.2.1/getopt.c A vendor/figlet/2.2.1/crc.c A vendor/figlet/2.2.1/fonts A vendor/figlet/2.2.1/fonts/hz.flc A vendor/figlet/2.2.1/fonts/646-fr.flc A vendor/figlet/2.2.1/fonts/slant.flf A vendor/figlet/2.2.1/fonts/smslant.flf A vendor/figlet/2.2.1/fonts/ushebrew.flc A vendor/figlet/2.2.1/fonts/646-jp.flc A vendor/figlet/2.2.1/fonts/utf8.flc A vendor/figlet/2.2.1/fonts/jis0201.flc A vendor/figlet/2.2.1/fonts/shadow.flf A vendor/figlet/2.2.1/fonts/smshadow.flf A vendor/figlet/2.2.1/fonts/646-hu.flc A vendor/figlet/2.2.1/fonts/646-no.flc A vendor/figlet/2.2.1/fonts/block.flf A vendor/figlet/2.2.1/fonts/bubble.flf A vendor/figlet/2.2.1/fonts/646-pt.flc A vendor/figlet/2.2.1/fonts/646-ca.flc A vendor/figlet/2.2.1/fonts/646-gb.flc A vendor/figlet/2.2.1/fonts/moscow.flc A vendor/figlet/2.2.1/fonts/script.flf A vendor/figlet/2.2.1/fonts/smscript.flf A vendor/figlet/2.2.1/fonts/term.flf A vendor/figlet/2.2.1/fonts/small.flf A vendor/figlet/2.2.1/fonts/8859-2.flc A vendor/figlet/2.2.1/fonts/frango.flc A vendor/figlet/2.2.1/fonts/8859-3.flc A vendor/figlet/2.2.1/fonts/646-cn.flc A vendor/figlet/2.2.1/fonts/646-irv.flc A vendor/figlet/2.2.1/fonts/8859-4.flc A vendor/figlet/2.2.1/fonts/8859-5.flc A vendor/figlet/2.2.1/fonts/digital.flf A vendor/figlet/2.2.1/fonts/8859-7.flc A vendor/figlet/2.2.1/fonts/8859-8.flc A vendor/figlet/2.2.1/fonts/646-pt2.flc A vendor/figlet/2.2.1/fonts/646-ca2.flc A vendor/figlet/2.2.1/fonts/lean.flf A vendor/figlet/2.2.1/fonts/8859-9.flc A vendor/figlet/2.2.1/fonts/646-se.flc A vendor/figlet/2.2.1/fonts/646-cu.flc A vendor/figlet/2.2.1/fonts/646-es.flc A vendor/figlet/2.2.1/fonts/uskata.flc A vendor/figlet/2.2.1/fonts/646-it.flc A vendor/figlet/2.2.1/fonts/646-kr.flc A vendor/figlet/2.2.1/fonts/upper.flc A vendor/figlet/2.2.1/fonts/koi8r.flc A vendor/figlet/2.2.1/fonts/mini.flf A vendor/figlet/2.2.1/fonts/ivrit.flf A vendor/figlet/2.2.1/fonts/ilhebrew.flc A vendor/figlet/2.2.1/fonts/standard.flf A vendor/figlet/2.2.1/fonts/big.flf A vendor/figlet/2.2.1/fonts/646-de.flc A vendor/figlet/2.2.1/fonts/646-se2.flc A vendor/figlet/2.2.1/fonts/646-es2.flc A vendor/figlet/2.2.1/fonts/banner.flf A vendor/figlet/2.2.1/fonts/mnemonic.flf A vendor/figlet/2.2.1/fonts/646-yu.flc A vendor/figlet/2.2.1/fonts/646-no2.flc A vendor/figlet/2.2.1/fonts/646-dk.flc A vendor/figlet/2.2.1/figlet.c A vendor/figlet/2.2.1/README A vendor/figlet/2.2.1/crc.h A vendor/figlet/2.2.1/figlist A vendor/figlet/2.2.1/inflate.c A vendor/figlet/2.2.1/figmagic A vendor/figlet/2.2.1/FAQ A vendor/figlet/2.2.1/inflate.h A vendor/figlet/2.2.1/CHANGES A vendor/figlet/2.2.1/figfont.txt A vendor/figlet/2.2.1/zipio.c A vendor/figlet/2.2.1/chkfont.c A vendor/figlet/2.2.1/Makefile A vendor/figlet/2.2.1/figlet.6 A vendor/figlet/dist A vendor/figlet/dist/zipio.h A vendor/figlet/dist/showfigfonts A vendor/figlet/dist/Artistic-license.txt A vendor/figlet/dist/getopt.c A vendor/figlet/dist/crc.c A vendor/figlet/dist/fonts A vendor/figlet/dist/fonts/hz.flc A vendor/figlet/dist/fonts/646-fr.flc A vendor/figlet/dist/fonts/slant.flf A vendor/figlet/dist/fonts/smslant.flf A vendor/figlet/dist/fonts/ushebrew.flc A vendor/figlet/dist/fonts/646-jp.flc A vendor/figlet/dist/fonts/utf8.flc A vendor/figlet/dist/fonts/jis0201.flc A vendor/figlet/dist/fonts/shadow.flf A vendor/figlet/dist/fonts/smshadow.flf A vendor/figlet/dist/fonts/646-hu.flc A vendor/figlet/dist/fonts/646-no.flc A vendor/figlet/dist/fonts/block.flf A vendor/figlet/dist/fonts/bubble.flf A vendor/figlet/dist/fonts/646-pt.flc A vendor/figlet/dist/fonts/646-ca.flc A vendor/figlet/dist/fonts/646-gb.flc A vendor/figlet/dist/fonts/moscow.flc A vendor/figlet/dist/fonts/script.flf A vendor/figlet/dist/fonts/smscript.flf A vendor/figlet/dist/fonts/term.flf A vendor/figlet/dist/fonts/small.flf A vendor/figlet/dist/fonts/8859-2.flc A vendor/figlet/dist/fonts/frango.flc A vendor/figlet/dist/fonts/8859-3.flc A vendor/figlet/dist/fonts/646-cn.flc A vendor/figlet/dist/fonts/646-irv.flc A vendor/figlet/dist/fonts/8859-4.flc A vendor/figlet/dist/fonts/8859-5.flc A vendor/figlet/dist/fonts/digital.flf A vendor/figlet/dist/fonts/8859-7.flc A vendor/figlet/dist/fonts/8859-8.flc A vendor/figlet/dist/fonts/646-pt2.flc A vendor/figlet/dist/fonts/646-ca2.flc A vendor/figlet/dist/fonts/lean.flf A vendor/figlet/dist/fonts/8859-9.flc A vendor/figlet/dist/fonts/646-se.flc A vendor/figlet/dist/fonts/646-cu.flc A vendor/figlet/dist/fonts/646-es.flc A vendor/figlet/dist/fonts/uskata.flc A vendor/figlet/dist/fonts/646-it.flc A vendor/figlet/dist/fonts/646-kr.flc A vendor/figlet/dist/fonts/upper.flc A vendor/figlet/dist/fonts/koi8r.flc A vendor/figlet/dist/fonts/mini.flf A vendor/figlet/dist/fonts/ivrit.flf A vendor/figlet/dist/fonts/ilhebrew.flc A vendor/figlet/dist/fonts/standard.flf A vendor/figlet/dist/fonts/big.flf A vendor/figlet/dist/fonts/646-de.flc A vendor/figlet/dist/fonts/646-se2.flc A vendor/figlet/dist/fonts/646-es2.flc A vendor/figlet/dist/fonts/banner.flf A vendor/figlet/dist/fonts/mnemonic.flf A vendor/figlet/dist/fonts/646-yu.flc A vendor/figlet/dist/fonts/646-no2.flc A vendor/figlet/dist/fonts/646-dk.flc A vendor/figlet/dist/figlet.c A vendor/figlet/dist/README A vendor/figlet/dist/crc.h A vendor/figlet/dist/figlist A vendor/figlet/dist/inflate.c A vendor/figlet/dist/figmagic A vendor/figlet/dist/FAQ A vendor/figlet/dist/inflate.h A vendor/figlet/dist/CHANGES A vendor/figlet/dist/figfont.txt A vendor/figlet/dist/zipio.c A vendor/figlet/dist/chkfont.c A vendor/figlet/dist/Makefile A vendor/figlet/dist/figlet.6 Updated to revision 4. + tar xf /usr/ports/distfiles/figlet222.tar.gz + svn-vendorimport.sh figlet222 vendor/figlet/dist D Artistic-license.txt A LICENSE + svn ci -m 'Import Figlet version 2.2.2' vendor/figlet/dist Deleting vendor/figlet/dist/Artistic-license.txt Sending vendor/figlet/dist/CHANGES Sending vendor/figlet/dist/FAQ Adding vendor/figlet/dist/LICENSE Sending vendor/figlet/dist/Makefile Sending vendor/figlet/dist/README Sending vendor/figlet/dist/figfont.txt Sending vendor/figlet/dist/figlet.6 Sending vendor/figlet/dist/figlet.c Transmitting file data ........ Committed revision 5. + svn copy -m 'Tag the Figlet 2.2.2 import' file:///usr/obj/tmp/TEST-repo/vendor/figlet/dist file:///usr/obj/tmp/TEST-repo/vendor/figlet/2.2.2 Committed revision 6. + svn up Updating '.': A vendor/figlet/2.2.2 A vendor/figlet/2.2.2/zipio.h A vendor/figlet/2.2.2/showfigfonts A vendor/figlet/2.2.2/LICENSE A vendor/figlet/2.2.2/getopt.c A vendor/figlet/2.2.2/crc.c A vendor/figlet/2.2.2/fonts A vendor/figlet/2.2.2/fonts/hz.flc A vendor/figlet/2.2.2/fonts/646-fr.flc A vendor/figlet/2.2.2/fonts/slant.flf A vendor/figlet/2.2.2/fonts/smslant.flf A vendor/figlet/2.2.2/fonts/ushebrew.flc A vendor/figlet/2.2.2/fonts/646-jp.flc A vendor/figlet/2.2.2/fonts/utf8.flc A vendor/figlet/2.2.2/fonts/jis0201.flc A vendor/figlet/2.2.2/fonts/shadow.flf A vendor/figlet/2.2.2/fonts/smshadow.flf A vendor/figlet/2.2.2/fonts/646-hu.flc A vendor/figlet/2.2.2/fonts/646-no.flc A vendor/figlet/2.2.2/fonts/block.flf A vendor/figlet/2.2.2/fonts/bubble.flf A vendor/figlet/2.2.2/fonts/646-pt.flc A vendor/figlet/2.2.2/fonts/646-ca.flc A vendor/figlet/2.2.2/fonts/646-gb.flc A vendor/figlet/2.2.2/fonts/smscript.flf A vendor/figlet/2.2.2/fonts/script.flf A vendor/figlet/2.2.2/fonts/moscow.flc A vendor/figlet/2.2.2/fonts/term.flf A vendor/figlet/2.2.2/fonts/small.flf A vendor/figlet/2.2.2/fonts/frango.flc A vendor/figlet/2.2.2/fonts/8859-2.flc A vendor/figlet/2.2.2/fonts/646-irv.flc A vendor/figlet/2.2.2/fonts/646-cn.flc A vendor/figlet/2.2.2/fonts/8859-3.flc A vendor/figlet/2.2.2/fonts/8859-4.flc A vendor/figlet/2.2.2/fonts/8859-5.flc A vendor/figlet/2.2.2/fonts/digital.flf A vendor/figlet/2.2.2/fonts/8859-7.flc A vendor/figlet/2.2.2/fonts/8859-8.flc A vendor/figlet/2.2.2/fonts/646-pt2.flc A vendor/figlet/2.2.2/fonts/646-ca2.flc A vendor/figlet/2.2.2/fonts/lean.flf A vendor/figlet/2.2.2/fonts/8859-9.flc A vendor/figlet/2.2.2/fonts/646-se.flc A vendor/figlet/2.2.2/fonts/646-cu.flc A vendor/figlet/2.2.2/fonts/646-es.flc A vendor/figlet/2.2.2/fonts/uskata.flc A vendor/figlet/2.2.2/fonts/646-it.flc A vendor/figlet/2.2.2/fonts/646-kr.flc A vendor/figlet/2.2.2/fonts/upper.flc A vendor/figlet/2.2.2/fonts/koi8r.flc A vendor/figlet/2.2.2/fonts/mini.flf A vendor/figlet/2.2.2/fonts/ivrit.flf A vendor/figlet/2.2.2/fonts/ilhebrew.flc A vendor/figlet/2.2.2/fonts/standard.flf A vendor/figlet/2.2.2/fonts/big.flf A vendor/figlet/2.2.2/fonts/646-de.flc A vendor/figlet/2.2.2/fonts/646-se2.flc A vendor/figlet/2.2.2/fonts/646-es2.flc A vendor/figlet/2.2.2/fonts/banner.flf A vendor/figlet/2.2.2/fonts/mnemonic.flf A vendor/figlet/2.2.2/fonts/646-yu.flc A vendor/figlet/2.2.2/fonts/646-no2.flc A vendor/figlet/2.2.2/fonts/646-dk.flc A vendor/figlet/2.2.2/figlet.c A vendor/figlet/2.2.2/README A vendor/figlet/2.2.2/crc.h A vendor/figlet/2.2.2/figlist A vendor/figlet/2.2.2/inflate.c A vendor/figlet/2.2.2/figmagic A vendor/figlet/2.2.2/FAQ A vendor/figlet/2.2.2/inflate.h A vendor/figlet/2.2.2/CHANGES A vendor/figlet/2.2.2/figfont.txt A vendor/figlet/2.2.2/zipio.c A vendor/figlet/2.2.2/chkfont.c A vendor/figlet/2.2.2/Makefile A vendor/figlet/2.2.2/figlet.6 Updated to revision 6. + svn merge ^/vendor/figlet/dist head/contrib/figlet --- Merging r4 through r6 into 'head/contrib/figlet': A head/contrib/figlet/LICENSE U head/contrib/figlet/figlet.c U head/contrib/figlet/README U head/contrib/figlet/FAQ U head/contrib/figlet/CHANGES U head/contrib/figlet/figfont.txt U head/contrib/figlet/Makefile U head/contrib/figlet/figlet.6 D head/contrib/figlet/Artistic-license.txt --- Recording mergeinfo for merge of r4 through r6 into 'head/contrib/figlet': U head/contrib/figlet + svn ci -m 'Merge Figlet 2.2.2 to HEAD' head Sending head/contrib/figlet Deleting head/contrib/figlet/Artistic-license.txt Sending head/contrib/figlet/CHANGES Sending head/contrib/figlet/FAQ Adding head/contrib/figlet/LICENSE Sending head/contrib/figlet/Makefile Sending head/contrib/figlet/README Sending head/contrib/figlet/figfont.txt Sending head/contrib/figlet/figlet.6 Sending head/contrib/figlet/figlet.c Transmitting file data ....... Committed revision 7. + svn copy -m 'The New Gen folks took over Figlet' file:///usr/obj/tmp/TEST-repo/vendor/figlet file:///usr/obj/tmp/TEST-repo/vendor/figlet-NG Committed revision 8. + svn up Updating '.': A vendor/figlet-NG A vendor/figlet-NG/2.2.1 A vendor/figlet-NG/2.2.1/zipio.h A vendor/figlet-NG/2.2.1/showfigfonts A vendor/figlet-NG/2.2.1/Artistic-license.txt A vendor/figlet-NG/2.2.1/getopt.c A vendor/figlet-NG/2.2.1/crc.c A vendor/figlet-NG/2.2.1/fonts A vendor/figlet-NG/2.2.1/fonts/hz.flc A vendor/figlet-NG/2.2.1/fonts/646-fr.flc A vendor/figlet-NG/2.2.1/fonts/slant.flf A vendor/figlet-NG/2.2.1/fonts/smslant.flf A vendor/figlet-NG/2.2.1/fonts/ushebrew.flc A vendor/figlet-NG/2.2.1/fonts/646-jp.flc A vendor/figlet-NG/2.2.1/fonts/utf8.flc A vendor/figlet-NG/2.2.1/fonts/jis0201.flc A vendor/figlet-NG/2.2.1/fonts/shadow.flf A vendor/figlet-NG/2.2.1/fonts/smshadow.flf A vendor/figlet-NG/2.2.1/fonts/646-hu.flc A vendor/figlet-NG/2.2.1/fonts/646-no.flc A vendor/figlet-NG/2.2.1/fonts/block.flf A vendor/figlet-NG/2.2.1/fonts/bubble.flf A vendor/figlet-NG/2.2.1/fonts/646-pt.flc A vendor/figlet-NG/2.2.1/fonts/646-ca.flc A vendor/figlet-NG/2.2.1/fonts/646-gb.flc A vendor/figlet-NG/2.2.1/fonts/smscript.flf A vendor/figlet-NG/2.2.1/fonts/script.flf A vendor/figlet-NG/2.2.1/fonts/moscow.flc A vendor/figlet-NG/2.2.1/fonts/term.flf A vendor/figlet-NG/2.2.1/fonts/small.flf A vendor/figlet-NG/2.2.1/fonts/frango.flc A vendor/figlet-NG/2.2.1/fonts/8859-2.flc A vendor/figlet-NG/2.2.1/fonts/646-irv.flc A vendor/figlet-NG/2.2.1/fonts/646-cn.flc A vendor/figlet-NG/2.2.1/fonts/8859-3.flc A vendor/figlet-NG/2.2.1/fonts/8859-4.flc A vendor/figlet-NG/2.2.1/fonts/8859-5.flc A vendor/figlet-NG/2.2.1/fonts/digital.flf A vendor/figlet-NG/2.2.1/fonts/8859-7.flc A vendor/figlet-NG/2.2.1/fonts/8859-8.flc A vendor/figlet-NG/2.2.1/fonts/646-pt2.flc A vendor/figlet-NG/2.2.1/fonts/646-ca2.flc A vendor/figlet-NG/2.2.1/fonts/lean.flf A vendor/figlet-NG/2.2.1/fonts/8859-9.flc A vendor/figlet-NG/2.2.1/fonts/646-se.flc A vendor/figlet-NG/2.2.1/fonts/646-cu.flc A vendor/figlet-NG/2.2.1/fonts/646-es.flc A vendor/figlet-NG/2.2.1/fonts/uskata.flc A vendor/figlet-NG/2.2.1/fonts/646-it.flc A vendor/figlet-NG/2.2.1/fonts/646-kr.flc A vendor/figlet-NG/2.2.1/fonts/upper.flc A vendor/figlet-NG/2.2.1/fonts/koi8r.flc A vendor/figlet-NG/2.2.1/fonts/mini.flf A vendor/figlet-NG/2.2.1/fonts/ivrit.flf A vendor/figlet-NG/2.2.1/fonts/ilhebrew.flc A vendor/figlet-NG/2.2.1/fonts/standard.flf A vendor/figlet-NG/2.2.1/fonts/big.flf A vendor/figlet-NG/2.2.1/fonts/646-de.flc A vendor/figlet-NG/2.2.1/fonts/646-se2.flc A vendor/figlet-NG/2.2.1/fonts/646-es2.flc A vendor/figlet-NG/2.2.1/fonts/banner.flf A vendor/figlet-NG/2.2.1/fonts/mnemonic.flf A vendor/figlet-NG/2.2.1/fonts/646-yu.flc A vendor/figlet-NG/2.2.1/fonts/646-no2.flc A vendor/figlet-NG/2.2.1/fonts/646-dk.flc A vendor/figlet-NG/2.2.1/figlet.c A vendor/figlet-NG/2.2.1/README A vendor/figlet-NG/2.2.1/crc.h A vendor/figlet-NG/2.2.1/figlist A vendor/figlet-NG/2.2.1/inflate.c A vendor/figlet-NG/2.2.1/figmagic A vendor/figlet-NG/2.2.1/FAQ A vendor/figlet-NG/2.2.1/inflate.h A vendor/figlet-NG/2.2.1/CHANGES A vendor/figlet-NG/2.2.1/figfont.txt A vendor/figlet-NG/2.2.1/zipio.c A vendor/figlet-NG/2.2.1/chkfont.c A vendor/figlet-NG/2.2.1/Makefile A vendor/figlet-NG/2.2.1/figlet.6 A vendor/figlet-NG/2.2.2 A vendor/figlet-NG/2.2.2/zipio.h A vendor/figlet-NG/2.2.2/showfigfonts A vendor/figlet-NG/2.2.2/LICENSE A vendor/figlet-NG/2.2.2/getopt.c A vendor/figlet-NG/2.2.2/crc.c A vendor/figlet-NG/2.2.2/fonts A vendor/figlet-NG/2.2.2/fonts/hz.flc A vendor/figlet-NG/2.2.2/fonts/646-fr.flc A vendor/figlet-NG/2.2.2/fonts/slant.flf A vendor/figlet-NG/2.2.2/fonts/smslant.flf A vendor/figlet-NG/2.2.2/fonts/ushebrew.flc A vendor/figlet-NG/2.2.2/fonts/646-jp.flc A vendor/figlet-NG/2.2.2/fonts/utf8.flc A vendor/figlet-NG/2.2.2/fonts/jis0201.flc A vendor/figlet-NG/2.2.2/fonts/shadow.flf A vendor/figlet-NG/2.2.2/fonts/smshadow.flf A vendor/figlet-NG/2.2.2/fonts/646-hu.flc A vendor/figlet-NG/2.2.2/fonts/646-no.flc A vendor/figlet-NG/2.2.2/fonts/block.flf A vendor/figlet-NG/2.2.2/fonts/bubble.flf A vendor/figlet-NG/2.2.2/fonts/646-pt.flc A vendor/figlet-NG/2.2.2/fonts/646-ca.flc A vendor/figlet-NG/2.2.2/fonts/646-gb.flc A vendor/figlet-NG/2.2.2/fonts/moscow.flc A vendor/figlet-NG/2.2.2/fonts/script.flf A vendor/figlet-NG/2.2.2/fonts/smscript.flf A vendor/figlet-NG/2.2.2/fonts/term.flf A vendor/figlet-NG/2.2.2/fonts/small.flf A vendor/figlet-NG/2.2.2/fonts/8859-2.flc A vendor/figlet-NG/2.2.2/fonts/frango.flc A vendor/figlet-NG/2.2.2/fonts/8859-3.flc A vendor/figlet-NG/2.2.2/fonts/646-cn.flc A vendor/figlet-NG/2.2.2/fonts/646-irv.flc A vendor/figlet-NG/2.2.2/fonts/8859-4.flc A vendor/figlet-NG/2.2.2/fonts/8859-5.flc A vendor/figlet-NG/2.2.2/fonts/digital.flf A vendor/figlet-NG/2.2.2/fonts/8859-7.flc A vendor/figlet-NG/2.2.2/fonts/8859-8.flc A vendor/figlet-NG/2.2.2/fonts/646-pt2.flc A vendor/figlet-NG/2.2.2/fonts/646-ca2.flc A vendor/figlet-NG/2.2.2/fonts/lean.flf A vendor/figlet-NG/2.2.2/fonts/8859-9.flc A vendor/figlet-NG/2.2.2/fonts/646-se.flc A vendor/figlet-NG/2.2.2/fonts/646-cu.flc A vendor/figlet-NG/2.2.2/fonts/646-es.flc A vendor/figlet-NG/2.2.2/fonts/uskata.flc A vendor/figlet-NG/2.2.2/fonts/646-it.flc A vendor/figlet-NG/2.2.2/fonts/646-kr.flc A vendor/figlet-NG/2.2.2/fonts/upper.flc A vendor/figlet-NG/2.2.2/fonts/koi8r.flc A vendor/figlet-NG/2.2.2/fonts/mini.flf A vendor/figlet-NG/2.2.2/fonts/ivrit.flf A vendor/figlet-NG/2.2.2/fonts/ilhebrew.flc A vendor/figlet-NG/2.2.2/fonts/standard.flf A vendor/figlet-NG/2.2.2/fonts/big.flf A vendor/figlet-NG/2.2.2/fonts/646-de.flc A vendor/figlet-NG/2.2.2/fonts/646-se2.flc A vendor/figlet-NG/2.2.2/fonts/646-es2.flc A vendor/figlet-NG/2.2.2/fonts/banner.flf A vendor/figlet-NG/2.2.2/fonts/mnemonic.flf A vendor/figlet-NG/2.2.2/fonts/646-yu.flc A vendor/figlet-NG/2.2.2/fonts/646-no2.flc A vendor/figlet-NG/2.2.2/fonts/646-dk.flc A vendor/figlet-NG/2.2.2/figlet.c A vendor/figlet-NG/2.2.2/README A vendor/figlet-NG/2.2.2/crc.h A vendor/figlet-NG/2.2.2/figlist A vendor/figlet-NG/2.2.2/inflate.c A vendor/figlet-NG/2.2.2/figmagic A vendor/figlet-NG/2.2.2/FAQ A vendor/figlet-NG/2.2.2/inflate.h A vendor/figlet-NG/2.2.2/CHANGES A vendor/figlet-NG/2.2.2/figfont.txt A vendor/figlet-NG/2.2.2/zipio.c A vendor/figlet-NG/2.2.2/chkfont.c A vendor/figlet-NG/2.2.2/Makefile A vendor/figlet-NG/2.2.2/figlet.6 A vendor/figlet-NG/dist A vendor/figlet-NG/dist/zipio.h A vendor/figlet-NG/dist/showfigfonts A vendor/figlet-NG/dist/LICENSE A vendor/figlet-NG/dist/getopt.c A vendor/figlet-NG/dist/crc.c A vendor/figlet-NG/dist/fonts A vendor/figlet-NG/dist/fonts/hz.flc A vendor/figlet-NG/dist/fonts/646-fr.flc A vendor/figlet-NG/dist/fonts/slant.flf A vendor/figlet-NG/dist/fonts/smslant.flf A vendor/figlet-NG/dist/fonts/ushebrew.flc A vendor/figlet-NG/dist/fonts/646-jp.flc A vendor/figlet-NG/dist/fonts/utf8.flc A vendor/figlet-NG/dist/fonts/jis0201.flc A vendor/figlet-NG/dist/fonts/shadow.flf A vendor/figlet-NG/dist/fonts/smshadow.flf A vendor/figlet-NG/dist/fonts/646-hu.flc A vendor/figlet-NG/dist/fonts/646-no.flc A vendor/figlet-NG/dist/fonts/block.flf A vendor/figlet-NG/dist/fonts/bubble.flf A vendor/figlet-NG/dist/fonts/646-pt.flc A vendor/figlet-NG/dist/fonts/646-ca.flc A vendor/figlet-NG/dist/fonts/646-gb.flc A vendor/figlet-NG/dist/fonts/moscow.flc A vendor/figlet-NG/dist/fonts/script.flf A vendor/figlet-NG/dist/fonts/smscript.flf A vendor/figlet-NG/dist/fonts/term.flf A vendor/figlet-NG/dist/fonts/small.flf A vendor/figlet-NG/dist/fonts/8859-2.flc A vendor/figlet-NG/dist/fonts/frango.flc A vendor/figlet-NG/dist/fonts/8859-3.flc A vendor/figlet-NG/dist/fonts/646-cn.flc A vendor/figlet-NG/dist/fonts/646-irv.flc A vendor/figlet-NG/dist/fonts/8859-4.flc A vendor/figlet-NG/dist/fonts/8859-5.flc A vendor/figlet-NG/dist/fonts/digital.flf A vendor/figlet-NG/dist/fonts/8859-7.flc A vendor/figlet-NG/dist/fonts/8859-8.flc A vendor/figlet-NG/dist/fonts/646-pt2.flc A vendor/figlet-NG/dist/fonts/646-ca2.flc A vendor/figlet-NG/dist/fonts/lean.flf A vendor/figlet-NG/dist/fonts/8859-9.flc A vendor/figlet-NG/dist/fonts/646-se.flc A vendor/figlet-NG/dist/fonts/646-cu.flc A vendor/figlet-NG/dist/fonts/646-es.flc A vendor/figlet-NG/dist/fonts/uskata.flc A vendor/figlet-NG/dist/fonts/646-it.flc A vendor/figlet-NG/dist/fonts/646-kr.flc A vendor/figlet-NG/dist/fonts/upper.flc A vendor/figlet-NG/dist/fonts/koi8r.flc A vendor/figlet-NG/dist/fonts/mini.flf A vendor/figlet-NG/dist/fonts/ivrit.flf A vendor/figlet-NG/dist/fonts/ilhebrew.flc A vendor/figlet-NG/dist/fonts/standard.flf A vendor/figlet-NG/dist/fonts/big.flf A vendor/figlet-NG/dist/fonts/646-de.flc A vendor/figlet-NG/dist/fonts/646-se2.flc A vendor/figlet-NG/dist/fonts/646-es2.flc A vendor/figlet-NG/dist/fonts/banner.flf A vendor/figlet-NG/dist/fonts/mnemonic.flf A vendor/figlet-NG/dist/fonts/646-yu.flc A vendor/figlet-NG/dist/fonts/646-no2.flc A vendor/figlet-NG/dist/fonts/646-dk.flc A vendor/figlet-NG/dist/figlet.c A vendor/figlet-NG/dist/README A vendor/figlet-NG/dist/crc.h A vendor/figlet-NG/dist/figlist A vendor/figlet-NG/dist/inflate.c A vendor/figlet-NG/dist/figmagic A vendor/figlet-NG/dist/FAQ A vendor/figlet-NG/dist/inflate.h A vendor/figlet-NG/dist/CHANGES A vendor/figlet-NG/dist/figfont.txt A vendor/figlet-NG/dist/zipio.c A vendor/figlet-NG/dist/chkfont.c A vendor/figlet-NG/dist/Makefile A vendor/figlet-NG/dist/figlet.6 Updated to revision 8. + tar xf /usr/ports/distfiles/figlet-2.2.3.tar.gz + svn-vendorimport.sh figlet-2.2.3 vendor/figlet-NG/dist D figmagic D getopt.c A Makefile.tc A chkfont.6 A figlist.6 A showfigfonts.6 + svn ci -m 'Import Figlet NG version 2.2.3' vendor/figlet-NG Sending vendor/figlet-NG/dist/CHANGES Sending vendor/figlet-NG/dist/FAQ Sending vendor/figlet-NG/dist/LICENSE Sending vendor/figlet-NG/dist/Makefile Adding vendor/figlet-NG/dist/Makefile.tc Sending vendor/figlet-NG/dist/README Adding vendor/figlet-NG/dist/chkfont.6 Sending vendor/figlet-NG/dist/chkfont.c Sending vendor/figlet-NG/dist/crc.c Sending vendor/figlet-NG/dist/crc.h Sending vendor/figlet-NG/dist/figlet.6 Sending vendor/figlet-NG/dist/figlet.c Adding vendor/figlet-NG/dist/figlist.6 Deleting vendor/figlet-NG/dist/figmagic Sending vendor/figlet-NG/dist/fonts/jis0201.flc Deleting vendor/figlet-NG/dist/getopt.c Sending vendor/figlet-NG/dist/inflate.c Sending vendor/figlet-NG/dist/inflate.h Adding vendor/figlet-NG/dist/showfigfonts.6 Sending vendor/figlet-NG/dist/zipio.c Sending vendor/figlet-NG/dist/zipio.h Transmitting file data ................... Committed revision 9. + svn copy -m 'Tag the Figlet NG 2.2.3 import' file:///usr/obj/tmp/TEST-repo/vendor/figlet-NG/dist file:///usr/obj/tmp/TEST-repo/vendor/figlet-NG/2.2.2 Committed revision 10. + svn up Updating '.': A vendor/figlet-NG/2.2.2/dist A vendor/figlet-NG/2.2.2/dist/zipio.h A vendor/figlet-NG/2.2.2/dist/showfigfonts A vendor/figlet-NG/2.2.2/dist/LICENSE A vendor/figlet-NG/2.2.2/dist/Makefile.tc A vendor/figlet-NG/2.2.2/dist/showfigfonts.6 A vendor/figlet-NG/2.2.2/dist/crc.c A vendor/figlet-NG/2.2.2/dist/fonts A vendor/figlet-NG/2.2.2/dist/fonts/hz.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-fr.flc A vendor/figlet-NG/2.2.2/dist/fonts/slant.flf A vendor/figlet-NG/2.2.2/dist/fonts/smslant.flf A vendor/figlet-NG/2.2.2/dist/fonts/ushebrew.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-jp.flc A vendor/figlet-NG/2.2.2/dist/fonts/utf8.flc A vendor/figlet-NG/2.2.2/dist/fonts/jis0201.flc A vendor/figlet-NG/2.2.2/dist/fonts/shadow.flf A vendor/figlet-NG/2.2.2/dist/fonts/smshadow.flf A vendor/figlet-NG/2.2.2/dist/fonts/646-hu.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-no.flc A vendor/figlet-NG/2.2.2/dist/fonts/block.flf A vendor/figlet-NG/2.2.2/dist/fonts/bubble.flf A vendor/figlet-NG/2.2.2/dist/fonts/646-pt.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-ca.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-gb.flc A vendor/figlet-NG/2.2.2/dist/fonts/moscow.flc A vendor/figlet-NG/2.2.2/dist/fonts/script.flf A vendor/figlet-NG/2.2.2/dist/fonts/smscript.flf A vendor/figlet-NG/2.2.2/dist/fonts/term.flf A vendor/figlet-NG/2.2.2/dist/fonts/small.flf A vendor/figlet-NG/2.2.2/dist/fonts/8859-2.flc A vendor/figlet-NG/2.2.2/dist/fonts/frango.flc A vendor/figlet-NG/2.2.2/dist/fonts/8859-3.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-cn.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-irv.flc A vendor/figlet-NG/2.2.2/dist/fonts/8859-4.flc A vendor/figlet-NG/2.2.2/dist/fonts/8859-5.flc A vendor/figlet-NG/2.2.2/dist/fonts/digital.flf A vendor/figlet-NG/2.2.2/dist/fonts/8859-7.flc A vendor/figlet-NG/2.2.2/dist/fonts/8859-8.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-pt2.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-ca2.flc A vendor/figlet-NG/2.2.2/dist/fonts/lean.flf A vendor/figlet-NG/2.2.2/dist/fonts/8859-9.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-se.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-cu.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-es.flc A vendor/figlet-NG/2.2.2/dist/fonts/uskata.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-it.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-kr.flc A vendor/figlet-NG/2.2.2/dist/fonts/upper.flc A vendor/figlet-NG/2.2.2/dist/fonts/koi8r.flc A vendor/figlet-NG/2.2.2/dist/fonts/mini.flf A vendor/figlet-NG/2.2.2/dist/fonts/ivrit.flf A vendor/figlet-NG/2.2.2/dist/fonts/ilhebrew.flc A vendor/figlet-NG/2.2.2/dist/fonts/standard.flf A vendor/figlet-NG/2.2.2/dist/fonts/big.flf A vendor/figlet-NG/2.2.2/dist/fonts/646-de.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-se2.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-es2.flc A vendor/figlet-NG/2.2.2/dist/fonts/banner.flf A vendor/figlet-NG/2.2.2/dist/fonts/mnemonic.flf A vendor/figlet-NG/2.2.2/dist/fonts/646-yu.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-no2.flc A vendor/figlet-NG/2.2.2/dist/fonts/646-dk.flc A vendor/figlet-NG/2.2.2/dist/figlet.c A vendor/figlet-NG/2.2.2/dist/README A vendor/figlet-NG/2.2.2/dist/crc.h A vendor/figlet-NG/2.2.2/dist/chkfont.6 A vendor/figlet-NG/2.2.2/dist/figlist A vendor/figlet-NG/2.2.2/dist/inflate.c A vendor/figlet-NG/2.2.2/dist/figlist.6 A vendor/figlet-NG/2.2.2/dist/FAQ A vendor/figlet-NG/2.2.2/dist/CHANGES A vendor/figlet-NG/2.2.2/dist/inflate.h A vendor/figlet-NG/2.2.2/dist/figfont.txt A vendor/figlet-NG/2.2.2/dist/zipio.c A vendor/figlet-NG/2.2.2/dist/chkfont.c A vendor/figlet-NG/2.2.2/dist/Makefile A vendor/figlet-NG/2.2.2/dist/figlet.6 Updated to revision 10. + svn merge ^/vendor/figlet-NG/dist head/contrib/figlet --- Recording mergeinfo for merge of r7 into 'head/contrib/figlet': U head/contrib/figlet --- Merging r8 through r10 into 'head/contrib/figlet': U head/contrib/figlet/zipio.h U head/contrib/figlet/LICENSE A head/contrib/figlet/Makefile.tc A head/contrib/figlet/showfigfonts.6 U head/contrib/figlet/crc.c U head/contrib/figlet/fonts/jis0201.flc D head/contrib/figlet/getopt.c D head/contrib/figlet/figmagic U head/contrib/figlet/figlet.c U head/contrib/figlet/README U head/contrib/figlet/crc.h A head/contrib/figlet/chkfont.6 U head/contrib/figlet/inflate.c A head/contrib/figlet/figlist.6 U head/contrib/figlet/FAQ U head/contrib/figlet/CHANGES U head/contrib/figlet/inflate.h U head/contrib/figlet/zipio.c U head/contrib/figlet/chkfont.c U head/contrib/figlet/Makefile U head/contrib/figlet/figlet.6 --- Recording mergeinfo for merge of r8 through r10 into 'head/contrib/figlet': G head/contrib/figlet + svn ci -m 'Merge Figlet 2.2.3 to HEAD' head Sending head/contrib/figlet Sending head/contrib/figlet/CHANGES Sending head/contrib/figlet/FAQ Sending head/contrib/figlet/LICENSE Sending head/contrib/figlet/Makefile Adding head/contrib/figlet/Makefile.tc Sending head/contrib/figlet/README Adding head/contrib/figlet/chkfont.6 Sending head/contrib/figlet/chkfont.c Sending head/contrib/figlet/crc.c Sending head/contrib/figlet/crc.h Sending head/contrib/figlet/figlet.6 Sending head/contrib/figlet/figlet.c Adding head/contrib/figlet/figlist.6 Deleting head/contrib/figlet/figmagic Sending head/contrib/figlet/fonts/jis0201.flc Deleting head/contrib/figlet/getopt.c Sending head/contrib/figlet/inflate.c Sending head/contrib/figlet/inflate.h Adding head/contrib/figlet/showfigfonts.6 Sending head/contrib/figlet/zipio.c Sending head/contrib/figlet/zipio.h Transmitting file data ............... Committed revision 11. + svn up Updating '.': At revision 11. + tar xf /usr/ports/distfiles/figlet-2.2.4.tar.gz + svn-vendorimport.sh figlet-2.2.4 vendor/figlet/dist D figmagic D getopt.c A Makefile.tc A chkfont.6 A figlist.6 A run-tests.sh A showfigfonts.6 A tests A (bin) tests/emboss.tlf A tests/input.txt A tests/longtext.txt A tests/res001.txt A tests/res002.txt A tests/res003.txt A tests/res004.txt A tests/res005.txt A tests/res006.txt A tests/res007.txt A tests/res008.txt A tests/res009.txt A tests/res010.txt A tests/res011.txt A tests/res012.txt A tests/res013.txt A tests/res014.txt A tests/res015.txt A tests/res016.txt A tests/res017.txt A tests/res018.txt A tests/res019.txt A tests/res020.txt A tests/res021.txt A tests/res022.txt A tests/res023.txt A tests/res024.txt A utf8.c A utf8.h + svn ci -m 'Import Figlet version 2.2.4 (Author returns!)' vendor/figlet Sending vendor/figlet/dist/CHANGES Sending vendor/figlet/dist/FAQ Sending vendor/figlet/dist/LICENSE Sending vendor/figlet/dist/Makefile Adding vendor/figlet/dist/Makefile.tc Sending vendor/figlet/dist/README Adding vendor/figlet/dist/chkfont.6 Sending vendor/figlet/dist/chkfont.c Sending vendor/figlet/dist/crc.c Sending vendor/figlet/dist/crc.h Sending vendor/figlet/dist/figfont.txt Sending vendor/figlet/dist/figlet.6 Sending vendor/figlet/dist/figlet.c Sending vendor/figlet/dist/figlist Adding vendor/figlet/dist/figlist.6 Deleting vendor/figlet/dist/figmagic Sending vendor/figlet/dist/fonts/jis0201.flc Deleting vendor/figlet/dist/getopt.c Sending vendor/figlet/dist/inflate.c Sending vendor/figlet/dist/inflate.h Adding vendor/figlet/dist/run-tests.sh Sending vendor/figlet/dist/showfigfonts Adding vendor/figlet/dist/showfigfonts.6 Adding vendor/figlet/dist/tests Adding (bin) vendor/figlet/dist/tests/emboss.tlf Adding vendor/figlet/dist/tests/input.txt Adding vendor/figlet/dist/tests/longtext.txt Adding vendor/figlet/dist/tests/res001.txt Adding vendor/figlet/dist/tests/res002.txt Adding vendor/figlet/dist/tests/res003.txt Adding vendor/figlet/dist/tests/res004.txt Adding vendor/figlet/dist/tests/res005.txt Adding vendor/figlet/dist/tests/res006.txt Adding vendor/figlet/dist/tests/res007.txt Adding vendor/figlet/dist/tests/res008.txt Adding vendor/figlet/dist/tests/res009.txt Adding vendor/figlet/dist/tests/res010.txt Adding vendor/figlet/dist/tests/res011.txt Adding vendor/figlet/dist/tests/res012.txt Adding vendor/figlet/dist/tests/res013.txt Adding vendor/figlet/dist/tests/res014.txt Adding vendor/figlet/dist/tests/res015.txt Adding vendor/figlet/dist/tests/res016.txt Adding vendor/figlet/dist/tests/res017.txt Adding vendor/figlet/dist/tests/res018.txt Adding vendor/figlet/dist/tests/res019.txt Adding vendor/figlet/dist/tests/res020.txt Adding vendor/figlet/dist/tests/res021.txt Adding vendor/figlet/dist/tests/res022.txt Adding vendor/figlet/dist/tests/res023.txt Adding vendor/figlet/dist/tests/res024.txt Adding vendor/figlet/dist/utf8.c Adding vendor/figlet/dist/utf8.h Sending vendor/figlet/dist/zipio.c Sending vendor/figlet/dist/zipio.h Transmitting file data .................................................... Committed revision 12. + svn copy -m 'Tag the Figlet 2.2.4 (Author returns!) import' file:///usr/obj/tmp/TEST-repo/vendor/figlet/dist file:///usr/obj/tmp/TEST-repo/vendor/figlet/2.2.4 Committed revision 13. + svn merge ^/vendor/figlet/dist head/contrib/figlet --- Merging r8 through r13 into 'head/contrib/figlet': U head/contrib/figlet/showfigfonts C head/contrib/figlet/Makefile.tc C head/contrib/figlet/showfigfonts.6 C head/contrib/figlet/getopt.c C head/contrib/figlet/figmagic C head/contrib/figlet/figlet.c C head/contrib/figlet/README C head/contrib/figlet/chkfont.6 U head/contrib/figlet/figlist A head/contrib/figlet/tests A head/contrib/figlet/tests/longtext.txt A head/contrib/figlet/tests/res001.txt A head/contrib/figlet/tests/res010.txt A head/contrib/figlet/tests/res020.txt A head/contrib/figlet/tests/res002.txt A head/contrib/figlet/tests/res011.txt A head/contrib/figlet/tests/res021.txt A head/contrib/figlet/tests/res003.txt A head/contrib/figlet/tests/res012.txt A head/contrib/figlet/tests/res022.txt A head/contrib/figlet/tests/res004.txt A head/contrib/figlet/tests/res013.txt A head/contrib/figlet/tests/res023.txt A head/contrib/figlet/tests/res014.txt A head/contrib/figlet/tests/res005.txt A head/contrib/figlet/tests/res006.txt A head/contrib/figlet/tests/res015.txt A head/contrib/figlet/tests/res024.txt A head/contrib/figlet/tests/res007.txt A head/contrib/figlet/tests/res016.txt A head/contrib/figlet/tests/res008.txt A head/contrib/figlet/tests/res017.txt A head/contrib/figlet/tests/res009.txt A head/contrib/figlet/tests/res018.txt A head/contrib/figlet/tests/res019.txt A head/contrib/figlet/tests/emboss.tlf A head/contrib/figlet/tests/input.txt C head/contrib/figlet/figlist.6 C head/contrib/figlet/FAQ A head/contrib/figlet/utf8.c C head/contrib/figlet/CHANGES U head/contrib/figlet/figfont.txt A head/contrib/figlet/utf8.h C head/contrib/figlet/Makefile A head/contrib/figlet/run-tests.sh C head/contrib/figlet/figlet.6 --- Recording mergeinfo for merge of r8 through r13 into 'head/contrib/figlet': U head/contrib/figlet Summary of conflicts: Text conflicts: 6 Tree conflicts: 6 Script done on Tue Jul 3 11:19:16 2012 --4Ckj6UjgE2iN1+kY--