Editing Mer/Build/UsingGitorious
Warning: You are not logged in.
Your IP address will be recorded in this page's edit history.
The edit can be undone.
Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 1: | Line 1: | ||
- | |||
- | |||
== Packaging == | == Packaging == | ||
- | Note | + | Note the detailed instructions on this page assume a '''very''' up-to-date git : ~1.6.3.x; even 1.6.0.4 is too old and [[#Older Git Versions|will need tweaks]]. |
===Initial Setup=== | ===Initial Setup=== | ||
Line 66: | Line 64: | ||
mkdir gitify | mkdir gitify | ||
cd gitify | cd gitify | ||
- | |||
tar xf ../$TARBALL | tar xf ../$TARBALL | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
mv * ../$PKG | mv * ../$PKG | ||
cd .. | cd .. | ||
Line 205: | Line 196: | ||
Get the master branch | Get the master branch | ||
- | git checkout --track origin/ | + | git checkout --track origin/master |
or | or | ||
git checkout master | git checkout master | ||
Line 242: | Line 233: | ||
git clone git@gitorious.org:mer/$GPKG.git | git clone git@gitorious.org:mer/$GPKG.git | ||
cd $GPKG | cd $GPKG | ||
- | git checkout --track origin/ | + | git checkout --track origin/upstream |
mv .git ../git-safe | mv .git ../git-safe | ||
cd .. | cd .. | ||
Line 271: | Line 262: | ||
Now to merge it into the branches | Now to merge it into the branches | ||
for each mer/* branch | for each mer/* branch | ||
- | git checkout --track origin/ | + | git checkout --track origin/mer/buttonwidth |
git merge upstream | git merge upstream | ||
- | git checkout --track origin/ | + | git checkout --track origin/mer/him-arabic |
git merge upstream | git merge upstream | ||
This fails: | This fails: | ||
Line 349: | Line 340: | ||
Carry on: | Carry on: | ||
- | git checkout --track origin/ | + | git checkout --track origin/mer/keyboard-available |
git merge upstream | git merge upstream | ||
Line 374: | Line 365: | ||
Finally: | Finally: | ||
- | git checkout --track origin/ | + | git checkout --track origin/mer/werror |
Once again we see that the old branch simply wanted to remove -Werror so edit and | Once again we see that the old branch simply wanted to remove -Werror so edit and | ||
git add configure.ac | git add configure.ac | ||
Line 389: | Line 380: | ||
Once the conflicting branches are consolidated, they can be merged; | Once the conflicting branches are consolidated, they can be merged; | ||
- | git checkout --track origin/ | + | git checkout --track origin/master |
git merge local | git merge local | ||
=====HIM-Merge-Branches===== | =====HIM-Merge-Branches===== | ||
If there were no mer/branches then you would : | If there were no mer/branches then you would : | ||
- | git checkout --track origin/ | + | git checkout --track origin/master |
git merge upstream | git merge upstream | ||
Line 444: | Line 435: | ||
git clone git@gitorious.org:~lbt/mer/glib2_0-mer.git | git clone git@gitorious.org:~lbt/mer/glib2_0-mer.git | ||
cd glib2_0-mer/ | cd glib2_0-mer/ | ||
- | git checkout --track origin/ | + | git checkout --track origin/upstream |
git rm -r * | git rm -r * | ||
Line 495: | Line 486: | ||
Now to create a Mer glib from a master | Now to create a Mer glib from a master | ||
- | git checkout --track origin/ | + | git checkout --track origin/master |
Upgrade entire glib | Upgrade entire glib | ||
Line 522: | Line 513: | ||
And a new Mer release | And a new Mer release | ||
- | git checkout --track origin/ | + | git checkout --track origin/Mer |
git merge master | git merge master | ||
editor debian/changelog | editor debian/changelog | ||
Line 552: | Line 543: | ||
git remote rename origin Upstream | git remote rename origin Upstream | ||
- | git branch --track upstream Upstream/ | + | git branch --track upstream Upstream/master |
Then create a local master (it may be necessary to remove the debian/ directory) | Then create a local master (it may be necessary to remove the debian/ directory) | ||
Line 613: | Line 604: | ||
Essentially | Essentially | ||
git clone git@gitorious.org:mer/$GPKG.git | git clone git@gitorious.org:mer/$GPKG.git | ||
- | git checkout --track origin/ | + | git checkout --track origin/Mer |
determine which feature or branch needs work. Then: | determine which feature or branch needs work. Then: | ||
- | git checkout --track origin/ | + | git checkout --track origin/mer/<feature> |
hack... | hack... | ||
Line 636: | Line 627: | ||
git checkout --track origin/master -b master | git checkout --track origin/master -b master | ||
- | + | [[Category:Mer]] |
Learn more about Contributing to the wiki.