Differences between revisions 1 and 3 (spanning 2 versions)
⇤ ← Revision 1 as of 2010-05-25 10:31:21 →
Size: 592
Editor: meebey
Comment:
← Revision 3 as of 2010-05-25 10:37:42 → ⇥
Size: 819
Editor: meebey
Comment:
Deletions are marked like this. Additions are marked like this.
Line 18: Line 18:

=== 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

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 + master (debian)

  • git checkout -b merge/$upstream_version upstream

  • git merge debian/patches/xxxx

    • Repeat for all patch branches

  • 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