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 25: | Line 22: | ||
===Upstream Updates=== | ===Upstream Updates=== | ||
[[Image:Mer_workflow_upstream.png]] | [[Image:Mer_workflow_upstream.png]] | ||
- | |||
An upstream update loads the new upstream into the upstream branch and replaces any code there. | An upstream update loads the new upstream into the upstream branch and replaces any code there. | ||
Line 64: | Line 60: | ||
Get the upstream source unpacked | Get the upstream source unpacked | ||
- | mkdir | + | mkdir $PKG |
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
cd $PKG | cd $PKG | ||
+ | mkdir _tmp | ||
+ | cd _tmp | ||
+ | tar xf ../../$TARBALL | ||
+ | mv */* ../ | ||
+ | cd .. | ||
+ | rm -rf _tmp | ||
Cleanse the install | Cleanse the install | ||
Line 175: | Line 165: | ||
on gitorious goto 'Edit Repository' and set default to Mer | on gitorious goto 'Edit Repository' and set default to Mer | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
== Handling new upstream == | == Handling new upstream == | ||
Line 242: | Line 182: | ||
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 198: | ||
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 279: | ||
Carry on: | Carry on: | ||
- | git checkout --track origin/ | + | git checkout --track origin/mer/keyboard-available |
git merge upstream | git merge upstream | ||
Line 374: | Line 304: | ||
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 318: | ||
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 329: | ||
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 367: | ||
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 418: | ||
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 445: | ||
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 541: | Line 464: | ||
Read upwards to progress in time. Note how on the right is the 'upstream' branch tagged at 2.20.1 then you see the Mer patches being applied to master which is then merged into Mer. | Read upwards to progress in time. Note how on the right is the 'upstream' branch tagged at 2.20.1 then you see the Mer patches being applied to master which is then merged into Mer. | ||
(There is slight complexity here since the upstream changed to the *real* upstream). | (There is slight complexity here since the upstream changed to the *real* upstream). | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
== Working from Gitorious == | == Working from Gitorious == | ||
Line 613: | Line 472: | ||
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 488: | ||
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.