Hello,
I'm not sure if this is the right list to discuss this, please point me
in the right direction.
I'm doing repository conversions to git so people can use it to
collaborate outside the official tree and share patches more easily.
Anyway, Simon 'corecode' Schubert's excellent fromcvs converter has some
trouble with the OpenBSD CVS repository. These are easy to cleanup and
no valuable history is lost doing these cleanups, please consider them.
Thanks.
1. src/kerberosIV has two conflicting (git-)branches: KTH and KTH/tholo.
A branch-name in git must be a dirname/filename. This is not possible
for KTH and KTH/tholo at the same time, either KTH is the branchname
or it must be a directory so it can contain 'tholo'.
Fix that I'm using:
fgrep -rl "KTH/tholo:1.1.1;" kerberosIV | \
xargs -n1 sed -i.bak -e 's...@kth/tholo:1.1.1;@KTH:1.1.1;@'
find kerberosIV -name \*.bak -delete
`tholo' did both the initial import to KTH and then the import to
KTH/tholo. I think recording the username again is somewhat
redundant.
2. ports had a b0rked commit of sysutils/memtest86+ to the root of the
repository. The resulting symbols freak out fromcvs and/or git. I
think it's easier to simply get rid of all traces of this b0rked
commit and be done with it. I'm using a patch to ports/Makefile,v
(attached) and the following commands:
rm -rf Attic/distinfo,v pkg files patches
patch < openbsd-ports.patch
sed -i.bak -e '/form:1.1.1.1/d' -e '/form_20090209:1.1.1.1/d' \
-e '/sysutils.memtest86/s/sysutils.memtest86.:1.1.1//' \
-e '/ 1\.1\.1\.1;$/s/1.*;/;/' Makefile,v # leading tab
rm -f *.orig *.bak *.rej
I haven't tested any of the other collections. The results can be seen,
cloned and regularly pulled from:
http://git.freebsd.your.org/cgit/
Regards,
Uli
[demime 1.01d removed an attachment of type text/x-diff]
