Differences between revisions 3 and 6 (spanning 3 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 debian/patches/xxxx
Discard each obsolete patch branch
- git merge --no-commit -x ours debian/patches/xxxx (the -x might be -X? there's no -x option in the git-merge manpage. - thkoch)
- 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

-  ⇤ ← Revision 3 as of 2010-05-25 10:37:42 → 
  Size: 819
  Editor: meebey
  Comment:
+   ← Revision 6 as of 2011-07-29 12:50:42 → ⇥
  Size: 1109
  Editor: ThomasKoch
  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 debian/patches/xxxx}}}
 * Discard each obsolete patch branch
  * {{{git merge --no-commit -x ours debian/patches/xxxx}}} (the -x might be -X? there's no -x option in the git-merge manpage. - thkoch)
  * {{{git commit -m "Discard branch 'debian/patches/xxx' from merge/$upstream_version"}}}