rebuild of the fricas git svn mirror

18 views
Skip to first unread message

Ralf Hemmecke

unread,
Oct 3, 2019, 1:34:03 AM10/3/19
to fricas-devel
Hello users of https://github.com/fricas/fricas,

I have to make a bad and a good announcement.

Due to a system upgrade my git repository that I used for transferring
the commits from sourceforge to github was deleted. There was no
identical backup.

So I recreated the git repository from scratch with data from the svn
repo at sourceforge. That went well up to some nasty details. I realized
that the previous git-repository was actually corrupt in the meta-data
(the files were the same).

There was one commit that showed different date and time. And at another
place two svn commits appeared as one git commit. So recreating the git
repository fixed these problems, but, of course, leads to different
git-hashes. Since the git-hash of "master" changed anyway, I took the
liberty and renamed my author email address in the repo to
ra...@hemmecke.org in all places.

In total that leave identical hashes up to r413
(03e23911cb2c79507892f15d21982311f442340f).

I know one shouldn't change public branches, but I consider it more
important that https://github.com/fricas/fricas traces the exact history
of the svn repo.

I have still left the old branches and tags in the repository. They
start with "wrong/" and will eventually be removed if nobody complains.

As long as you don't have any personal work in your git repo (local or
at github), the update is quite simple. Anyway, first make a backup of
your "fricas" directory (including the .git directory)!

I assume here that you have pressed the FORK button at github, cloned
YOUR fork to your local computer and added an upstream repository like this:

git remote add upstream https://github.com/fricas/fricas.git

Now, on your local computer issue

git fetch --tags
git push --tags --force

That will update all the tags in your local and your github repository.

Depending on how you track upstream/master, you have to point "master"
or "trunk" to "upstream/master" and then push it to github.

If you are in doubt tell me about your situation an I'll help you with
the transition.

I hope that this will not happen again.

Ralf

Ralf Hemmecke

unread,
Oct 3, 2019, 1:53:49 AM10/3/19
to fricas-devel
Reply all
Reply to author
Forward
0 new messages