Differences between revisions 2 and 9 (spanning 7 versions)

I don't git it, but now you will

Debian patching workflow for new upstream versions

git checkout -b merge/$upstream_version upstream
Merge each updated patch branch
- git merge --no-ff debian/patches/xxxx
Discard each obsolete patch branch
- git merge --no-commit -s ours debian/patches/xxxx
- git commit -m "Discard branch 'debian/patches/xxx' from merge/$upstream_version"
git merge -s recursive -X ours master
git checkout master
git merge merge/$upstream_version

git checkout master
git merge -s recursive -X theirs upstream
git merge -s recursive -X theirs debian/patches/xxxx
- Repeat for all patch branches

git diff upstream/2.10.1 upstream/2.10.3 | filterdiff -i '*.c' -i '*.h' -i '*.cs' --clean | diffstat

-  ⇤ ← Revision 2 as of 2010-05-25 10:35:18 → 
  Size: 812
  Editor: meebey
  Comment:
+   ← Revision 9 as of 2011-08-07 15:58:11 → ⇥
  Size: 1167
  Editor: meebey
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 11:
-=== Merge new upstream + updated patches + master (debian) ===
+=== Merge new upstream + updated patches + dropped patches + master (debian) ===
 Line 13:
- * {{{git merge debian/patches/xxxx}}}
  * Repeat for all patch branches
+ * Merge each updated patch branch
  * {{{git merge --no-ff debian/patches/xxxx}}}
 * Discard each obsolete patch branch
  * {{{git merge --no-commit -s ours debian/patches/xxxx}}}
  * {{{git commit -m "Discard branch 'debian/patches/xxx' from merge/$upstream_version"}}}
-Line 22:
+Line 25:
- * {{{git merge -s recursive -X debian/patches/xxxx}}}
+ * {{{git merge -s recursive -X theirs debian/patches/xxxx}}}
-Line 24:
+Line 27:
+=== diffstat ===
{{{git diff upstream/2.10.1 upstream/2.10.3 | filterdiff -i '*.c' -i '*.h' -i '*.cs' --clean | diffstat}}}