summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Seems the new version of git doesn't do --set-upstream the same :sColin Guthrie2013-05-301-2/+2
|
* Add a script to combine imported Mandriva git reposo with Mageia SVN history.Colin Guthrie2013-04-151-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | This script helps to automate a task that is, in a large part, manual. It takes the git-svn repostitory from the Mandrvia import and guides you through the task of adapting it and importing the Mageia SVN history on top. You first have to pick the trunk revision at which you want to reset the history. This should be the point in time when Mageia imported the sources. It will then help you find the correct Mandriva SVN revision to use as your starting point. It will then synthesize a commit to reset the repository at the same state as the Mageia subversion at the chosen revision. This should result in minimal file churn (i.e. it's should be mostly s/Mandriva/Magiea/ and a few other tweaks). In an ideal world it would contain no other fixes but in order to minimise bogus git-blame results it should avoid big 'delete-then-add' commits. Once this is done, the script then synthesises the internal git-svn metadata and tricks git-svn into continuing the import. It will likely break if any branches/tags have the same name in Mageia as existed in Mandriva. Fingers crossed that doesn't happen :)
* Do not perform the user map every time.Nicolas Lécureuil2013-04-151-7/+0
| | | | | Instead we will do this process manually once and then map peoples real names such that things are nicely formatted.
* Initial script to import Mandriva SVN into a git repository.Nicolas Lécureuil2013-04-151-0/+61