[Lift] Re: git ouch
On Fri, May 29, 2009 at 4:35 AM, Oliver Lambert wrote: > Thanks for this, wish I'd read it earlier.As a matter of interest, is > there anything else on the committer mailing list that a new committer > should read - and can I read emails posted before I became one? > Oliver, If it makes you feel any better, I don't remember Tyler's excellent post about how to create git branches. I muddle through the branching process each time I create a new one. I'll have the afore mentioned instructions tattooed on my arm. Thanks, David > > cheers > Oliver > > On Fri, May 29, 2009 at 6:39 PM, Timothy Perrett > wrote: > >> >> Oliver, >> >> There are detailed instructions on the committer mailing list as to >> how to create a remote branch for lift. For reference, I include them >> here (originally from Mr Weir, so credit to him for being the git >> master!): >> >> **Creating a Remote Branch** >> 1. Create the remote branch >> git push origin origin:refs/heads/new_feature_name >> >> 2. Make sure everything is up-to-date >> git fetch origin >> >> 3. Then you can see that the branch is created. >> git branch -r >> >> * This should show ‘origin/new_feature_name’ >> >> 4. Start tracking the new branch >> git checkout --track -b new_feature_name origin/new_feature_name >> >> *This means that when you do pulls that it will get the latest from >> that branch as well. >> >> 5. Make sure everything is up-to-date >> git pull >> >> **Cleaning up Mistakes** >> If you make a mistake you can always delete the remote branch: >> git push origin :heads/new_feature_name >> >> Hope that helps >> >> Cheers, Tim >> >> On May 29, 8:32 am, Heiko Seeberger >> wrote: >> > Hm, never looked at those images before. But I guess it is OK. >> > Heiko >> > >> > 2009/5/29 Oliver Lambert >> > >> > >> > >> > >> > >> > > I have a problem with breaking a build on my first attempt of working >> with >> > > git. I'm happy if I haven't, but what was concerning me was in the >> included >> > > image (the network line looks like wip-ol-immu is directly next to >> master, >> > > rather than on a separate branch - if this is normal, Im happy) >> > >> > > On Fri, May 29, 2009 at 4:22 PM, Heiko Seeberger < >> > > heiko.seeber...@googlemail.com> wrote: >> > >> > >> Oliver, >> > >> But that's perfect! What's your problem? >> > >> > >> There is one LOCAL wip-ol-immu branch and one REMOTE. That's how it >> is >> > >> expected to be for a branch you pushed. >> > >> > >> Heiko >> > >> > >> 2009/5/29 Oliver Lambert >> > >> > >> I got that list of commands wrong, what I typed, was >> > >> > >>> git clone g...@github.com:dpp/liftweb.git >> > >>> git branch wip-ol-immu >> > >>> git checkout wip-ol-immu >> > >>> git push origin wip-ol-immu >> > >> > >>> When I do a git branch -a, I get two wip-ol-immu >> > >>> master >> > >>> * wip-ol-immu >> > >>> origin/1.0_maint >> > >>> origin/HEAD >> > >>> origin/master >> > >>> origin/new_actor >> > >>> origin/wip-boolean-can >> > >>> origin/wip-dcb-derby-binary >> > >>> origin/wip-dcb-jpa-jta >> > >>> origin/wip-dcb-jpa-validation >> > >>> origin/wip-dcb-lift-jpa >> > >>> origin/wip-dpp-record >> > >>> origin/wip-marius-dom-optimizations >> > >>> origin/wip-ol-immu >> > >>> origin/wip-prettify >> > >>> origin/wip-record2-dpp >> > >> > -- >> > My blog: heikoseeberger.name >> > Follow me: twitter.com/hseeberger >> > OSGi on Scala:www.scalamodules.org >> > Lift, the simply functional web framework: liftweb.net >> >> > > > > -- Lift, the simply functional web framework http://liftweb.net Beginning Scala http://www.apress.com/book/view/1430219890 Follow me: http://twitter.com/dpp Git some: http://github.com/dpp --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
We use the committer list to discuss process orientated things like when we are going to do a release, issue management, who's working on what tasks etc etc. Its a private - committer only group that is not publicly viewable. I'll touch base with you off list :-) Cheers, Tim On May 29, 12:35 pm, Oliver Lambert wrote: > Thanks for this, wish I'd read it earlier.As a matter of interest, is there > anything else on the committer mailing list that a new committer > should read - and can I read emails posted before I became one? > > cheers > Oliver > On Fri, May 29, 2009 at 6:39 PM, Timothy Perrett > wrote: --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
Thanks for this, wish I'd read it earlier.As a matter of interest, is there anything else on the committer mailing list that a new committer should read - and can I read emails posted before I became one? cheers Oliver On Fri, May 29, 2009 at 6:39 PM, Timothy Perrett wrote: > > Oliver, > > There are detailed instructions on the committer mailing list as to > how to create a remote branch for lift. For reference, I include them > here (originally from Mr Weir, so credit to him for being the git > master!): > > **Creating a Remote Branch** > 1. Create the remote branch > git push origin origin:refs/heads/new_feature_name > > 2. Make sure everything is up-to-date > git fetch origin > > 3. Then you can see that the branch is created. > git branch -r > > * This should show ‘origin/new_feature_name’ > > 4. Start tracking the new branch > git checkout --track -b new_feature_name origin/new_feature_name > > *This means that when you do pulls that it will get the latest from > that branch as well. > > 5. Make sure everything is up-to-date > git pull > > **Cleaning up Mistakes** > If you make a mistake you can always delete the remote branch: > git push origin :heads/new_feature_name > > Hope that helps > > Cheers, Tim > > On May 29, 8:32 am, Heiko Seeberger > wrote: > > Hm, never looked at those images before. But I guess it is OK. > > Heiko > > > > 2009/5/29 Oliver Lambert > > > > > > > > > > > > > I have a problem with breaking a build on my first attempt of working > with > > > git. I'm happy if I haven't, but what was concerning me was in the > included > > > image (the network line looks like wip-ol-immu is directly next to > master, > > > rather than on a separate branch - if this is normal, Im happy) > > > > > On Fri, May 29, 2009 at 4:22 PM, Heiko Seeberger < > > > heiko.seeber...@googlemail.com> wrote: > > > > >> Oliver, > > >> But that's perfect! What's your problem? > > > > >> There is one LOCAL wip-ol-immu branch and one REMOTE. That's how it is > > >> expected to be for a branch you pushed. > > > > >> Heiko > > > > >> 2009/5/29 Oliver Lambert > > > > >> I got that list of commands wrong, what I typed, was > > > > >>> git clone g...@github.com:dpp/liftweb.git > > >>> git branch wip-ol-immu > > >>> git checkout wip-ol-immu > > >>> git push origin wip-ol-immu > > > > >>> When I do a git branch -a, I get two wip-ol-immu > > >>> master > > >>> * wip-ol-immu > > >>> origin/1.0_maint > > >>> origin/HEAD > > >>> origin/master > > >>> origin/new_actor > > >>> origin/wip-boolean-can > > >>> origin/wip-dcb-derby-binary > > >>> origin/wip-dcb-jpa-jta > > >>> origin/wip-dcb-jpa-validation > > >>> origin/wip-dcb-lift-jpa > > >>> origin/wip-dpp-record > > >>> origin/wip-marius-dom-optimizations > > >>> origin/wip-ol-immu > > >>> origin/wip-prettify > > >>> origin/wip-record2-dpp > > > > -- > > My blog: heikoseeberger.name > > Follow me: twitter.com/hseeberger > > OSGi on Scala:www.scalamodules.org > > Lift, the simply functional web framework: liftweb.net > > > --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
Oliver, There are detailed instructions on the committer mailing list as to how to create a remote branch for lift. For reference, I include them here (originally from Mr Weir, so credit to him for being the git master!): **Creating a Remote Branch** 1. Create the remote branch git push origin origin:refs/heads/new_feature_name 2. Make sure everything is up-to-date git fetch origin 3. Then you can see that the branch is created. git branch -r * This should show ‘origin/new_feature_name’ 4. Start tracking the new branch git checkout --track -b new_feature_name origin/new_feature_name *This means that when you do pulls that it will get the latest from that branch as well. 5. Make sure everything is up-to-date git pull **Cleaning up Mistakes** If you make a mistake you can always delete the remote branch: git push origin :heads/new_feature_name Hope that helps Cheers, Tim On May 29, 8:32 am, Heiko Seeberger wrote: > Hm, never looked at those images before. But I guess it is OK. > Heiko > > 2009/5/29 Oliver Lambert > > > > > > > I have a problem with breaking a build on my first attempt of working with > > git. I'm happy if I haven't, but what was concerning me was in the included > > image (the network line looks like wip-ol-immu is directly next to master, > > rather than on a separate branch - if this is normal, Im happy) > > > On Fri, May 29, 2009 at 4:22 PM, Heiko Seeberger < > > heiko.seeber...@googlemail.com> wrote: > > >> Oliver, > >> But that's perfect! What's your problem? > > >> There is one LOCAL wip-ol-immu branch and one REMOTE. That's how it is > >> expected to be for a branch you pushed. > > >> Heiko > > >> 2009/5/29 Oliver Lambert > > >> I got that list of commands wrong, what I typed, was > > >>> git clone g...@github.com:dpp/liftweb.git > >>> git branch wip-ol-immu > >>> git checkout wip-ol-immu > >>> git push origin wip-ol-immu > > >>> When I do a git branch -a, I get two wip-ol-immu > >>> master > >>> * wip-ol-immu > >>> origin/1.0_maint > >>> origin/HEAD > >>> origin/master > >>> origin/new_actor > >>> origin/wip-boolean-can > >>> origin/wip-dcb-derby-binary > >>> origin/wip-dcb-jpa-jta > >>> origin/wip-dcb-jpa-validation > >>> origin/wip-dcb-lift-jpa > >>> origin/wip-dpp-record > >>> origin/wip-marius-dom-optimizations > >>> origin/wip-ol-immu > >>> origin/wip-prettify > >>> origin/wip-record2-dpp > > -- > My blog: heikoseeberger.name > Follow me: twitter.com/hseeberger > OSGi on Scala:www.scalamodules.org > Lift, the simply functional web framework: liftweb.net --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
Hm, never looked at those images before. But I guess it is OK. Heiko 2009/5/29 Oliver Lambert > I have a problem with breaking a build on my first attempt of working with > git. I'm happy if I haven't, but what was concerning me was in the included > image (the network line looks like wip-ol-immu is directly next to master, > rather than on a separate branch - if this is normal, Im happy) > > > On Fri, May 29, 2009 at 4:22 PM, Heiko Seeberger < > heiko.seeber...@googlemail.com> wrote: > >> Oliver, >> But that's perfect! What's your problem? >> >> There is one LOCAL wip-ol-immu branch and one REMOTE. That's how it is >> expected to be for a branch you pushed. >> >> Heiko >> >> 2009/5/29 Oliver Lambert >> >> I got that list of commands wrong, what I typed, was >>> >>> git clone g...@github.com:dpp/liftweb.git >>> git branch wip-ol-immu >>> git checkout wip-ol-immu >>> git push origin wip-ol-immu >>> >>> When I do a git branch -a, I get two wip-ol-immu >>> master >>> * wip-ol-immu >>> origin/1.0_maint >>> origin/HEAD >>> origin/master >>> origin/new_actor >>> origin/wip-boolean-can >>> origin/wip-dcb-derby-binary >>> origin/wip-dcb-jpa-jta >>> origin/wip-dcb-jpa-validation >>> origin/wip-dcb-lift-jpa >>> origin/wip-dpp-record >>> origin/wip-marius-dom-optimizations >>> origin/wip-ol-immu >>> origin/wip-prettify >>> origin/wip-record2-dpp >>> >>> >>> >>> > > > > -- My blog: heikoseeberger.name Follow me: twitter.com/hseeberger OSGi on Scala: www.scalamodules.org Lift, the simply functional web framework: liftweb.net --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
I have a problem with breaking a build on my first attempt of working with git. I'm happy if I haven't, but what was concerning me was in the included image (the network line looks like wip-ol-immu is directly next to master, rather than on a separate branch - if this is normal, Im happy) On Fri, May 29, 2009 at 4:22 PM, Heiko Seeberger < heiko.seeber...@googlemail.com> wrote: > Oliver, > But that's perfect! What's your problem? > > There is one LOCAL wip-ol-immu branch and one REMOTE. That's how it is > expected to be for a branch you pushed. > > Heiko > > 2009/5/29 Oliver Lambert > > I got that list of commands wrong, what I typed, was >> >> git clone g...@github.com:dpp/liftweb.git >> git branch wip-ol-immu >> git checkout wip-ol-immu >> git push origin wip-ol-immu >> >> When I do a git branch -a, I get two wip-ol-immu >> master >> * wip-ol-immu >> origin/1.0_maint >> origin/HEAD >> origin/master >> origin/new_actor >> origin/wip-boolean-can >> origin/wip-dcb-derby-binary >> origin/wip-dcb-jpa-jta >> origin/wip-dcb-jpa-validation >> origin/wip-dcb-lift-jpa >> origin/wip-dpp-record >> origin/wip-marius-dom-optimizations >> origin/wip-ol-immu >> origin/wip-prettify >> origin/wip-record2-dpp >> >> >> >> --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~--- <>
[Lift] Re: git ouch
Oliver, But that's perfect! What's your problem? There is one LOCAL wip-ol-immu branch and one REMOTE. That's how it is expected to be for a branch you pushed. Heiko 2009/5/29 Oliver Lambert > I got that list of commands wrong, what I typed, was > > git clone g...@github.com:dpp/liftweb.git > git branch wip-ol-immu > git checkout wip-ol-immu > git push origin wip-ol-immu > > When I do a git branch -a, I get two wip-ol-immu > master > * wip-ol-immu > origin/1.0_maint > origin/HEAD > origin/master > origin/new_actor > origin/wip-boolean-can > origin/wip-dcb-derby-binary > origin/wip-dcb-jpa-jta > origin/wip-dcb-jpa-validation > origin/wip-dcb-lift-jpa > origin/wip-dpp-record > origin/wip-marius-dom-optimizations > origin/wip-ol-immu > origin/wip-prettify > origin/wip-record2-dpp > > > On Fri, May 29, 2009 at 3:50 PM, Oliver Lambert wrote: > >> When I look at the liftweb network graph, it looks like I'm working on the >> main liftweb master line and have renamed it. >> >> >> On Fri, May 29, 2009 at 3:38 PM, Derek Chen-Becker > > wrote: >> >>> I just looked at Git and I show a proper branch there (wip-ol-immu) >>> committed about 30 minutes ago. Are you seeing some error on your end? >>> >>> Derek >>> >>> >>> On Thu, May 28, 2009 at 11:19 PM, Oliver Lambert wrote: >>> Git wouldn't let me create a branch of liftweb until I deleted and recreated my ssh keys - I believed all was good. I thought I was following the documentation, to create my own branch, which appeared to be correct on my machine. But, when I just pushed what I thought was my branch, I appear to have done something wrong. Any help (without curses) is greatly appreciated at this moment. cheers Oliver >>> >>> >>> >> > > > > -- My blog: heikoseeberger.name Follow me: twitter.com/hseeberger OSGi on Scala: www.scalamodules.org Lift, the simply functional web framework: liftweb.net --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
I got that list of commands wrong, what I typed, was git clone g...@github.com:dpp/liftweb.git git branch wip-ol-immu git checkout wip-ol-immu git push origin wip-ol-immu When I do a git branch -a, I get two wip-ol-immu master * wip-ol-immu origin/1.0_maint origin/HEAD origin/master origin/new_actor origin/wip-boolean-can origin/wip-dcb-derby-binary origin/wip-dcb-jpa-jta origin/wip-dcb-jpa-validation origin/wip-dcb-lift-jpa origin/wip-dpp-record origin/wip-marius-dom-optimizations origin/wip-ol-immu origin/wip-prettify origin/wip-record2-dpp On Fri, May 29, 2009 at 3:50 PM, Oliver Lambert wrote: > When I look at the liftweb network graph, it looks like I'm working on the > main liftweb master line and have renamed it. > > > On Fri, May 29, 2009 at 3:38 PM, Derek Chen-Becker > wrote: > >> I just looked at Git and I show a proper branch there (wip-ol-immu) >> committed about 30 minutes ago. Are you seeing some error on your end? >> >> Derek >> >> >> On Thu, May 28, 2009 at 11:19 PM, Oliver Lambert wrote: >> >>> Git wouldn't let me create a branch of liftweb until I deleted and >>> recreated my ssh keys - I believed all was good. >>> >>> I thought I was following the documentation, to create my own branch, >>> which appeared to be correct on my machine. But, when I just pushed what I >>> thought was my branch, I appear to have done something wrong. Any help >>> (without curses) is greatly appreciated at this moment. >>> >>> cheers >>> Oliver >>> >>> >>> >> >> >> >> > --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
When I look at the liftweb network graph, it looks like I'm working on the main liftweb master line and have renamed it. On Fri, May 29, 2009 at 3:38 PM, Derek Chen-Becker wrote: > I just looked at Git and I show a proper branch there (wip-ol-immu) > committed about 30 minutes ago. Are you seeing some error on your end? > > Derek > > > On Thu, May 28, 2009 at 11:19 PM, Oliver Lambert wrote: > >> Git wouldn't let me create a branch of liftweb until I deleted and >> recreated my ssh keys - I believed all was good. >> >> I thought I was following the documentation, to create my own branch, >> which appeared to be correct on my machine. But, when I just pushed what I >> thought was my branch, I appear to have done something wrong. Any help >> (without curses) is greatly appreciated at this moment. >> >> cheers >> Oliver >> >> >> > > > > --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
The following sequence, without various commits git clone g...@github.com:dpp/liftweb.git git branch wip-ol-immugit checkout wip-ol-immu git checkout wip-ol-immu git push origin wip-ol-immu The git network now looks wrong. Where did I stuff up? On Fri, May 29, 2009 at 3:29 PM, Heiko Seeberger < heiko.seeber...@googlemail.com> wrote: > Some more details, please: What git commands did you enter? > > 2009/5/29 Oliver Lambert > > Git wouldn't let me create a branch of liftweb until I deleted and >> recreated my ssh keys - I believed all was good. >> >> I thought I was following the documentation, to create my own branch, >> which appeared to be correct on my machine. But, when I just pushed what I >> thought was my branch, I appear to have done something wrong. Any help >> (without curses) is greatly appreciated at this moment. >> >> cheers >> Oliver >> >> >> > > > -- > My blog: heikoseeberger.name > Follow me: twitter.com/hseeberger > OSGi on Scala: www.scalamodules.org > Lift, the simply functional web framework: liftweb.net > > > > --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
I just looked at Git and I show a proper branch there (wip-ol-immu) committed about 30 minutes ago. Are you seeing some error on your end? Derek On Thu, May 28, 2009 at 11:19 PM, Oliver Lambert wrote: > Git wouldn't let me create a branch of liftweb until I deleted and > recreated my ssh keys - I believed all was good. > > I thought I was following the documentation, to create my own branch, which > appeared to be correct on my machine. But, when I just pushed what I thought > was my branch, I appear to have done something wrong. Any help (without > curses) is greatly appreciated at this moment. > > cheers > Oliver > > > > --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
[Lift] Re: git ouch
Some more details, please: What git commands did you enter? 2009/5/29 Oliver Lambert > Git wouldn't let me create a branch of liftweb until I deleted and > recreated my ssh keys - I believed all was good. > > I thought I was following the documentation, to create my own branch, which > appeared to be correct on my machine. But, when I just pushed what I thought > was my branch, I appear to have done something wrong. Any help (without > curses) is greatly appreciated at this moment. > > cheers > Oliver > > > > -- My blog: heikoseeberger.name Follow me: twitter.com/hseeberger OSGi on Scala: www.scalamodules.org Lift, the simply functional web framework: liftweb.net --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Lift" group. To post to this group, send email to liftweb@googlegroups.com To unsubscribe from this group, send email to liftweb+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/liftweb?hl=en -~--~~~~--~~--~--~---
