[PATCH: Take #2] Karmic: Change patch templates to separate sauce and

[Tim Gardner]

Amit Kucheria wrote:
> Currently, all our patches go into SAUCE. The original definition of SAUCE was
> patches that would _not_ get accepted upstream (see the template). This meaning has been lost.
> 
> This change to the templates will force us to think what patches should go
> upstream and what will be rejected.
> 
> Amit Kucheria (1):
>   UBUNTU: [Config] Changes to patch templates to separate upstream and
>     sauce
> 
>  debian/commit-templates/config-updates |   13 +++++++++++++
>  debian/commit-templates/patch          |   28 ----------------------------
>  debian/commit-templates/sauce-patch    |    2 ++
>  debian/commit-templates/update-configs |   10 ----------
>  debian/commit-templates/upstream-patch |   28 ++++++++++++++++++++++++++++
>  5 files changed, 43 insertions(+), 38 deletions(-)
>  create mode 100644 debian/commit-templates/config-updates
>  delete mode 100644 debian/commit-templates/patch
>  delete mode 100644 debian/commit-templates/update-configs
>  create mode 100644 debian/commit-templates/upstream-patch
> 
> 

Applied to Karmic.

I also created an empty branch 'pending-upstream-patches' in which we
can keep the patches that have been submitted upstream. Be careful
though, this branch contains nothing _but_ the patch files (hopefully in
'git am' format). I expect this branch will be routinely rebased
whenever a patch is accepted upstream, and therefore removed from the
pending-upstream-patches branch.

'git rebase -i HEAD~N' is your friend.

How does that sound? We _could_ also just keep a file in the master
branch that tracks the commit IDs of pending upstream patches, but how
much fun would that be? No git skills required.

rtg
-- 
Tim Gardner tim.gardner at canonical.com