Differences between revisions 3 and 4
Revision 3 as of 2010-05-25 10:37:42
Size: 819
Editor: meebey
Comment:
Revision 4 as of 2011-01-28 14:58:11
Size: 927
Editor: meebey
Comment:
Deletions are marked like this. Additions are marked like this.
Line 11: Line 11:
=== Merge new upstream + updated patches + master (debian) === === Merge new upstream + updated patches + dropped patches + master (debian) ===
Line 13: 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 -x ours debian/patch
es/xxxx}}}

I don't git it, but now you will

Debian patching workflow for new upstream versions

Update each patch branch

  • git checkout debian/patches/xxx

  • git merge upstream

  • Resolve possible conflicts
  • Repeat for all patch branches

Merge new upstream + updated patches + dropped patches + master (debian)

  • git checkout -b merge/$upstream_version upstream

  • Merge each updated patch branch
    • git merge debian/patches/xxxx

  • Discard each obsolete patch branch
    • git merge -x ours debian/patches/xxxx

  • git merge -s recursive -X ours master

  • git checkout master

  • git merge merge/$upstream_version

Untested alternative merge workflow

  • git checkout master

  • git merge -s recursive -X theirs upstream

  • git merge -s recursive -X theirs debian/patches/xxxx

    • Repeat for all patch branches