Differences between revisions 5 and 10 (spanning 5 versions)
⇤ ← Revision 5 as of 2011-01-28 15:18:32 →
Size: 1031
Editor: meebey
Comment:
← Revision 10 as of 2012-07-25 18:19:25 → ⇥
Size: 1188
Editor: ThomasKoch
Comment:
Deletions are marked like this. Additions are marked like this.
Line 14: Line 14:
  * {{{git merge debian/patches/xxxx}}}   * {{{git merge --no-ff debian/patches/xxxx}}}
Line 16: Line 16:
  * {{{git merge --no-commit -x ours debian/patches/xxxx}}}   * {{{git merge --no-commit -s ours debian/patches/xxxx}}}
Line 27: Line 27:

=== diffstat ===
{{{git diff upstream/2.10.1 upstream/2.10.3 | filterdiff -i '*.c' -i '*.h' -i '*.cs' --clean | diffstat}}}

----
CategoryGit

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 --no-ff 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

diffstat

git diff upstream/2.10.1 upstream/2.10.3 | filterdiff -i '*.c' -i '*.h' -i '*.cs' --clean | diffstat

CategoryGit