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

[Amit Kucheria]

On Thu, Apr 16, 2009 at 11:33:12AM -0600, Tim Gardner wrote:
> 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
> 
> 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.

I assume you will go through the current patch list to sort them out into this branch?
 
> 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.

Commit IDs change on a rebase. Editing the text file for SHA ids won't be much fun. Rebasing the pending-upstream-patch branch is a lot easier to do.

/Amit

-- 
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit at canonical.com
----------------------------------------------------------------------