fwts master location

Keng-Yü Lin kengyu at canonical.com
Thu Dec 8 04:50:47 UTC 2011


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.
>
> 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 :)
>

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