Re: Building minimal-image with kernel24

[Philip Balister <philip@balister.org>]

[-- Attachment #1: Type: text/plain, Size: 1632 bytes --]

Cliff Brake wrote:
> On Thu, Dec 11, 2008 at 12:08 AM, Joshua Lamorie <jpl@xiphos.ca> wrote:
>> Gidday there,
>>
>> Sorry for this simple question, but I've been using subversion up to now, and I can't figure out how to use git to checkout/pull/clone the documentation.  I can see the results of ...
>>
>> git-ls-remote  --heads git://git.openembedded.net/openembedded.git refs/heads/org.openembedded.documentation
>>
>> Then, inside the openembedded repository that I cloned with
>>
>> git clone git://git.openemebbeded.net/openembedded.git
>>
>> I can see the other branches with
>>
>> [jpl@megatron openembedded]$ git branch -r
>>
>> However, as suggested in http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#examining-remote-branches, I do a checkout and I get the following.
>>
>> [jpl@megatron openembedded]$ git checkout -b documentation origin/org.openembedded.documentation
>> fatal: Entry 'packages/tinylogin/tinylogin_1.4.bb' not uptodate. Cannot merge.
>>
>> There is an error in that .bb file (I just added a patch to bugzilla) but shouldn't I be able to get this branch without dealing with the uncommited changes to that file?
> 
> You will need to commit your local changes to a temp branch first.
> 
> git checkout -b myfixes org.openembedded.dev
> git add ...
> git commit
> 
> Now that you have no local changes, you can check out the doc

You can also use git stash to save local changes. Then can update your 
working copy and re-apply the changes from the "stash". This avoids the 
need to commit stuff you are not certain about.

Philip


> 
> Cliff
> 

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]