fwts master location

Colin Ian King colin.king at canonical.com
Thu Dec 8 14:57:14 UTC 2011


On 08/12/11 04:50, Keng-Yü Lin wrote:
> On Thu, Dec 8, 2011 at 8:24 AM, Chris Van Hoof<vanhoof at canonical.com>  wrote:
>> Hey all -- Quick one, and apologies if this is just my misunderstanding
>> of git :)
>>
>> I was working on a few patches over the weekend and initially cloned
>> from Colin's fwts branch[0], to later notice a newer version of fwts was
>> uploaded to Precise and found that the source of this master was  under
>> Keng-yu's branch[1] of fwts.
Yep, I've passed control over to Keng-yu, so my repo is no longer current.
>>
>> I took the easy route, generated patches against my clone of Colin's
>> branch, cloned Keng-yu's, and went about my business ... however  I'm
>> curious as to how I could I could have better dealt with this?  Is it
>> possible to force a local clone to point to a new master on the fly?
>>
> I think it's possible to modify .git/config, replace cking/lexical in
> git://kernel.ubuntu.com/cking/fwts/.git
> But a bit hack-ish.
>
> How about doing like this:
>
> git remote add kengyu git://kernel.ubuntu.com/lexical/fwts.git
> git fetch kengyu
> git checkout --track kengyu/master -b kengyu_master
> git rebase kengyu_master
>
> then resolve the conflict if any.
>
> git branch -m / git remote rename can change the name back to things
> like "origin" or "master"
>
>> Also, would it make sense to have the master branch for fwts and
>> fwts-test under a common user account, perhaps 'hwe' or something
>> similar or am I just confusing myself with a lack of git-foo :)
Well, personally, I don't mind who owns it as long as:

1. Its is visible in the kernel git repo git web
2. It won't change it's location or name again
3. It is kept current
4. It's not considered a HWE only tool - I speak here for QA and kernel 
team considerations :-)
5. I should not be able to push to it, I don't want to by-pass the 
ACK/NACK process.

Colin
> yeah, good plan, just like we have hwe/oem-master.git, see if I have
> the permission to cp the tree there.
>
> -kengyu
>





More information about the fwts-devel mailing list