Differences between revisions 2 and 5 (spanning 3 versions)
Revision 2 as of 2010-05-25 10:35:18
Size: 812
Editor: meebey
Comment:
Revision 5 as of 2011-01-28 15:18:32
Size: 1031
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 --no-commit -x 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}}}

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 --no-commit -x 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

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