Re: fetching wireless dev
John W. Linville skrev: On Wed, Aug 29, 2007 at 09:54:16PM +0200, Richard Jonsson wrote: [EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git checkout -b everything origin/everything Switched to a new branch everything [EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git branch * everything master [EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git pull Warning: No merge candidate found because value of config option branch.everything.merge does not match any remote branch fetched. No changes. Well, you did just clone the repository -- no new changes since your clone... John Makes sense I guess, but I got this exact message with my cloned tree that was not up to date, including the No changes. part. Anyway, it works now, but the message is still there at the end of the pull command. Thank you for getting me on track. ___ Bcm43xx-dev mailing list Bcm43xx-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
Re: fetching wireless dev
Richard Jonsson [EMAIL PROTECTED] writes: When browsing the tree at kernel.org I see changes from 24'th of august, but my local copy is from 15'th (when I first fetched) even after git fetch. What command am I supposed to use? Use git pull instead. git fetch only fetches new objects, but does not merge them. Andreas. -- Andreas Schwab, SuSE Labs, [EMAIL PROTECTED] SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. ___ Bcm43xx-dev mailing list Bcm43xx-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
Re: fetching wireless dev
Richard Jonsson wrote: I can't figure out how to keep up to date with the wireless dev tree. I've set up as told by John W. Linville in a post here and use the everything branch. When browsing the tree at kernel.org I see changes from 24'th of august, but my local copy is from 15'th (when I first fetched) even after git fetch. What command am I supposed to use? 'git pull' will get any updates. What is the best practice to apply patches not yet in Linvilles tree? My purpose is to test patches from the list and will probably not do patches myself. The best practice is probably in the eye of the user. What I do is to get the patch text into my wireless-dev tree by downloading or by saving the email containing the patch. If you do the latter, be careful about the white space. Too many mailers change tabs into spaces that kills the application of the patch. To apply patches, I use quilt. With it, you can quilt import the file and apply the patch with quilt push. To remove the patch, use the quilt pop command. In case you do want to write your own patches, start with the quilt new command, then modify the source using the quilt edit command, followed by quilt refresh. You can find a description of quilt from 'man quilt' or on-line. Larry ___ Bcm43xx-dev mailing list Bcm43xx-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
Re: fetching wireless dev
On Wed, Aug 29, 2007 at 07:34:58PM +0200, Richard Jonsson wrote: I can't figure out how to keep up to date with the wireless dev tree. I've set up as told by John W. Linville in a post here and use the everything branch. When browsing the tree at kernel.org I see changes from 24'th of august, but my local copy is from 15'th (when I first fetched) even after git fetch. What command am I supposed to use? I think 'git pull' is what you want. But be warned that wireless-dev will be rebased from time to time, and pulling won't work across rebases. What is the best practice to apply patches not yet in Linvilles tree? My purpose is to test patches from the list and will probably not do patches myself. The best practice would be to keep an up-to-date copy of Linus' tree (i.e. linux-2.6) using 'git pull'. Then when you want to experiment w/ wireless-dev, you can create a lightweight clone (my terminology) using a command like this: git clone --reference linux-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git wireless-dev Then create a working branch for yourself: git checkout -b work origin/everything Then you can apply patch emails for testing. Save the patch email in mbox format, then use this command: git applymbox patch.mbox Then, build-test-patch-repeat... :-) Hth! John -- John W. Linville [EMAIL PROTECTED] ___ Bcm43xx-dev mailing list Bcm43xx-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
Re: fetching wireless dev
Larry Finger skrev: Richard Jonsson wrote: I can't figure out how to keep up to date with the wireless dev tree. I've set up as told by John W. Linville in a post here and use the everything branch. When browsing the tree at kernel.org I see changes from 24'th of august, but my local copy is from 15'th (when I first fetched) even after git fetch. What command am I supposed to use? 'git pull' will get any updates. What is the best practice to apply patches not yet in Linvilles tree? My purpose is to test patches from the list and will probably not do patches myself. The best practice is probably in the eye of the user. What I do is to get the patch text into my wireless-dev tree by downloading or by saving the email containing the patch. If you do the latter, be careful about the white space. Too many mailers change tabs into spaces that kills the application of the patch. To apply patches, I use quilt. With it, you can quilt import the file and apply the patch with quilt push. To remove the patch, use the quilt pop command. In case you do want to write your own patches, start with the quilt new command, then modify the source using the quilt edit command, followed by quilt refresh. You can find a description of quilt from 'man quilt' or on-line. Larry Sorry Larry, I realised I sent you a private copy of this message. --- Thank you both, but with git pull I get this instead: $ git pull Warning: No merge candidate found because value of config option branch.everything.merge does not match any remote branch fetched. A google search turned up one relevant result, but it didn't help. ___ Bcm43xx-dev mailing list Bcm43xx-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
Re: fetching wireless dev
Richard Jonsson wrote: --- Thank you both, but with git pull I get this instead: $ git pull Warning: No merge candidate found because value of config option branch.everything.merge does not match any remote branch fetched. A google search turned up one relevant result, but it didn't help Did you do the steps that Linville outlined? I reproduce his notes below: /home/linville/git/wireless-dev [linville-t43.mobile]: git branch * master /home/linville/git/wireless-dev [linville-t43.mobile]: git branch -r origin/HEAD origin/adm8211 origin/b43 origin/everything origin/iwlwifi origin/mac80211 origin/master origin/merged-upstream origin/mm-master origin/p54 origin/rt2x00 origin/ssb origin/zd1211rw /home/linville/git/wireless-dev [linville-t43.mobile]: git checkout -b everything origin/everything Switched to a new branch everything /home/linville/git/wireless-dev [linville-t43.mobile]: git branch * everything master Is this what you see with a 'git branch' command? Larry ___ Bcm43xx-dev mailing list Bcm43xx-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
Re: fetching wireless dev
Larry Finger skrev: Richard Jonsson wrote: --- Thank you both, but with git pull I get this instead: $ git pull Warning: No merge candidate found because value of config option branch.everything.merge does not match any remote branch fetched. A google search turned up one relevant result, but it didn't help Did you do the steps that Linville outlined? I reproduce his notes below: /home/linville/git/wireless-dev [linville-t43.mobile]: git branch * master /home/linville/git/wireless-dev [linville-t43.mobile]: git branch -r origin/HEAD origin/adm8211 origin/b43 origin/everything origin/iwlwifi origin/mac80211 origin/master origin/merged-upstream origin/mm-master origin/p54 origin/rt2x00 origin/ssb origin/zd1211rw /home/linville/git/wireless-dev [linville-t43.mobile]: git checkout -b everything origin/everything Switched to a new branch everything /home/linville/git/wireless-dev [linville-t43.mobile]: git branch * everything master Is this what you see with a 'git branch' command? Larry Yes, that's exactly what I see. Just started over with a fresh tree by following Linvilles instructions in this topic/thread. I also typed the additional commands you said, and got the exact same output, reproduced below: [EMAIL PROTECTED]:/usr/src/git$ rm -rf wireless-dev/ [EMAIL PROTECTED]:/usr/src/git$ git clone --reference linux-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git wireless-dev Initialized empty Git repository in /usr/src/git/wireless-dev/.git/ remote: Generating pack... remote: Done counting 3229 objects. remote: Deltifying 3229 objects... remote: 100% (3229/3229) done Indexing 3229 objects... remote: Total 3229 (delta 2651), reused 3098 (delta 2614) 100% (3229/3229) done Resolving 2651 deltas... 100% (2651/2651) done Checking 22461 files out... 100% (22461/22461) done [EMAIL PROTECTED]:/usr/src/git$ cd wireless-dev/ [EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git branch * master [EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git branch -r origin/HEAD origin/adm8211 origin/at76 origin/ath5k origin/b43 origin/everything origin/iwlwifi origin/mac80211 origin/master origin/merged-upstream origin/mm-master origin/p54 origin/pending-upstream origin/rt2x00 origin/ssb origin/zd1211rw [EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git checkout -b everything origin/everything Switched to a new branch everything [EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git branch * everything master [EMAIL PROTECTED]:/usr/src/git/wireless-dev$ git pull Warning: No merge candidate found because value of config option branch.everything.merge does not match any remote branch fetched. No changes. [EMAIL PROTECTED]:/usr/src/git/wireless-dev$ ___ Bcm43xx-dev mailing list Bcm43xx-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
