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 == | ||
- | |||
===Initial Setup=== | ===Initial Setup=== | ||
Line 66: | Line 63: | ||
mkdir gitify | mkdir gitify | ||
cd gitify | cd gitify | ||
- | |||
tar xf ../$TARBALL | tar xf ../$TARBALL | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
mv * ../$PKG | mv * ../$PKG | ||
cd .. | cd .. | ||
Line 205: | Line 195: | ||
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 232: | ||
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 |
- | + | git rm -r * | |
- | + | ||
- | + | ||
replace the upstream code | replace the upstream code | ||
- | mkdir | + | mkdir _tmp |
- | cd | + | cd _tmp |
- | tar xf ../$TARBALL | + | tar xf ../../$TARBALL |
- | mv * ../ | + | mv */* ../ |
cd .. | cd .. | ||
- | rm -rf | + | rm -rf _tmp |
- | + | ||
- | + | ||
- | + | ||
git add . | git add . | ||
- | |||
- | |||
- | |||
Now we have a clean upstream release | Now we have a clean upstream release | ||
Line 266: | Line 248: | ||
git tag $UPVER | git tag $UPVER | ||
pristine-tar commit ../$TARBALL | pristine-tar commit ../$TARBALL | ||
- | |||
- | |||
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 329: | ||
Carry on: | Carry on: | ||
- | git checkout --track origin/ | + | git checkout --track origin/mer/keyboard-available |
git merge upstream | git merge upstream | ||
Line 374: | Line 354: | ||
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 388: | Line 368: | ||
git merge mer/werror | git merge mer/werror | ||
- | 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 | ||
- | |||
- | |||
- | |||
- | |||
- | |||
And tagged for release: | And tagged for release: | ||
Line 404: | Line 379: | ||
git checkout Mer | git checkout Mer | ||
git merge master | git merge master | ||
- | |||
- | |||
git add debian/changelog debian/control | git add debian/changelog debian/control | ||
git commit | git commit | ||
Line 444: | Line 417: | ||
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 468: | ||
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 495: | ||
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 525: | ||
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 576: | Line 549: | ||
git fetch Upstream | git fetch Upstream | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
== Working from Gitorious == | == Working from Gitorious == | ||
Line 613: | Line 557: | ||
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 629: | Line 573: | ||
If this works OK then clean up your mer/<feature> branch... probably doing a <code>--squash</code> and push the branch to gitorious. | If this works OK then clean up your mer/<feature> branch... probably doing a <code>--squash</code> and push the branch to gitorious. | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | + | [[Category:Mer]] |
Learn more about Contributing to the wiki.