]> git.michaelhowe.org Git - packages/o/openafs.git/commit
Add README.source and a script to do a Git-aware merge of upstream
authorRuss Allbery <rra@debian.org>
Wed, 6 Jan 2010 01:03:32 +0000 (17:03 -0800)
committerRuss Allbery <rra@debian.org>
Wed, 6 Jan 2010 01:14:05 +0000 (17:14 -0800)
commitb10977fb79b25310c8a17f2f5f43aea8aeeb83b5
tree18428939a2d9b0cd8ebe7c7be9fde9dc1061b1e6
parentf8a0e1a55396e858ccb2d0e28d6dc45432dbc9c8
Add README.source and a script to do a Git-aware merge of upstream

* Add README.source explaining maintenance procedures and a
  debian/import-upstream script to do a Git-aware merge of a new
  upstream release that will allow us to cherry-pick upstream patches
  and do proper merges.

Note that I'm not planning on re-importing the upstream 1.4.11 release
using this new method, so this technique will not be effective in the
master branch until upstream releases 1.4.12.

(cherry picked from commit a12f6de21906ad52211a0dd0d9b923fba204b2fe)
debian/README.source [new file with mode: 0644]
debian/changelog
debian/import-upstream [new file with mode: 0755]