Differences between revisions 5 and 7 (spanning 2 versions)
⇤ ← Revision 5 as of 2011-01-28 15:18:32 →
Size: 1031
Editor: meebey
Comment:
← Revision 7 as of 2011-08-04 21:05:34 → ⇥
Size: 1031
Editor: meebey
Comment: fixed git merge parameter, it was supposed to be the "ours" merge strategy which makes the other branch history obsolete
Deletions are marked like this. Additions are marked like this.
Line 16: Line 16:
  * {{{git merge --no-commit -x ours debian/patches/xxxx}}}   * {{{git merge --no-commit -s ours 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 -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

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