Re: [v4l-dvb-maintainer] Moving to git for v4l-dvb

[Michael Krufky <mkrufky@linuxtv.org>]

Guennadi Liakhovetski wrote:
> Sorry for reviving this almost-a-year-old thread, but after my last 
> failure to formst hg-commits correctly, I'd like to have this clarified 
> before causing Mauro extra manual editing of my commits again.
>
> On Thu, 14 Feb 2008, Mauro Carvalho Chehab wrote:
>
> [snip]
>
>   
>> -git trees have two different meta-tags to represent the tree owner _and_ the
>> patch author. A patch can be committed by a maintainer, preserving author's
>> ownership. On Mercurial, there's only one meta-tag. So, each developer needs to
>> manually add a line with:
>> 	From: someone <some@email>
>> To represent the missing authorship. I need some scripts to convert this "From"
>> artificial field into an Author, before generating the -git.
>>     
>
> later
>
> On Tue, 22 Apr 2008, Mauro Carvalho Chehab wrote:
>
>   
>> In general, you ask me to pull a patch series with yours and also third part
>> patches. Please, be sure to add a "From: " line at the patch, since Mercurial
>> has no meta-tag to indicate patch authorship. The only meta tag for someone is
>> "user". We use this meta-tag to help tracking from what tree a changeset were 
>> merged.
>>     
>
> and recently
>
> On Mon, 8 Dec 2008, Mauro Carvalho Chehab wrote:
>
>   
>> On -git, you have two different fields: the committer and the patch author.
>> Since mercurial has just one field, we should take some care, since, depending
>> on the way you import things into mercurial, you may lead to bad author
>> attribution.
>>
>> To avoid this risk, we've added an extra tag on all mercurial commits. Also, my
>> -git import scripts don't automatically merge any patch that comes without the 
>> "from" field. Those patches require manual work to forward. This way, I have a 
>> double check procedure there.
>>     
>
> So, what should a patch header look like to be imported into hg per "hg 
> import" for later push to linuxtv to be pulled by Mauro?
>
> Looks like it should have two "From: " lines - one will be used by hg for 
> the user field and should contain my address, the second "From: " line 
> should contain the actual patch author? All quotes above mention only one 
> "From: ", and this is what a git-format-patch produces, but it looks like 
> this single "From: " is then consumed by hg to form its "user" field, so 
> nothing is left for a subsequent re-export to git.
>
> Thanks
> Guennadi
>
>   

Guennadi,

Please take a look at one of the hg patches within the repository:

http://linuxtv.org/hg/v4l-dvb/raw-rev/3cc7daa31234

This patch is the same type of output that you would get from using "hg export 3cc7daa31234"

Notice the "From:" line -- that line is used to indicate author.

Notice the "User" line (line 2) -- that line is used to indicate committer.

Does that help to clear it up for you?

Regards,

Mike

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list