Hi,
It was requested that the schema-plugins repository have its back history so I have done some work on it. Essentially it came to this.
- I created a new repository will all the SVN history.
- Then I added a remote from the git repo and cherry-picked all the commits.
- I then renamed schema-plugins repository to schema-plugins-no-history.
- I create a new repository with the name schema-plugins and pushed the new repository (with all history) to the new repository
What does this mean to you? It means that if you have a fork or clone of the old repository they are divergent repositories and you cannot pull from the new one even though the repository has the same name. So you need to refork or reclone.
If you have local changes you can do:
rename local repository
git clone git@anonymised.com.:geonetwork/schema-plugins.git
cd schema-plugins
git remote add old
git fetch old
git log old/master
git cherry-pick
git push origin master
That should do it.
Please check schema-plugins-no-history and the new repository to make sure I didn’t miss any commits. If you look at the log you won’t see the merge commits or the ones where the .svn directories were deleted or the one where the repository was reorganized but I think the others worked. The main one that needs to be double checked is https://github.com/geonetwork/schema-plugins-no-history/commit/5783401cddf7e8f3e57bf00cdc79f6a01bddf2ea because it was created before the reorganization and I applied it to my new repo which has the correct directory organization. But it is possible I missed another commit since I did each one by hand.
Jesse
Hi Jesse,
Thanks for doing this! I've checked the new repo with my local working copy which was missing one of the changes from the commit you highlighted - so it looks like so far the new repo is better than the old. I'll do a few more checks.
Cheers and thanks,
Simon
________________________________________
From: Jesse Eichar [jesse.eichar@anonymised.com]
Sent: Saturday, 7 July 2012 4:40 AM
To: Devel geonetwork-devel@lists.sourceforge.net; ianwallen; Jeroen Ticheler; Pigot, Simon (CMAR, Hobart)
Subject: schema-plugins repository changed
Hi,
It was requested that the schema-plugins repository have its back history so I have done some work on it. Essentially it came to this.
* I created a new repository will all the SVN history.
* Then I added a remote from the git repo and cherry-picked all the commits.
* I then renamed schema-plugins repository to schema-plugins-no-history.
* I create a new repository with the name schema-plugins and pushed the new repository (with all history) to the new repository
What does this mean to you? It means that if you have a fork or clone of the old repository they are divergent repositories and you cannot pull from the new one even though the repository has the same name. So you need to refork or reclone.
If you have local changes you can do:
rename local repository
git clone git@anonymised.com:geonetwork/schema-plugins.git
cd schema-plugins
git remote add old <path to local repository>
git fetch old
git log old/master
git cherry-pick <local commit>
git push origin master
That should do it.
Please check schema-plugins-no-history and the new repository to make sure I didn't miss any commits. If you look at the log you won't see the merge commits or the ones where the .svn directories were deleted or the one where the repository was reorganized but I think the others worked. The main one that needs to be double checked is Update structure in view xslts · geonetwork/schema-plugins-no-history@5783401 · GitHub because it was created before the reorganization and I applied it to my new repo which has the correct directory organization. But it is possible I missed another commit since I did each one by hand.
Jesse