Am Samstag, 25. Juni 2011, 17:30:07 schrieb davidMbrooke: > On Sat, 2011-06-25 at 17:15 +0200, KP Kirchdoerfer wrote: > > HI David; > > > > Am Samstag, 25. Juni 2011, 14:32:38 schrieb davidMbrooke: > > > On Sat, 2011-06-25 at 12:53 +0200, KP Kirchdoerfer wrote: > > > > Anyway I'd like test a bit further, so if David can just a a change, > > > > so that I can see what happens.... > > > > > > > > I will update the wiki once we have a stable layout. > > > > > > > > kp > > > > > > Hi kp, > > > > > > I have just pushed a commit to the 4.0.1 branch - a small change to > > > file bering-uclibc4/buildtool/repo/linux/Bering-2.6.35.11.config to > > > add four USB-to-Ethernet driver Modules. > > > > > > Depending on how you created the new branch you might be missing the > > > configuration to pull changes down from the remote branch to your local > > > branch. Here is what I see: > > > > > > $ git remote show origin > > > * remote origin > > > > > > Fetch URL: > > > ssh://davidmbro...@leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc > > > > > > Push URL: > > > ssh://davidmbro...@leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc > > > > > > HEAD branch: master > > > > > > Remote branches: > > > 4.0.1 tracked > > > master tracked > > > > > > Local branches configured for 'git pull': > > > 4.0.1 merges with remote 4.0.1 > > > master merges with remote master > > > > > > Local refs configured for 'git push': > > > 4.0.1 pushes to 4.0.1 (up to date) > > > master pushes to master (up to date) > > > > > > If you have the same last 6 lines you are all set, but maybe you are > > > missing "4.0.1 merges with remote 4.0.1"? > > > > Yes I did :) > > > > > >From my research, the "-u" argument to "git push" when creating the > > > > > > remote branch from a local branch seems to be important. For example: > > > git push -u origin 4.0.1:refs/heads/4.0.1 > > > > > > If you missed that out you can now create the same effect with: > > > git branch --set-upstream 4.0.1 origin/4.0.1 > > > > -u and --set-upstream are synomyms for the same option; not shure if it > > can done in one step; guess I'll document as two - that worked for me :) > > > > Will delete 4.0.1, create 4.0-fixes, (re-)add content and of course > > document. > > > > kp > > Hi kp, > > >From what I read, if you specify "-u" (or "--set-upstream") when you run > > "git push" to send the local branch to the remote repository that should > be all you need to do. The second command is only to fix things > afterwards, if you omit the argument to "git push". > > I can re-add the .config changes for the USB-to-Ethernet adaptors if you > like, as a further test after you re-create the branch with your > content. Should be a good test for your local branch getting updated > from the remote. > > dMb
Hi David ok, done. 4.0.1 deleted, 4.0-fxies created. Please adjust your local git. You may need to delete 4.0.1 locally and add the tracking command for 4.0-fixes, don't know... Don't used any magic tricks as Andrew can do :) kp ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense.. http://p.sf.net/sfu/splunk-d2d-c1 _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
