[JAUNTY] SRU: V4L/DVB (9999): gspca - zc3xx: Webcam 046d:089d added.

Stefan Bader stefan.bader at canonical.com
Thu Apr 23 15:50:47 UTC 2009


manoj.iyer at canonical.com wrote:
> I was always confused about this, let me repeat so that I understand this 
> corretly.....
> 
> git cherry-pick -s -x -e SHAid
> 
> when the editor pops up I add the 2 lines
> 
> BUG: #LPNNNNN

Bug: #<number>

No LP. And not all capital letters.
> 
> UBUNTU LP:/http://launchpad.net/....../NNNNN

We did not have this before. I started to use

BugLink: http://...

> uncomment Author:

Not sure what this would be for. When I use format-patch there is no need to 
uncomment something. Andy/Tim?

> exit editor
> 
> Is this correct ?
> 
> Cheers
> --- manjo
> 
> On Thu, 23 Apr 2009, Tim Gardner wrote:
> 
>> Manoj,
>>
>> When you cherry-pick from Linus' tree (as this one was), use the '-x'
>> option:
>>
>> git cherry-pick -s -x -e 88a40cfbf25d82758237250a04d9bed51266215c
>>
>> Edit the commit log such that the Launchpad bug number is in the
>> following form (preceded by at least one blank line):
>>
>> Bug: #NNNN
>>
>> This mimics the form of the commit template in
>> debian/commit-templates/patch. That way 'debian/rules insertchanges'
>> will correctly extract the bug number and add it to the changelog (which
>> saves Stefan a fair bit of manual work).
>>
>> rtg
>> -- 
>> Tim Gardner tim.gardner at canonical.com
>>
> 


-- 

When all other means of communication fail, try words!






More information about the kernel-team mailing list