Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-08 Thread Erik Christiansen
On Thu, Jan 07, 2010 at 07:53:30AM -0600, Jeff Epler wrote: > > The wiki is a collaborative effort. The front page links to the page > BasicSteps which tells you how to enable editing pages (we were forced > to make this change in order to prevent spam/defacement of the wiki). Many thanks for th

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-08 Thread Erik Christiansen
On Thu, Jan 07, 2010 at 01:59:04PM +0100, Michał Geszkiewicz wrote: > > That code is in iotask/iocontrol.cc Many thanks, Michał. (That'll teach me to check whether loadTool() is called anywhere, before making assumptions, on a work in progress.) Good luck in fighting off the wildest format extrav

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-07 Thread Jeff Epler
On the tlo_all_axes branch there are several commits to ioControl.cc which are the relevant ones for reading/writing the new files. I used 'gitk origin/tlo_all_axes ^origin/master' to see commits that are on the tlo_all_axes branch but not on master. Then I just scanned the commit messages shown

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-07 Thread Jeff Epler
On Thu, Jan 07, 2010 at 05:12:26PM +1100, Erik Christiansen wrote: > Grateful thanks, Jeff. It certainly answers it much better than the wiki, > whose misleading information led to my question: Why does "git branch" > _not_ show all the branches, despite the claim to the contrary in the > wiki? Th

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-07 Thread Michał Geszkiewicz
Erik Christiansen pisze: > On Wed, Jan 06, 2010 at 04:06:25PM +0200, Alex Joni wrote: > >> What you want for tlo_all_axes is: >> git branch --track tlo_all_axes origin/tlo_all_axes >> git checkout tlo_all_axes >> > > Thanks again for that. Sadly, the simple table-reading code in > initool

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-07 Thread Erik Christiansen
On Wed, Jan 06, 2010 at 04:06:25PM +0200, Alex Joni wrote: > > What you want for tlo_all_axes is: > git branch --track tlo_all_axes origin/tlo_all_axes > git checkout tlo_all_axes Thanks again for that. Sadly, the simple table-reading code in initool.cc on that branch doesn't immediately look l

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-06 Thread Erik Christiansen
On Wed, Jan 06, 2010 at 04:06:25PM +0200, Alex Joni wrote: > > On Wed, Jan 06, 2010 at 01:20:14PM +0200, Alex Joni wrote: > >> http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Git#Work_with_branches > >> > >> HTH, > >> Alex > > > > Sorry, but that's exactly where I was reading that: > > > > Well, you g

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-06 Thread Erik Christiansen
On Wed, Jan 06, 2010 at 08:25:05AM -0600, Jeff Epler wrote: > On Wed, Jan 06, 2010 at 10:58:14PM +1100, Erik Christiansen wrote: > > My problem is that after the clone, the "git branch" shows _no_ > > branches, just "master". i.e. the trunk. What I'm grubbing about in > > search of is those sneaky

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-06 Thread Dave
On 1/6/2010 6:58 AM, Erik Christiansen wrote: > On Wed, Jan 06, 2010 at 01:20:14PM +0200, Alex Joni wrote: > >> http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Git#Work_with_branches >> >> HTH, >> Alex >> > Sorry, but that's exactly where I was reading that: > > >>> wiki.linuxcnc.org tell

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-06 Thread Alex Joni
> On Wed, Jan 06, 2010 at 01:20:14PM +0200, Alex Joni wrote: >> http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Git#Work_with_branches >> >> HTH, >> Alex > > Sorry, but that's exactly where I was reading that: > Well, you gotta keep reading after the first line though :) To work on the 2.3 branch

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-06 Thread Jeff Epler
On Wed, Jan 06, 2010 at 10:58:14PM +1100, Erik Christiansen wrote: > My problem is that after the clone, the "git branch" shows _no_ > branches, just "master". i.e. the trunk. What I'm grubbing about in > search of is those sneaky branches. Rather than attempting to document all of git on our webs

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-06 Thread Erik Christiansen
On Wed, Jan 06, 2010 at 01:20:14PM +0200, Alex Joni wrote: > http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Git#Work_with_branches > > HTH, > Alex Sorry, but that's exactly where I was reading that: > > wiki.linuxcnc.org tells me that command will "list all branches in > > repository". My problem

Re: [Emc-users] Finding Michael G's branch in the repository

2010-01-06 Thread Alex Joni
http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Git#Work_with_branches HTH, Alex > Finding only the trunk: > > $ git branch > * master > > after a "git clone git://git.linuxcnc.org/git/emc2.git emc2-dev", I've > scoured all likely-looking manpages, wikipedia, and installed git-doc, > without yet el

[Emc-users] Finding Michael G's branch in the repository

2010-01-06 Thread Erik Christiansen
Finding only the trunk: $ git branch * master after a "git clone git://git.linuxcnc.org/git/emc2.git emc2-dev", I've scoured all likely-looking manpages, wikipedia, and installed git-doc, without yet elucidating why I see only the trunk, when wiki.linuxcnc.org tells me that command will "list all