Hi,
after a long struggle I managed to import the core and opt
repositories into git while keeping the history and both
branches (2.1,2.2) in the same repo.
The only _working_ method I discovered to achieve that
involves having a common ancestor for 2.1 and 2.2, so
contrarily to our initial considerations I had to keep
a master branch.
Status:
- The git repos are in place and available for developers
- Our rsync/httpup repositories are now synced with the
git repos.
- The new contrib repo is exported in the same way as core
and opt; since it's quite empty at the moment, we're
still serving the old one which is not synced anymore.
- Our subversion repository has been disabled. A svnadmin
dump has been made for emergencies.
To do:
- Enable the update hook for sending mail to crux-commits
and add some code to handle security notifications.
- Fix the timeline. (sip)
- Bug tracker: replace references to svnweb, add substitution
for gitweb.
- There are certainly many small adjustements I can't recall
right now.
The sooner we detect anomalies the better, so please start
hacking on the git repos and report back problems to
the one to blame :-)
Regards,
Simone
--
Simone Rota
Bergamo, Italy - http://www.varlock.com
Hi,
as decided during the last irc meeting today I'll
do the final import of core and opt repositories
into git. A couple of warnings:
- Please do not commit to the svn repo from
now on, it's a lot easier for me to hit
a non-moving target :-)
- I spotted problems with the strategy I intended
to use for the svn->git migration. These prevent us
to fully migrate the 2.1 and 2.2 ports as two
branches in the same git repo.
I'm working on an alternative approach to the problem,
in the worst case we'll have to limit the history
of the git repo to 2.2, while keeping a separate
repository for older ports.
Regards,
Simone
--
Simone Rota
Bergamo, Italy - http://www.varlock.com
Hi,
Mostly by accident, I discovered that "we" are switching SCM once again,
this time to git. As much as I do like git, and especially the effort
our maintainer has put into maintaining it, do I think Havoc Pennington
has a point in his recent blog post[1].
Anyway, I hope the crux-commits list will be retained. Is this the case?
A really nice thing about git is the pull speed - perhaps git:// could
now replace rsync in order to allow local modifications and preserve
them between synchronizations. svn.driver allowed this, but was dog slow
and I/O intensive.
Also, it'd be nice if decisions like these were brought up on the
mailing lists, at least after they've been made.
[1] http://log.ometer.com/2006-10.html#20.2
Hi,
we introduced subdirs in the layout of our git repos on crux.nu,
i.e. crux.nu:/home/crux/scm/ports/core.git.
As usual you can have a look at the available repositories here:
http://crux.nu/gitweb.
Adjusting an already checked out tree shoul be only a matter
of editing .git/remotes/origin.
Sorry for the inconvenience,
Regards,
Simone
--
Simone Rota
Bergamo, Italy - http://www.varlock.com
