Re: [Emc-developers] git

[Stuart Stevenson]

Maybe the license is still free. You just need to ask for one. This seems
to be a precursor to a license purchase sometime in the future but it may
be free for now.

On Tue, May 12, 2020, 8:05 AM Kurt Jacobson  wrote:

> Hello Reinhard,
>
> That's very disappointing. I thought GitKraken was still completely free to
> use.
> I have used it since 2017 and have never had it ask for a licence file.
> Maybe I am grandfathered in some how.
>
>
> On Tue, May 12, 2020 at 12:53 AM Reinhard 
> wrote:
>
> > On Montag, 11. Mai 2020, 23:18:32 CEST Kurt Jacobson wrote:
> > > GitKraken is unsurpassed for quickly viewing git commit history and
> file
> > > diffs.
> > > Unfortunately its not open source, but it is free to use.
> >
> > Tried to install standalone version, as I wanted the functionality for my
> > local repos. But on startup it requires a license file.
> > Exit is the only alternative - does not run as freeware.
> >
> > For public repositories I don't need such tools, as the github-browser
> > offers
> > all I need.
> >
> >
> > Reinhard
> >
> >
> >
> >
> > ___
> > Emc-developers mailing list
> > Emc-developers@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/emc-developers
> >
>
>
> --
> *Kurt Jacobson*
> 505-303-1933
> kurtcjacob...@gmail.com
>
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git

[Kurt Jacobson]

Hello Reinhard,

That's very disappointing. I thought GitKraken was still completely free to
use.
I have used it since 2017 and have never had it ask for a licence file.
Maybe I am grandfathered in some how.


On Tue, May 12, 2020 at 12:53 AM Reinhard 
wrote:

> On Montag, 11. Mai 2020, 23:18:32 CEST Kurt Jacobson wrote:
> > GitKraken is unsurpassed for quickly viewing git commit history and file
> > diffs.
> > Unfortunately its not open source, but it is free to use.
>
> Tried to install standalone version, as I wanted the functionality for my
> local repos. But on startup it requires a license file.
> Exit is the only alternative - does not run as freeware.
>
> For public repositories I don't need such tools, as the github-browser
> offers
> all I need.
>
>
> Reinhard
>
>
>
>
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>


-- 
*Kurt Jacobson*
505-303-1933
kurtcjacob...@gmail.com

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git

[Reinhard]

On Montag, 11. Mai 2020, 23:18:32 CEST Kurt Jacobson wrote:
> GitKraken is unsurpassed for quickly viewing git commit history and file
> diffs.
> Unfortunately its not open source, but it is free to use.

Tried to install standalone version, as I wanted the functionality for my 
local repos. But on startup it requires a license file.
Exit is the only alternative - does not run as freeware.

For public repositories I don't need such tools, as the github-browser offers 
all I need.


Reinhard




___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git

[Reinhard]

Hi Kurt,

thank you very much for the hints!
I'll go for it.

cheers Reinhard




___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git

[Kurt Jacobson]

Reinhard,

GitKraken is unsurpassed for quickly viewing git commit history and file
diffs.
Unfortunately its not open source, but it is free to use.
https://www.gitkraken.com/
Another good git gui with good diff views is GitAhead.

If all you care about are git file diffs, meld is also very good and
supports git: https://meldmerge.org/

Cheers,
Kurt

On Sun, May 10, 2020 at 9:44 AM Reinhard 
wrote:

> Hi Dewey,
>
> thank you for your assistance!
>
> On Sonntag, 10. Mai 2020, 15:15:26 CEST Dewey Garrett wrote:
> > alias gitfile='git log --reverse  --pretty=format:"%h %ai %s" '
>
> Hm, looks like I was not good enuf to describe, what I'm looking for.
> Thank you for the alias, but I prefer the default git log, which uses
> color
> output and empty lines ...
>
> ... same story but more info at the same time (called from the directory
> of
> that file):
> gitk 
>
> That shows the history and the differences in file at one time.
>
> What I miss, is the possibility to compare the whole file between
> different
> commit steps.
> I know, that I tested 9-axis setup with ini-file from axis-sim. I never
> used
> another 9-axis ini-file and I did not edit that file.
> Don't know, where I have the idea from, that the coordinates should be
> tied
> together without blanks. Well, helpfiles show it that way, but I don't
> think,
> that I spent much time on helpfiles.
>
> My screenshot with green leds (all axis homed) is dated from November last
> year. So it worked that time.
> But when I look at git history of axis_9axis.ini from github, there has
> been
> no change respect to COORDINATE entry of TRAJ section.
> When I look at my code, it can't have been working.
>
> ... but I know I'm not dreaming. So I would like to track down the changes
> that broke my app. Sure, my local git history is not that perfekt like
> yours
> ...
> Obviously I can't get rid of it from commit differences only.
> Therefore I would like to compare the whole file between different commit
> stages.
> Krusader has a nice way to compare two versions of a file. May be there's
> something similar for git too?
>
>
> cheers Reinhard
>
>
>
>
>
>
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>


-- 
*Kurt Jacobson*
505-303-1933
kurtcjacob...@gmail.com

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git

[Reinhard]

Hi Dewey,

thank you for your assistance!

On Sonntag, 10. Mai 2020, 15:15:26 CEST Dewey Garrett wrote:
> alias gitfile='git log --reverse  --pretty=format:"%h %ai %s" '

Hm, looks like I was not good enuf to describe, what I'm looking for.
Thank you for the alias, but I prefer the default git log, which uses color 
output and empty lines ...

... same story but more info at the same time (called from the directory of 
that file):
gitk 

That shows the history and the differences in file at one time.

What I miss, is the possibility to compare the whole file between different 
commit steps.
I know, that I tested 9-axis setup with ini-file from axis-sim. I never used 
another 9-axis ini-file and I did not edit that file.
Don't know, where I have the idea from, that the coordinates should be tied 
together without blanks. Well, helpfiles show it that way, but I don't think, 
that I spent much time on helpfiles.

My screenshot with green leds (all axis homed) is dated from November last 
year. So it worked that time.
But when I look at git history of axis_9axis.ini from github, there has been 
no change respect to COORDINATE entry of TRAJ section.
When I look at my code, it can't have been working.

... but I know I'm not dreaming. So I would like to track down the changes 
that broke my app. Sure, my local git history is not that perfekt like yours 
...
Obviously I can't get rid of it from commit differences only.
Therefore I would like to compare the whole file between different commit 
stages.
Krusader has a nice way to compare two versions of a file. May be there's 
something similar for git too?


cheers Reinhard






___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git

[Dewey Garrett]

In <1974592.ZQxCF2d4iu@django019> Reinhard  
writes:


>How can I view the different variants of a file through git history?

List commits for a file example (using src/Makefile):

$ alias gitfile='git log --reverse  --pretty=format:"%h %ai %s" '
$ cd src
$ git status | head -1
On branch 2.8
$ gitfile Makefile |tail -10
4ed3f747a 2020-01-12 16:55:37 -0700 makefile permission restore
3a021b7d6 2020-01-12 15:45:29 -0700 pentakins kinematics #673
c0e21e717 2018-09-12 21:35:52 -0500 Makefile: error on implicit function 
declaration
e287041c0 2020-04-17 20:51:32 +0200 Merge branch 'master' of 
https://github.com/alkabal/linuxcnc into alkabal-master
83b8cdc1c 2020-04-21 08:50:28 -0500 update_ini: move into src/ so it gets 
#!-mangling done
e0612d889 2020-04-24 10:25:48 -0500 Makefile: Add cxx-flag macro
d36dcec77 2020-04-24 10:24:44 -0500 Makefile: Add -Wno-psabi to silence 
warnings on pi builds
49d9a9487 2020-04-24 10:23:21 -0500 Makefile: Specify gnu++11 or gnu++0x as 
language standard
9ff903664 2020-04-24 10:23:21 -0500 Makefile: Fix typo
a3a77353f 2020-04-29 13:24:01 +1000 add pmx485 to makefile0 t520:src


-- 
Dewey Garrett



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] git

[Reinhard]

Hi,

I'm not that used to git. Usually I use it for backup purpose only.
Lately I read about gitk. That's not bad to show what happened in one commit.
How can I view the different variants of a file through git history?

gitk filename shows the differences of each commit. Is there a way to see the 
whole file?

greetings Reinhard




___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git bisect help

[Gene Heskett]

On Tuesday 14 April 2020 19:29:26 Gene Heskett wrote:

> On Tuesday 14 April 2020 18:27:20 andy pugh wrote:
> > On Tue, 14 Apr 2020 at 22:54, Gene Heskett 
>
> wrote:
> > > > What's that # doing there?
> > >
> > > IIRC, removeing a later duplicate link.
> >
> > I don't see any duplication. Have you tried removing it?
>
> did just now, no diff. It still runs away slowly, a .005 offset, but
> outputs no steps except then the up-down key is being pushed. When one
> of them has been pushed and then released the stepgen output is turned
> off, so the axis is not moving, but the dro marches along slowly as
> does the fb number out of the stepgen until around an inch later it
> finally trip off with a following error. Sometimes the direction of
> the phantom drift is reversed by the opposite key and sometimes the
> dro continues marching along in the same direction until it finally
> throws a following error, but usually moves the dro an inch or better,
> all of this w/o a physical axis movement unless a key is actually
> pushed.
>
I seem to have fixed it. I went up the file to the x axis section and 
duplicated a couple dozen lines, changing only the axis/joint 
references, then went down and deleted that same duplicate stanza which 
was now a repeat and surplus.  No clue what I did other than reorder the 
file, but it now works. Go figure.

I did find out one thing though, that I could bring the y table fwd far 
enough to drop off the far side of the home switch. It won't home from 
there as it runs the wrong way looking for the switch, ending that move 
with an error 7.

Now maybe if it quits raining, I can do something about my jungle later 
today.

g'night all.

> Cheers, Gene Heskett


Cheers, Gene Heskett
-- 
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
If we desire respect for the law, we must first make the law respectable.
 - Louis D. Brandeis
Genes Web page 


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git bisect help

[Gene Heskett]

On Tuesday 14 April 2020 18:27:20 andy pugh wrote:

> On Tue, 14 Apr 2020 at 22:54, Gene Heskett  
wrote:
> > > What's that # doing there?
> >
> > IIRC, removeing a later duplicate link.
>
> I don't see any duplication. Have you tried removing it?


did just now, no diff. It still runs away slowly, a .005 offset, but 
outputs no steps except then the up-down key is being pushed. When one 
of them has been pushed and then released the stepgen output is turned 
off, so the axis is not moving, but the dro marches along slowly as does 
the fb number out of the stepgen until around an inch later it finally 
trip off with a following error. Sometimes the direction of the phantom 
drift is reversed by the opposite key and sometimes the dro continues 
marching along in the same direction until it finally throws a following 
error, but usually moves the dro an inch or better, all of this w/o a 
physical axis movement unless a key is actually pushed.

Cheers, Gene Heskett
-- 
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
If we desire respect for the law, we must first make the law respectable.
 - Louis D. Brandeis
Genes Web page 


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git bisect help

[andy pugh]

On Tue, 14 Apr 2020 at 22:54, Gene Heskett  wrote:

> > What's that # doing there?

> IIRC, removeing a later duplicate link.

I don't see any duplication. Have you tried removing it?

-- 
atp
"A motorcycle is a bicycle with a pandemonium attachment and is
designed for the especial use of mechanical geniuses, daredevils and
lunatics."
— George Fitch, Atlanta Constitution Newspaper, 1912


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git bisect help

[Gene Heskett]

On Tuesday 14 April 2020 17:30:36 andy pugh wrote:

> On Tue, 14 Apr 2020 at 22:23, Gene Heskett  
wrote:
> > net y-vel-cmd<= joint.1.vel-cmd  #  =>  pid_y.command-deriv
>
> What's that # doing there?

IIRC, removeing a later duplicate link.

Cheers, Gene Heskett
-- 
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
If we desire respect for the law, we must first make the law respectable.
 - Louis D. Brandeis
Genes Web page 


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git bisect help

[andy pugh]

On Tue, 14 Apr 2020 at 22:23, Gene Heskett  wrote:

> net y-vel-cmd<= joint.1.vel-cmd  #  =>  pid_y.command-deriv

What's that # doing there?

-- 
atp
"A motorcycle is a bicycle with a pandemonium attachment and is
designed for the especial use of mechanical geniuses, daredevils and
lunatics."
— George Fitch, Atlanta Constitution Newspaper, 1912


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git bisect help

[Gene Heskett]

On Tuesday 14 April 2020 12:35:01 andy pugh wrote:

> On Tue, 14 Apr 2020 at 16:29, Gene Heskett  wrote:
> > which may be not enough but its building now. Keep in mind I have to
> > make debs and install them and reboot to try them
>
> You should be able to test with a run-in-place. If you are compiling
> on the machine under test then you don't need debs.
>
> >  as the shutdown is not
> > cleaning house as I quit it and I have to reboot to get a clean
> > slate for the next try.
>
> This _could_ be caused by a runtests failure. How does that go?
>
Perfectly, no failures.

> > 2 weeks apparently wasn't enough, its broken there.  How do I back
> > the bisect start "good" up another 2 weeks?
>
> Keep scrolling through "git log" until you find a commit on a date
> that suits you.

git log?  What I am doing does not show dates.
>
> I still think this is probably a config or hardware problem.

I can't argue.  Editors have been known to make typu's.

> This isn't the command-deriv thing is it? Is that pin netted at all?

yes, for all 4 axises. I can't stop the following errors without it

And it only effects the y axis. x,z,a work fine.

>From my main hal file:
#
#  AXIS Y = joint_1 *
#
setp   pid_y.Pgain [JOINT_1]P
setp   pid_y.Igain [JOINT_1]I
setp   pid_y.Dgain [JOINT_1]D
setp   pid_y.bias  [JOINT_1]BIAS
setp   pid_y.FF0   [JOINT_1]FF0
setp   pid_y.FF1   [JOINT_1]FF1
setp   pid_y.FF2   [JOINT_1]FF2
setp   pid_y.deadband  [JOINT_1]DEADBAND
setp   pid_y.maxoutput [JOINT_1]MAX_OUTPUT
setp   pid_y.error-previous-target true
setp   pid_y.maxerror .0005


#**
# Step Gen signals/setup for Y axis
#**
setp   hm2_5i25.0.stepgen.01.dirsetup[JOINT_1]DIRSETUP
setp   hm2_5i25.0.stepgen.01.dirhold [JOINT_1]DIRHOLD
setp   hm2_5i25.0.stepgen.01.steplen [JOINT_1]STEPLEN
setp   hm2_5i25.0.stepgen.01.stepspace   [JOINT_1]STEPSPACE
setp   hm2_5i25.0.stepgen.01.position-scale  [JOINT_1]STEP_SCALE
setp   hm2_5i25.0.stepgen.01.step_type0
setp   hm2_5i25.0.stepgen.01.control-type 1
setp   hm2_5i25.0.stepgen.01.maxaccel [JOINT_1]STEPGEN_MAXACCEL
setp   hm2_5i25.0.stepgen.01.maxvel   [JOINT_1]STEPGEN_MAXVEL
#*
# --closed loop stepper signals for joint_1=Y*
#*
# 1st 2 are from motion
net y-pos-cmd<= joint.1.motor-pos-cmd => pid_y.command
net y-vel-cmd<= joint.1.vel-cmd  #  =>  pid_y.command-deriv
net y-output <= pid_y.output => hm2_5i25.0.stepgen.01.velocity-cmd
net y-pos-fb <= hm2_5i25.0.stepgen.01.position-fb => joint.1.motor-pos-fb
net y-enable <= joint.1.amp-enable-out  => hm2_5i25.0.stepgen.01.enable 
pid_y.enable
net y-index-enable  <=> pid_y.index-enable

This is afaik, a copy/paste of x with the x's changed to y's,
and the stepgen incremented to 01.
 
And it all worked prior to the 2.8 merge 2 or 3 weeks back.

Thanks Andy.

Cheers, Gene Heskett
-- 
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
If we desire respect for the law, we must first make the law respectable.
 - Louis D. Brandeis
Genes Web page 


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git bisect help

[andy pugh]

On Tue, 14 Apr 2020 at 16:29, Gene Heskett  wrote:

> which may be not enough but its building now. Keep in mind I have to make
> debs and install them and reboot to try them

You should be able to test with a run-in-place. If you are compiling
on the machine under test then you don't need debs.

>  as the shutdown is not
> cleaning house as I quit it and I have to reboot to get a clean slate
> for the next try.

This _could_ be caused by a runtests failure. How does that go?

> 2 weeks apparently wasn't enough, its broken there.  How do I back the
> bisect start "good" up another 2 weeks?

Keep scrolling through "git log" until you find a commit on a date
that suits you.

I still think this is probably a config or hardware problem.
This isn't the command-deriv thing is it? Is that pin netted at all?

-- 
atp
"A motorcycle is a bicycle with a pandemonium attachment and is
designed for the especial use of mechanical geniuses, daredevils and
lunatics."
— George Fitch, Atlanta Constitution Newspaper, 1912


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git bisect help

[Gene Heskett]

On Tuesday 14 April 2020 06:07:31 andy pugh wrote:

> On Tue, 14 Apr 2020 at 10:33, Gene Heskett  
wrote:
> > How, since even the newer, bad code runs thru runtests w/o any
> > problems,


> Bisect does not care how you test. But it is probably easiest to run
> it on the machine that is showing the problem.

I am. The rest of my machines are running just fine although I have not 
not yet built master on the pi yet which I usually do over the weekends.
>
> > Can someone suggest a starting branch that ideally would start the
> > bisect say at 2 weeks prior to the beginning of the 2.8 merge, just
> > to verify it did work then?
>
> 2.8 merges in to master rather regularly, but 2 weeks ago would be
> 7bfebcb23a643c084fc39f1d3bfca9a29c64ae6c
> (just from browsing 
> https://github.com/LinuxCNC/linuxcnc/commits/master)
>
> git checkout 7bfebcb23a643c084fc39f1d3bfca9a29c64ae6c
> Will take you back in time 2 weeks.

which may be not enough but its building now. Keep in mind I have to make 
debs and install them and reboot to try them as the shutdown is not 
cleaning house as I quit it and I have to reboot to get a clean slate 
for the next try.  That didn't happen when it was working correctly. 
This same machine is one of 2 that are running on a 240 GB SSD, an older 
dell with only 1 sata port. Much faster at about 150MB/sec read speeds.

Got the rpi4b build underway. Ain't ssh wunnerful... :)

2 weeks apparently wasn't enough, its broken there.  How do I back the 
bisect start "good" up another 2 weeks?  That surely should get it in 
good shape.

In the meantime I have to go drop the card for a new mower.  Back later.

Thanks Andy.

Cheers, Gene Heskett
-- 
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
If we desire respect for the law, we must first make the law respectable.
 - Louis D. Brandeis
Genes Web page 


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git bisect help

[andy pugh]

On Tue, 14 Apr 2020 at 10:33, Gene Heskett  wrote:

> How, since even the newer, bad code runs thru runtests w/o any problems,

Bisect does not care how you test. But it is probably easiest to run
it on the machine that is showing the problem.

> Can someone suggest a starting branch that ideally would start the bisect
> say at 2 weeks prior to the beginning of the 2.8 merge, just to verify
> it did work then?

2.8 merges in to master rather regularly, but 2 weeks ago would be
7bfebcb23a643c084fc39f1d3bfca9a29c64ae6c
(just from browsing  https://github.com/LinuxCNC/linuxcnc/commits/master)

git checkout 7bfebcb23a643c084fc39f1d3bfca9a29c64ae6c
Will take you back in time 2 weeks.

-- 
atp
"A motorcycle is a bicycle with a pandemonium attachment and is
designed for the especial use of mechanical geniuses, daredevils and
lunatics."
— George Fitch, Atlanta Constitution Newspaper, 1912


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] git bisect help

[Gene Heskett]

Greetings all;

git-bisect has more options than a new car.

How, since even the newer, bad code runs thru runtests w/o any problems, 
I need to setup a git bisect start slightly before the 2.8 merge 
started, then bring it up to head=master & bad.

Can someone suggest a starting branch that ideally would start the bisect 
say at 2 weeks prior to the beginning of the 2.8 merge, just to verify 
it did work then?

Cheers, Gene Heskett
-- 
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
If we desire respect for the law, we must first make the law respectable.
 - Louis D. Brandeis
Genes Web page 


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[Phillip Carter]

Yes, that was it, thanks.

> On 20 Jul 2019, at 10:23 am, Chris Morley  wrote:
> 
> If it's just Roberts's stuff in 2.8 you are worried about - it seems to merge 
> cleanly to master  - go for it.
> 
> Chris
> 
> 
> From: Phillip Carter 
> Sent: July 20, 2019 12:02 AM
> To: linuxcnc-developers 
> Subject: Re: [Emc-developers] Git lost
> 
> Sorry, I don’t want to actually do this.
> 
> I was just asking the question because I saw all those commits and I wasn’t 
> sure what to do.
> 
> I really don’t want to break anything...
> 
>> On 20 Jul 2019, at 9:55 am, Chris Morley  wrote:
>> 
>> I too haven't done this exact thing - i have had completely different 
>> changes go into release vrs master, so there was a conflict and I could pick 
>> the right code - big pain.
>> But look at this, I think it covers your use case:
>> https://stackoverflow.com/questions/727994/git-skipping-specific-commits-when-merging
>> 
>> Chris
>> 
>> ____________
>> From: Phillip Carter 
>> Sent: July 19, 2019 11:33 PM
>> To: linuxcnc-developers 
>> Subject: Re: [Emc-developers] Git lost
>> 
>> 
>> 
>>> On 20 Jul 2019, at 12:13 am, andy pugh  wrote:
>>> 
>>> On Fri, 19 Jul 2019 at 10:54, Phillip Carter 
>>> wrote:
>>> 
>>>> Oops, yes, after Tested should be Switched to master
>>> 
>>> 
>>> OK, so you are about to merge some changes that are in 2.8, not in master,
>>> and were not made by you.
>>> 
>> 
>> Correct
>> 
>>> I think that is probably OK. The norm in LinuxCNC is to put changes in the
>>> earliest branch they apply to, and then merge them up. The other things you
>>> see probably do belong in master, and were just sat there waiting for a
>>> merge.
>>> 
>> 
>> OK, thanks
>> 
>>> Is there anything in the list of commits that looks particularly wrong?
>>> 
>> 
>> Not really but I wasn’t really sure of procedure and I don’t want to do the 
>> wrong thing…
>> 
>> What happens in the case that something was meant for 2.8 but not for 
>> master, how is that prevented from being merged up in the future?
>> 
>>> --
>>> atp
>>> "A motorcycle is a bicycle with a pandemonium attachment and is designed
>>> for the especial use of mechanical geniuses, daredevils and lunatics."
>>> — George Fitch, Atlanta Constitution Newspaper, 1916
>>> 
>>> ___
>>> Emc-developers mailing list
>>> Emc-developers@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>> 
>> 
>> 
>> ___
>> Emc-developers mailing list
>> Emc-developers@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>> 
>> ___
>> Emc-developers mailing list
>> Emc-developers@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/emc-developers
> 
> 
> 
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
> 
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[Chris Morley]

If it's just Roberts's stuff in 2.8 you are worried about - it seems to merge 
cleanly to master  - go for it.

Chris


From: Phillip Carter 
Sent: July 20, 2019 12:02 AM
To: linuxcnc-developers 
Subject: Re: [Emc-developers] Git lost

Sorry, I don’t want to actually do this.

I was just asking the question because I saw all those commits and I wasn’t 
sure what to do.

I really don’t want to break anything...

> On 20 Jul 2019, at 9:55 am, Chris Morley  wrote:
>
> I too haven't done this exact thing - i have had completely different changes 
> go into release vrs master, so there was a conflict and I could pick the 
> right code - big pain.
> But look at this, I think it covers your use case:
> https://stackoverflow.com/questions/727994/git-skipping-specific-commits-when-merging
>
> Chris
>
> 
> From: Phillip Carter 
> Sent: July 19, 2019 11:33 PM
> To: linuxcnc-developers 
> Subject: Re: [Emc-developers] Git lost
>
>
>
>> On 20 Jul 2019, at 12:13 am, andy pugh  wrote:
>>
>> On Fri, 19 Jul 2019 at 10:54, Phillip Carter 
>> wrote:
>>
>>> Oops, yes, after Tested should be Switched to master
>>
>>
>> OK, so you are about to merge some changes that are in 2.8, not in master,
>> and were not made by you.
>>
>
> Correct
>
>> I think that is probably OK. The norm in LinuxCNC is to put changes in the
>> earliest branch they apply to, and then merge them up. The other things you
>> see probably do belong in master, and were just sat there waiting for a
>> merge.
>>
>
> OK, thanks
>
>> Is there anything in the list of commits that looks particularly wrong?
>>
>
> Not really but I wasn’t really sure of procedure and I don’t want to do the 
> wrong thing…
>
> What happens in the case that something was meant for 2.8 but not for master, 
> how is that prevented from being merged up in the future?
>
>> --
>> atp
>> "A motorcycle is a bicycle with a pandemonium attachment and is designed
>> for the especial use of mechanical geniuses, daredevils and lunatics."
>> — George Fitch, Atlanta Constitution Newspaper, 1916
>>
>> ___
>> Emc-developers mailing list
>> Emc-developers@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>
>
>
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[Phillip Carter]

Yep, it scared the heck out of me...

> On 20 Jul 2019, at 10:17 am, Chris Morley  wrote:
> 
> So you were wanting to merge just your work and leave the other stuff to be 
> merged later?
> That would be a nice feature - cherry-pick kinda does this but IIRC it can 
> complicate merges later..
> 
> Now you can see why it's nice when a committer merges things right away so 
> they can deal with their own code.
> 
> Chris
> 
> 
> From: Phillip Carter 
> Sent: July 20, 2019 12:02 AM
> To: linuxcnc-developers 
> Subject: Re: [Emc-developers] Git lost
> 
> Sorry, I don’t want to actually do this.
> 
> I was just asking the question because I saw all those commits and I wasn’t 
> sure what to do.
> 
> I really don’t want to break anything...
> 
>> On 20 Jul 2019, at 9:55 am, Chris Morley  wrote:
>> 
>> I too haven't done this exact thing - i have had completely different 
>> changes go into release vrs master, so there was a conflict and I could pick 
>> the right code - big pain.
>> But look at this, I think it covers your use case:
>> https://stackoverflow.com/questions/727994/git-skipping-specific-commits-when-merging
>> 
>> Chris
>> 
>> ________
>> From: Phillip Carter 
>> Sent: July 19, 2019 11:33 PM
>> To: linuxcnc-developers 
>> Subject: Re: [Emc-developers] Git lost
>> 
>> 
>> 
>>> On 20 Jul 2019, at 12:13 am, andy pugh  wrote:
>>> 
>>> On Fri, 19 Jul 2019 at 10:54, Phillip Carter 
>>> wrote:
>>> 
>>>> Oops, yes, after Tested should be Switched to master
>>> 
>>> 
>>> OK, so you are about to merge some changes that are in 2.8, not in master,
>>> and were not made by you.
>>> 
>> 
>> Correct
>> 
>>> I think that is probably OK. The norm in LinuxCNC is to put changes in the
>>> earliest branch they apply to, and then merge them up. The other things you
>>> see probably do belong in master, and were just sat there waiting for a
>>> merge.
>>> 
>> 
>> OK, thanks
>> 
>>> Is there anything in the list of commits that looks particularly wrong?
>>> 
>> 
>> Not really but I wasn’t really sure of procedure and I don’t want to do the 
>> wrong thing…
>> 
>> What happens in the case that something was meant for 2.8 but not for 
>> master, how is that prevented from being merged up in the future?
>> 
>>> --
>>> atp
>>> "A motorcycle is a bicycle with a pandemonium attachment and is designed
>>> for the especial use of mechanical geniuses, daredevils and lunatics."
>>> — George Fitch, Atlanta Constitution Newspaper, 1916
>>> 
>>> ___
>>> Emc-developers mailing list
>>> Emc-developers@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>> 
>> 
>> 
>> ___
>> Emc-developers mailing list
>> Emc-developers@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>> 
>> ___
>> Emc-developers mailing list
>> Emc-developers@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/emc-developers
> 
> 
> 
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
> 
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[Chris Morley]

So you were wanting to merge just your work and leave the other stuff to be 
merged later?
That would be a nice feature - cherry-pick kinda does this but IIRC it can 
complicate merges later..

Now you can see why it's nice when a committer merges things right away so they 
can deal with their own code.

Chris


From: Phillip Carter 
Sent: July 20, 2019 12:02 AM
To: linuxcnc-developers 
Subject: Re: [Emc-developers] Git lost

Sorry, I don’t want to actually do this.

I was just asking the question because I saw all those commits and I wasn’t 
sure what to do.

I really don’t want to break anything...

> On 20 Jul 2019, at 9:55 am, Chris Morley  wrote:
>
> I too haven't done this exact thing - i have had completely different changes 
> go into release vrs master, so there was a conflict and I could pick the 
> right code - big pain.
> But look at this, I think it covers your use case:
> https://stackoverflow.com/questions/727994/git-skipping-specific-commits-when-merging
>
> Chris
>
> 
> From: Phillip Carter 
> Sent: July 19, 2019 11:33 PM
> To: linuxcnc-developers 
> Subject: Re: [Emc-developers] Git lost
>
>
>
>> On 20 Jul 2019, at 12:13 am, andy pugh  wrote:
>>
>> On Fri, 19 Jul 2019 at 10:54, Phillip Carter 
>> wrote:
>>
>>> Oops, yes, after Tested should be Switched to master
>>
>>
>> OK, so you are about to merge some changes that are in 2.8, not in master,
>> and were not made by you.
>>
>
> Correct
>
>> I think that is probably OK. The norm in LinuxCNC is to put changes in the
>> earliest branch they apply to, and then merge them up. The other things you
>> see probably do belong in master, and were just sat there waiting for a
>> merge.
>>
>
> OK, thanks
>
>> Is there anything in the list of commits that looks particularly wrong?
>>
>
> Not really but I wasn’t really sure of procedure and I don’t want to do the 
> wrong thing…
>
> What happens in the case that something was meant for 2.8 but not for master, 
> how is that prevented from being merged up in the future?
>
>> --
>> atp
>> "A motorcycle is a bicycle with a pandemonium attachment and is designed
>> for the especial use of mechanical geniuses, daredevils and lunatics."
>> — George Fitch, Atlanta Constitution Newspaper, 1916
>>
>> ___
>> Emc-developers mailing list
>> Emc-developers@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>
>
>
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[Phillip Carter]

Sorry, I don’t want to actually do this.

I was just asking the question because I saw all those commits and I wasn’t 
sure what to do.

I really don’t want to break anything...

> On 20 Jul 2019, at 9:55 am, Chris Morley  wrote:
> 
> I too haven't done this exact thing - i have had completely different changes 
> go into release vrs master, so there was a conflict and I could pick the 
> right code - big pain.
> But look at this, I think it covers your use case:
> https://stackoverflow.com/questions/727994/git-skipping-specific-commits-when-merging
> 
> Chris
> 
> 
> From: Phillip Carter 
> Sent: July 19, 2019 11:33 PM
> To: linuxcnc-developers 
> Subject: Re: [Emc-developers] Git lost
> 
> 
> 
>> On 20 Jul 2019, at 12:13 am, andy pugh  wrote:
>> 
>> On Fri, 19 Jul 2019 at 10:54, Phillip Carter 
>> wrote:
>> 
>>> Oops, yes, after Tested should be Switched to master
>> 
>> 
>> OK, so you are about to merge some changes that are in 2.8, not in master,
>> and were not made by you.
>> 
> 
> Correct
> 
>> I think that is probably OK. The norm in LinuxCNC is to put changes in the
>> earliest branch they apply to, and then merge them up. The other things you
>> see probably do belong in master, and were just sat there waiting for a
>> merge.
>> 
> 
> OK, thanks
> 
>> Is there anything in the list of commits that looks particularly wrong?
>> 
> 
> Not really but I wasn’t really sure of procedure and I don’t want to do the 
> wrong thing…
> 
> What happens in the case that something was meant for 2.8 but not for master, 
> how is that prevented from being merged up in the future?
> 
>> --
>> atp
>> "A motorcycle is a bicycle with a pandemonium attachment and is designed
>> for the especial use of mechanical geniuses, daredevils and lunatics."
>> — George Fitch, Atlanta Constitution Newspaper, 1916
>> 
>> ___
>> Emc-developers mailing list
>> Emc-developers@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/emc-developers
> 
> 
> 
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
> 
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[Chris Morley]

I too haven't done this exact thing - i have had completely different changes 
go into release vrs master, so there was a conflict and I could pick the right 
code - big pain.
But look at this, I think it covers your use case:
https://stackoverflow.com/questions/727994/git-skipping-specific-commits-when-merging

Chris


From: Phillip Carter 
Sent: July 19, 2019 11:33 PM
To: linuxcnc-developers 
Subject: Re: [Emc-developers] Git lost



> On 20 Jul 2019, at 12:13 am, andy pugh  wrote:
>
> On Fri, 19 Jul 2019 at 10:54, Phillip Carter 
> wrote:
>
>> Oops, yes, after Tested should be Switched to master
>
>
> OK, so you are about to merge some changes that are in 2.8, not in master,
> and were not made by you.
>

Correct

> I think that is probably OK. The norm in LinuxCNC is to put changes in the
> earliest branch they apply to, and then merge them up. The other things you
> see probably do belong in master, and were just sat there waiting for a
> merge.
>

OK, thanks

> Is there anything in the list of commits that looks particularly wrong?
>

Not really but I wasn’t really sure of procedure and I don’t want to do the 
wrong thing…

What happens in the case that something was meant for 2.8 but not for master, 
how is that prevented from being merged up in the future?

> --
> atp
> "A motorcycle is a bicycle with a pandemonium attachment and is designed
> for the especial use of mechanical geniuses, daredevils and lunatics."
> — George Fitch, Atlanta Constitution Newspaper, 1916
>
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[andy pugh]

On Sat, 20 Jul 2019 at 00:35, Phillip Carter 
wrote:

What happens in the case that something was meant for 2.8 but not for
> master, how is that prevented from being merged up in the future?


That's a very good question. And one to which I wish I had the answer

-- 
atp
"A motorcycle is a bicycle with a pandemonium attachment and is designed
for the especial use of mechanical geniuses, daredevils and lunatics."
— George Fitch, Atlanta Constitution Newspaper, 1916

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[Phillip Carter]

> On 20 Jul 2019, at 12:13 am, andy pugh  wrote:
> 
> On Fri, 19 Jul 2019 at 10:54, Phillip Carter 
> wrote:
> 
>> Oops, yes, after Tested should be Switched to master
> 
> 
> OK, so you are about to merge some changes that are in 2.8, not in master,
> and were not made by you.
> 

Correct

> I think that is probably OK. The norm in LinuxCNC is to put changes in the
> earliest branch they apply to, and then merge them up. The other things you
> see probably do belong in master, and were just sat there waiting for a
> merge.
> 

OK, thanks

> Is there anything in the list of commits that looks particularly wrong?
> 

Not really but I wasn’t really sure of procedure and I don’t want to do the 
wrong thing…

What happens in the case that something was meant for 2.8 but not for master, 
how is that prevented from being merged up in the future?

> -- 
> atp
> "A motorcycle is a bicycle with a pandemonium attachment and is designed
> for the especial use of mechanical geniuses, daredevils and lunatics."
> — George Fitch, Atlanta Constitution Newspaper, 1916
> 
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[andy pugh]

On Fri, 19 Jul 2019 at 10:54, Phillip Carter 
wrote:

> Oops, yes, after Tested should be Switched to master


OK, so you are about to merge some changes that are in 2.8, not in master,
and were not made by you.

I think that is probably OK. The norm in LinuxCNC is to put changes in the
earliest branch they apply to, and then merge them up. The other things you
see probably do belong in master, and were just sat there waiting for a
merge.

Is there anything in the list of commits that looks particularly wrong?

-- 
atp
"A motorcycle is a bicycle with a pandemonium attachment and is designed
for the especial use of mechanical geniuses, daredevils and lunatics."
— George Fitch, Atlanta Constitution Newspaper, 1916

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[Phillip Carter]

Oops, yes, after Tested should be Switched to master.Cheers, Phill
 Original message From: andy pugh  Date: 
19/7/19  7:27 pm  (GMT+10:00) To: EMC developers 
 Subject: Re: [Emc-developers] Git lost 
On Fri, 19 Jul 2019 at 08:01, Phillip Carter wrote:> I 
am working on 2.8 locally, I have:> Pulled from origin> Modified some files> 
Committed> Tested> Switched to 2.8> Pulled from origin> Merged 2.8> Now there 
are commits that I am not sure belong in master>Should one of those 2.8s be a 
"master" ?(You seem to have switched to 2.8 from 2.8 in that sequence)-- atp"A 
motorcycle is a bicycle with a pandemonium attachment and is designedfor the 
especial use of mechanical geniuses, daredevils and lunatics."— George Fitch, 
Atlanta Constitution Newspaper, 
1916___Emc-developers mailing 
listEmc-developers@lists.sourceforge.nethttps://lists.sourceforge.net/lists/listinfo/emc-developers
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git lost

[andy pugh]

On Fri, 19 Jul 2019 at 08:01, Phillip Carter 
wrote:

> I am working on 2.8 locally, I have:
> Pulled from origin
> Modified some files
> Committed
> Tested
> Switched to 2.8
> Pulled from origin
> Merged 2.8
> Now there are commits that I am not sure belong in master
>

Should one of those 2.8s be a "master" ?
(You seem to have switched to 2.8 from 2.8 in that sequence)

-- 
atp
"A motorcycle is a bicycle with a pandemonium attachment and is designed
for the especial use of mechanical geniuses, daredevils and lunatics."
— George Fitch, Atlanta Constitution Newspaper, 1916

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] Git lost

[Phillip Carter]

I am working on 2.8 locally, I have:
Pulled from origin
Modified some files
Committed
Tested
Switched to 2.8
Pulled from origin
Merged 2.8
Now there are commits that I am not sure belong in master

I am not sure where to go from here.



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git subtree/submodule useful for Qtvcp/Qtscreen?

[Chris Morley]

From: Sebastian Kuzminsky 

>I have experience with git submodules, and I am very much not a fan.
>submodules are occasionally useful, but it's a suboptimal solution.  My
>main objection is that they introduce additional complexity into the
>project's revision control system, which is already a barrier to entry
>for some developers.

>I'd prefer to find a non-submodules way to make qtvcp/qtscreen work well
>with linuxcnc, be easy for developers to work on, and be easy for users
>to get their hands on.

Excellent I was hoping someone did have some experience
I did read that submodules are a pain, most articles recommended git subtree
https://www.atlassian.com/blog/git/alternatives-to-git-submodule-git-subtree
https://developer.atlassian.com/blog/2015/05/the-power-of-git-subtree/

It seems to indicate that it's simpler:
git subtree does not require users of your repository to learn anything new.
They can ignore the fact that you are using git subtree to manage dependencies.

I'm not sure if this changes your mind or not.


>I don't mind incorporating that history into linuxcnc, if it's
>reasonably confined to the new UI/feature and it doesn't break the build
>(for when we have to bisect history later).

>Does it add new build dependencies?  Runtime dependencies?

>I'd be happy to help incorporate it into our packaging system.

I can't see how it would break the building of linuxcnc.
There are no build time dependency changes.
There are runtime dependencies that I have not added to the Debian list -
I may need some help there - it's been awhile.

I asked this question just because the opportunity is easy now if we wished to 
keep it separate.
It's of course easiest for me if I leave it as it is.
I just wondered if it would be better to have linuxcnc broken up a bit and a 
new VCP would be a start.

Thanks

Chris M



--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git subtree/submodule useful for Qtvcp/Qtscreen?

[Kurt Jacobson]

>
> On 2 July 2018 at 16:17, Kurt Jacobson  wrote:
>
> > But there are other, maybe better, options.. since QtVCP is basically a
> > python package already, it would be straight forward to make it a proper
> > package and put it on PyPi. The advantage of that is that it could be
> > installed with pip install qtvcp and pip would take care of the python
> > dependencies.
>
> I think this expects too much of our user-base. Bear in mind that this
> is a package for machinists, not programmers.
>

You are correct, but QtVCP depends on several packages that are not
installed with LCNC (and probably shouldn't be), so they will have to
install several pip and Debian packages anyway. At least having it as a pip
package would reduce the number they would have to install. If/when LCNC is
migrated to Py3 ALL the QtVCP dependencies (including PyQt5 and QtDesinger
for screen development) could be automatically installed by pip. Currently
since LCNC uses Py2 anybody who wants to design a screen using QtVCP has to
build SIP and PyQt5 from source to get the PyQt5 development libraries that
work with Py2.

On Mon, Jul 2, 2018 at 11:47 AM, andy pugh  wrote:

> On 2 July 2018 at 16:17, Kurt Jacobson  wrote:
>
> > But there are other, maybe better, options.. since QtVCP is basically a
> > python package already, it would be straight forward to make it a proper
> > package and put it on PyPi. The advantage of that is that it could be
> > installed with pip install qtvcp and pip would take care of the python
> > dependencies.
>
> I think this expects too much of our user-base. Bear in mind that this
> is a package for machinists, not programmers.
>
> --
> atp
> "A motorcycle is a bicycle with a pandemonium attachment and is
> designed for the especial use of mechanical geniuses, daredevils and
> lunatics."
> — George Fitch, Atlanta Constitution Newspaper, 1916
>
> 
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git subtree/submodule useful for Qtvcp/Qtscreen?

[andy pugh]

On 2 July 2018 at 16:17, Kurt Jacobson  wrote:

> But there are other, maybe better, options.. since QtVCP is basically a
> python package already, it would be straight forward to make it a proper
> package and put it on PyPi. The advantage of that is that it could be
> installed with pip install qtvcp and pip would take care of the python
> dependencies.

I think this expects too much of our user-base. Bear in mind that this
is a package for machinists, not programmers.

-- 
atp
"A motorcycle is a bicycle with a pandemonium attachment and is
designed for the especial use of mechanical geniuses, daredevils and
lunatics."
— George Fitch, Atlanta Constitution Newspaper, 1916

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git subtree/submodule useful for Qtvcp/Qtscreen?

[Kurt Jacobson]

Chris, I am a very strong proponent of having the UIs live in separate
repositories.
It would keep the LCNC tree cleaner, keep dependencies to a minimum, make
maintenance and development of the UIs more straight froward and would also
allow the UI to have its own issue tracker, which I think would be an
advantage.

One way to do it would be with a git sub-module. Once set up the only
difference would be you'd have to clone linuxcnc with --recurse-submodules.
But there are other, maybe better, options.. since QtVCP is basically a
python package already, it would be straight forward to make it a proper
package and put it on PyPi. The advantage of that is that it could be
installed with pip install qtvcp and pip would take care of the python
dependencies. As it stands you can't run Qtscreen without tracking down and
installing several pip and debian packages anyway, so to some extent you
loose the advantage of it being installed with LCNC, and it may not make
sense to have those packages as dependencies for LCNC as not everybody
would need them.

Another thought, Qtscreen may need to be compiled at some point (recourse
files mainly, but it might make sense to (optionally) compile the UIs too
to speed loading). I have added a makefile to my QtPyVCP branch to do this.
This could be done with the main LCNC makefile but this might get a little
tricky if somebody uses a build bot install of LCNC but wants to design
their own QtVCP UI. Probably the best option would be to have QtVCP check
for source changes on start up and recompile if needed, but if it was a
separate package we could just stay with the makefile approach. make &&
make install is pretty easy even for newbies ...

Cheers,
Kurt

On Mon, Jul 2, 2018 at 5:43 AM, Gene Heskett  wrote:

> On Monday 02 July 2018 01:58:27 Chris Morley wrote:
>
> > In the fairly near future I intend to add Qtvcp/Qtscreen to linuxcnc.
> >
> > This is a python/Qt based virtual control panel similar to gladevcp.
> >
> >
> > I am wondering if keeping the project separate from linuxcnc by using
> > a subtree or sub module is a good idea.
> >
> > I ask this question without knowing very much about this technique.
> >
> >
> > The plus side that I think I see is qtvcp's git history doesn't
> > pollute linuxcnc's, so I am not tempted to squash it all before adding
> > it to linuxcnc.
> >
> > The negative side is more git commands (for me) to learn.
> >
> >
> > Right now the branch qt5vcp_py2 is the most current and is squashed
> > compared to the (almost current) branch qt5_vcp_cleanup for those
> > wanting to see what i am talking of.
> >
> > Ideally I would update qt5_vcp_cleanup, rename it and add it as a
> > subtree - thus keeping all my git history, without adding 150+ commits
> > to linuxcnc.
> >
> >
> > Of course currently qtvcp is not a completely separate project - it
> > uses linuxcnc's makefile system and this branch modifies linuxcnc
> > files that qtvcp uses (such as hal_glib) - maybe this is a problem.
> >
> >
> > Looking for opinions of the idea to begin with.
> >
> >
> As a user, anything that extends what pyvcp can do, by doing more with
> the screen real estate it uses (a major limitation of pyvcp) and will be
> stable in the face of underlying system updates, which pyvcp seems to do
> well and gladevcp hasn't, dying with every gtk update, will be a welcome
> addition to linuxcnc. So I'll pre-thank you for your efforts Chris.
>
> And I look forward to trying it out. Thank you.
>
> > Thanks
> >
> > Chris M
> > --
> > Check out the vibrant tech community on one of the world's
> > most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> > ___
> > Emc-developers mailing list
> > Emc-developers@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/emc-developers
>
>
>
> --
> Cheers, Gene Heskett
> --
> "There are four boxes to be used in defense of liberty:
>  soap, ballot, jury, and ammo. Please use in that order."
> -Ed Howdershelt (Author)
> Genes Web page 
>
> 
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git subtree/submodule useful for Qtvcp/Qtscreen?

[Gene Heskett]

On Monday 02 July 2018 01:58:27 Chris Morley wrote:

> In the fairly near future I intend to add Qtvcp/Qtscreen to linuxcnc.
>
> This is a python/Qt based virtual control panel similar to gladevcp.
>
>
> I am wondering if keeping the project separate from linuxcnc by using
> a subtree or sub module is a good idea.
>
> I ask this question without knowing very much about this technique.
>
>
> The plus side that I think I see is qtvcp's git history doesn't
> pollute linuxcnc's, so I am not tempted to squash it all before adding
> it to linuxcnc.
>
> The negative side is more git commands (for me) to learn.
>
>
> Right now the branch qt5vcp_py2 is the most current and is squashed
> compared to the (almost current) branch qt5_vcp_cleanup for those
> wanting to see what i am talking of.
>
> Ideally I would update qt5_vcp_cleanup, rename it and add it as a
> subtree - thus keeping all my git history, without adding 150+ commits
> to linuxcnc.
>
>
> Of course currently qtvcp is not a completely separate project - it
> uses linuxcnc's makefile system and this branch modifies linuxcnc
> files that qtvcp uses (such as hal_glib) - maybe this is a problem.
>
>
> Looking for opinions of the idea to begin with.
>
>
As a user, anything that extends what pyvcp can do, by doing more with 
the screen real estate it uses (a major limitation of pyvcp) and will be 
stable in the face of underlying system updates, which pyvcp seems to do 
well and gladevcp hasn't, dying with every gtk update, will be a welcome 
addition to linuxcnc. So I'll pre-thank you for your efforts Chris.

And I look forward to trying it out. Thank you.

> Thanks
>
> Chris M
> --
> Check out the vibrant tech community on one of the world's
> most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers



-- 
Cheers, Gene Heskett
--
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
Genes Web page 

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] git subtree/submodule useful for Qtvcp/Qtscreen?

[Chris Morley]

In the fairly near future I intend to add Qtvcp/Qtscreen to linuxcnc.

This is a python/Qt based virtual control panel similar to gladevcp.


I am wondering if keeping the project separate from linuxcnc by using a subtree 
or sub module is a good idea.

I ask this question without knowing very much about this technique.


The plus side that I think I see is qtvcp's git history doesn't pollute 
linuxcnc's, so I am not tempted to squash it all before adding it to linuxcnc.

The negative side is more git commands (for me) to learn.


Right now the branch qt5vcp_py2 is the most current and is squashed compared to 
the (almost current) branch qt5_vcp_cleanup for those wanting to see what i am 
talking of.

Ideally I would update qt5_vcp_cleanup, rename it and add it as a subtree - 
thus keeping all my git history, without adding 150+ commits to linuxcnc.


Of course currently qtvcp is not a completely separate project - it uses 
linuxcnc's makefile system and this branch modifies linuxcnc files that qtvcp 
uses (such as hal_glib) - maybe this is a problem.


Looking for opinions of the idea to begin with.


Thanks

Chris M
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git

[Stuart Stevenson]

Thanks for the replies. I had already blown it away and cloned it again. I
am back where I was before trying to fix it with git. :)

I will try to 'fix' it again in the next couple days.

-- 
Addressee is the intended audience.
If you are not the addressee then my consent is not given for you to read
this email furthermore it is my wish you would close this without saving or
reading, and cease and desist from saving or opening my private
correspondence.
Thank you for honoring my wish.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git

[Alec Ari]

If you still have issues after following seb's instructions, I suggest simply 
recloning if you're new to git.
$ git clone -b 2.7 --single-branch --depth=1 
git://git.linuxcnc.org/git/linuxcnc.git linuxcnc_2.7_new
You'll then automatically be on the 2.7 current stable branch without the 
entire LinuxCNC git history and the commits before it. Should make it more 
difficult to mess something up. From there if you ever want to update, just run 
`git pull` (no quotes)
--single-branch --depth=1 will speed up the time it takes to clone the 
repository as well, especially on slow connections. I had to do that a lot back 
when I was on DSL. Hope this helps!
Alec Ari
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git

[Sebastian Kuzminsky]

On 04/20/2017 12:31 PM, Stuart Stevenson wrote:
> I get this message when running 'git pull' in my 2.7 directory.
>
> this doesn't make sense to me so what is it saying?
>
> enshu@enshu:~/linuxcnc2.7-dev/src$ git status
> # On branch 2.7-ilowpass-fix
> # Your branch is ahead of 'origin/2.7-ilowpass-fix' by 7 commits.
> #
> # Untracked files:
> #   (use "git add ..." to include in what will be committed)
> #
> #../configs/by_machine/enshu_touchy/
> #../debian/linuxcnc-uspace-rtai.files
> #../debian/linuxcnc-uspace-xenomai.files
> #../docs/man/man1/thermistor.1
> #../lib/python/pyui/
> #../scripts/halcmd_twopass
> #config.h.in~
> #emc/usr_intf/touchy/touchy_new.py
> #emc/usr_intf/touchy/touchy_orig.py
> #hal/components/enshutoolchange.comp
> #hal/components/estop_latch2.comp
> #hal/components/gear2.comp
> nothing added to commit but untracked files present (use "git add" to track)

"git pull" means "fetch all the new stuff from the remote server and 
merge it into whatever i have in my working tree", and that's probably 
not what you want in this situation since you're on a short-lived bugfix 
branch (2.7-ilowpass-fix).

Try this instead:

git checkout 2.7
git fetch
git merge --ff-only origin/2.7

The "merge --ff-only" means: if my local 2.7 is in the history of 
origin's 2.7 (ie, if i've made no local commits), then move my 2.7 ahead 
to catch up to origin's 2.7, but if i've made local commits then stop 
and don't change anything.


-- 
Sebastian Kuzminsky

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] git

[Stuart Stevenson]

I get this message when running 'git pull' in my 2.7 directory.

this doesn't make sense to me so what is it saying?

enshu@enshu:~/linuxcnc2.7-dev/src$ git status
# On branch 2.7-ilowpass-fix
# Your branch is ahead of 'origin/2.7-ilowpass-fix' by 7 commits.
#
# Untracked files:
#   (use "git add ..." to include in what will be committed)
#
#../configs/by_machine/enshu_touchy/
#../debian/linuxcnc-uspace-rtai.files
#../debian/linuxcnc-uspace-xenomai.files
#../docs/man/man1/thermistor.1
#../lib/python/pyui/
#../scripts/halcmd_twopass
#config.h.in~
#emc/usr_intf/touchy/touchy_new.py
#emc/usr_intf/touchy/touchy_orig.py
#hal/components/enshutoolchange.comp
#hal/components/estop_latch2.comp
#hal/components/gear2.comp
nothing added to commit but untracked files present (use "git add" to track)




Addressee is the intended audience.
If you are not the addressee then my consent is not given for you to read
this email furthermore it is my wish you would close this without saving or
reading, and cease and desist from saving or opening my private
correspondence.
Thank you for honoring my wish.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] git vulnerability...

[EBo]

I have not seen this go out to the local community:

Vulnerability announced: update your Git clients
https://github.com/blog/1938-git-client-vulnerability-announced

Since a lot of things a few of us do use git/github, it would be a good 
idea for people to update their toolchain as soon as possible...

   EBo --


--
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration  more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git vulnerability...

[Gene Heskett]

On Sunday 21 December 2014 18:40:22 EBo did opine
And Gene did reply:
 I have not seen this go out to the local community:
 
   Vulnerability announced: update your Git clients
 https://github.com/blog/1938-git-client-vulnerability-announced
 
 Since a lot of things a few of us do use git/github, it would be a good
 idea for people to update their toolchain as soon as possible...
 
EBo --

While on the subject, older ntp clients have a huge gaping security hole 
in that a single well formatted packet can own the system instantly.  Just 
announced a day or so back.

The fix is in ntp-4.2.8, but for linux folks it needs to be built with the 
--enable-clockctl configuration option. 

Get it at www.ntp.org.
 
Cheers, Gene Heskett
-- 
There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order.
-Ed Howdershelt (Author)
Genes Web page http://geneslinuxbox.net:6309/gene
US V Castleman, SCOTUS, Mar 2014 is grounds for Impeaching SCOTUS

--
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration  more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git and the man9 folder

[John Thornton]

300Kb of 207.8 Mb... hardly think in today's world anyone would notice 
such a small amount of data. And as Andy pointed out not all are 
generated files.

On 2/26/2014 2:42 PM, Robert Ellenberg wrote:
 Hi All,

 There is a folder called man9 in the docs/man folder:

 linuxcnc-root/docs/man/man9

 As far as I can tell, every file here is generated when building linuxcnc.
 Is this the case? It also seems like many of these .9 files are tracked
 in git. If they are generated on build, then would it hurt anything to slim
 the repo a bit by not tracking the man9 folder?

 Thanks,
 Rob
 --
 Flow-based real-time traffic analytics software. Cisco certified tool.
 Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
 Customize your own dashboards, set traffic alerts and generate reports.
 Network behavioral analysis  security monitoring. All-in-one tool.
 http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk
 ___
 Emc-developers mailing list
 Emc-developers@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/emc-developers


--
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis  security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git and the man9 folder

[andy pugh]

On 26 February 2014 20:42, Robert Ellenberg rwe...@gmail.com wrote:

 linuxcnc-root/docs/man/man9

 As far as I can tell, every file here is generated when building linuxcnc.
 Is this the case?

No, some of them are hand-written.
(Several by me)
Only the manpages that describe comp components are auto-generated, AFAIK.

-- 
atp
If you can't fix it, you don't own it.
http://www.ifixit.com/Manifesto

--
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis  security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git and the man9 folder

[Gene Heskett]

On Wednesday 26 February 2014 16:00:09 Robert Ellenberg did opine:

 Hi All,
 
 There is a folder called man9 in the docs/man folder:
 
 linuxcnc-root/docs/man/man9
 
 As far as I can tell, every file here is generated when building
 linuxcnc. Is this the case? It also seems like many of these .9 files
 are tracked in git. If they are generated on build, then would it hurt
 anything to slim the repo a bit by not tracking the man9 folder?
 
 Thanks,
 Rob

What would be needed then Robert, is some means of tracking changes so that 
any changed pages would still get rebuilt, else things can get stale.

This sort of stale docs stuff can sneak up on us all too easily.

That gets us into the realm of delta rpms which came under discussion 
quite some time back over in the rpm camps, but as a concept it doesn't 
seem to have gained enough traction to have been implemented.  Overworked 
packagers dragging feet etc. I left that camp when I left pclos, so I have 
no clue if that version of rpm has been beat into submission to do what its 
touted to do or not.

However, I am waiting with baited breath, to be able to test your work in 
an update-manager installed LinuxCNC.  And I sure do thank you for your 
efforts in LinuxCNC.

Cheers, Gene
-- 
There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order.
-Ed Howdershelt (Author)
Genes Web page http://geneslinuxbox.net:6309/gene

NOTICE: Will pay 100 USD for an HP-4815A defective but
complete probe assembly.


--
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis  security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git Goofs

[Michael Haberler]

Am 30.09.2011 um 04:09 schrieb Sebastian Kuzminsky:
 ...

 And if that wasnt enough to make you a little weak in the knees and/or 
 dizzy, check out git rebase --interactive.  It lets you rewrite and 
 clean up local history before pushing to the shared repo...  But that'll 
 be the topic for another email, if anyone wants it.

Yes! and both should go on the Wiki to educate us Git-unwashed masses!

that was very helpful.

-m

--
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] Git Goofs

[andy pugh]

What am I doing wrong? I keep pushing trivial merges by accident.

My process is to work in a separate branch, then cherry-pick the
commits into my tracking branch, then push --dry-run and git log to
make sure it looks right, then push.

So, what part of that process is pushing a merge?

-- 
atp
Torque wrenches are for the obedience of fools and the guidance of wise men

--
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] git Push error

[Chris Morley]

When I tried to push today I got an error.

First with dry-run no problem:

chris@chris-aspire-laptop:~/emc2-dev/src$ git push --dry-run
To ssh://cmor...@git.linuxcnc.org/git/emc2.git
   ccc20ad..6692f70  HEAD - v2.5_branch

then with push:

chris@chris-aspire-laptop:~/emc2-dev/src$ git push
Counting objects: 101, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (86/86), done.
Writing objects: 100% (86/86), 72.89 KiB, done.
Total 86 (delta 71), reused 0 (delta 0)
error: insufficient permission for adding an object to repository database 
./objects

fatal: failed to write object
error: unpack failed: unpack-objects abnormal exit
To ssh://cmor...@git.linuxcnc.org/git/emc2.git
 ! [remote rejected] HEAD - v2.5_branch (n/a (unpacker error))
error: failed to push some refs to 'ssh://cmor...@git.linuxcnc.org/git/emc2.git'

Any Idea why ? 

Chris M

  --
BlackBerryreg; DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the 
BlackBerryreg; mobile platform with sessions, labs  more.
See new tools and technologies. Register for BlackBerryreg; DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1 ___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git Push error

[Chris Radek]

On Mon, Sep 19, 2011 at 07:49:27AM +, Chris Morley wrote:
 error: insufficient permission for adding an object to repository database 
 ./objects

Oops, fixed, please try again.


--
BlackBerryreg; DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the 
BlackBerryreg; mobile platform with sessions, labs  more.
See new tools and technologies. Register for BlackBerryreg; DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1 
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] Git oddness

[Chris Radek]

On Fri, Sep 16, 2011 at 12:43:06AM +0100, andy pugh wrote:
 I just pushed a commit and got an odd series of messages (also, there
 was no announcement on #emc-devel)

Fixed, thanks!

--
BlackBerryreg; DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] Git oddness

[andy pugh]

I just pushed a commit and got an odd series of messages (also, there
was no announcement on #emc-devel)
It does look as if the push got through.

Counting objects: 11, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 541 bytes, done.
Total 6 (delta 5), reused 0 (delta 0)
remote: /etc/mail/submit.cf: line 33: unknown configuration line
idivert(0)#  FreeBSD: src/etc/sendmail/freebsd.submit.mc,v
1.5.2.2.2.1 2008/11/25 02:59:29 kensmith Exp   #
remote: /git/emc2.git/hooks/ciabot.pl: sendmail exit status 70
remote: /etc/mail/submit.cf: line 33: unknown configuration line
idivert(0)#  FreeBSD: src/etc/sendmail/freebsd.submit.mc,v
1.5.2.2.2.1 2008/11/25 02:59:29 kensmith Exp   #
error: cannot run hooks/post-receive: No such file or directory
Auto packing the repository for optimum performance.
fatal: protocol error: bad line length character: Remo
error: error in sideband demultiplexer
To ssh://andyp...@git.linuxcnc.org/git/emc2.git
   df93a83..1ef5869  HEAD - v2.5_branch
error: failed to push some refs to
'ssh://andyp...@git.linuxcnc.org/git/emc2.git'
--

Google suggests that error in sideband demultiplexer is not a good sign.

-- 
atp
Torque wrenches are for the obedience of fools and the guidance of wise men

--
BlackBerryreg; DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git: testing a branch for every commit being buildable with git-test-sequence

[seb]

That's cool!

Though may i suggest: '(cd src; make  make test)'

-- 
Sebastian Kuzminsky

- Reply message -
From: Michael Haberler mai...@mah.priv.at
Date: Fri, Feb 25, 2011 04:11
Subject: [Emc-developers] git: testing a branch for every commit being  
buildable with git-test-sequence
To: EMC developers emc-developers@lists.sourceforge.net

this is wrt to a question which came up yesterday on #emc-devel while cradek 
reviewed my candidate branch for revised toolchange support

I had rebased some commits interactively and broken sequencing while doing so 
such that HEAD, but not each commit would build; cradek spotted this

the question came up  wether there's an automatic way to check a branch for 
each commit being buildable.

Well, there is: see http://dustin.github.com/2010/03/28/git-test-sequence.html 
, and the code at https://github.com/dustin/bindir/blob/master/git-test-sequence

use as follows (in this case testing every commit from origin/master to HEAD):

$ git-test-sequence origin/master.. '(cd src;make)'

This will either report 'All's well' or 'Broke on commit' (after running a 
lng time).

here's the output reporting my goof:

emc/task/iotaskintf.cc: In function ‘int emcIoAbort(int)’:
emc/task/iotaskintf.cc:295: error: ‘class EMC_TOOL_ABORT’ has no member named 
‘reason’
emc/task/iotaskintf.cc:300: error: ‘emcAbortCleanup’ was not declared in this 
scope
make: *** [objects/emc/task/iotaskintf.o] Error 1
make: Leaving directory `/home/mah/emc2-dev/src'
Broke on e0d97a110a5ab7a039d592b2874899f2c6a9f7ed
Switched to branch 'iocontrolv2-toolchange-gcode-osub-candidate'
Deleted branch test_seq_13248 (was e0d97a1).

-

-mah

ps: I had to fix 
. $(git --exec-path)/git-sh-setup
#. git-sh-setup


--
Free Software Download: Index, Search  Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev 
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
--
Free Software Download: Index, Search  Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev ___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git workflow question

[Chris Morley]

 One answer that comes to mind is to remember this, and on the master
 branch revert the commit after the merge that introduces it.
 
 X--o--A--o--o [v2.4_branch]
  \\
   o--o--o--M--A' [master]
 
 X represents the place where we branched 2.4, A represents the change
 to disable incomplete pncconf features, and A' represents the revert of
 A.  (Optionally, squash A' into M so that they're a single commit)
 

So this is what I did and it worked fine. Thanks.
next question.
When 2.4 is merged to master again will I have to do it again?
Truthfully I don't understand why we merge 2.4 to master.
Is this a temporary thing, done untill 2.4 is released? 

Chris M
 
  
_

--
Download Intel#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git workflow question

[Jeff Epler]

On Sun, Feb 21, 2010 at 08:44:05PM +, Chris Morley wrote:
 
 
 
  One answer that comes to mind is to remember this, and on the master
  branch revert the commit after the merge that introduces it.
  
  X--o--A--o--o [v2.4_branch]
   \\
o--o--o--M--A' [master]
  
  X represents the place where we branched 2.4, A represents the change
  to disable incomplete pncconf features, and A' represents the revert of
  A.  (Optionally, squash A' into M so that they're a single commit)
  
 
 So this is what I did and it worked fine. Thanks.
 next question.
 When 2.4 is merged to master again will I have to do it again?

No, and here's why.  After the next merge, the new history will look
like
X--o--A--Y--o--o--Z [v2.4_branch]
 \\ \
  o--o--o--M--A'--o--M2 [master]

The common ancestor of v2.4_branch and master is now Y, not X, so git
only considers changes from Y to Z at the next merge, so the problematic
commit A isn't in the list.  (git determines this automatically

 Truthfully I don't understand why we merge 2.4 to master.
 Is this a temporary thing, done untill 2.4 is released? 

While I'm open to others' opinions about this--as well as the reality of
whether merges generally go smoothly or not--I hope to continue the
practice.  Except in rare cases, we want to fix the same bugs in master
as we want to do in v2.4_branch.  Unless the specific part of the
software being fixed has changed radically in master, the same bugfix is
likely to be applicable in both places (and when it's not, git almost
always detects this fact, the merge conflict).  Many git-based
projects have adopted this practice, most notably the git project
itself.

Eventually, v2.4 and master will be so different that merges will
usually fail, instead of usually working (for instance, if the
joints_axes3 branch is merged into master, then any jogging-related
changes in v2.4_branch are unlikely to merge cleanly into master anymore).
When the pain of this gets too great, we'll have to switch strategies
(for example, to cherry pick some fixes and manually rewrite others), or
(after 2.5 is released) abandon v2.4 and no longer make bugfixes there.

Jeff

--
Download Intel#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git workflow question

[Chris Morley]

 
 The common ancestor of v2.4_branch and master is now Y, not X, so git
 only considers changes from Y to Z at the next merge, so the problematic
 commit A isn't in the list.  (git determines this automatically

I had hoped it was smart like that ! great

 
  Truthfully I don't understand why we merge 2.4 to master.
  Is this a temporary thing, done untill 2.4 is released? 
 
 While I'm open to others' opinions about this--as well as the reality of
 whether merges generally go smoothly or not--I hope to continue the
 practice.  Except in rare cases, we want to fix the same bugs in master
 as we want to do in v2.4_branch.  Unless the specific part of the
 software being fixed has changed radically in master, the same bugfix is
 likely to be applicable in both places (and when it's not, git almost
 always detects this fact, the merge conflict).  Many git-based
 projects have adopted this practice, most notably the git project
 itself.

What is the advantage of merging over cherry picking other then
cherry picking requires more intervention? 
Who will decide when it will be merged (I would assume you)? 
and by what criteria?  
I just can't get my head around the advantage of putting fixes in
2.4 then eventually into master. It would seem to better to put
fixes in master let some people use them then put them in 2.4.
unless of course it is something obvious (eg typo) or something
that just belongs in 2.4, in which case you don't want to merge 
it to master anyways.

for instance there is the commit you added to 2.4 that allows
python users to know the kernel version needed for realtime.
I need that in master to add the tests I added to 2.4.
now I think I could cherry pick the kernel version commit
and the tests into master now or wait till 2.4 is merged in master.
Probably my biggest problem is I am not fluent in git.
I know enough to do my everyday stuff and read your cheat
sheets when I need to do something unusual (to me).

Anyways thanks for explaining. I will keep my mind open and
see what happens.

Chris M



  
_
Check your Hotmail from your phone.
http://go.microsoft.com/?linkid=9708121--
Download Intel#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git workflow question

[Jeff Epler]

That's a good question, and I don't immediately have the right answer.

One answer that comes to mind is to remember this, and on the master
branch revert the commit after the merge that introduces it.

X--o--A--o--o [v2.4_branch]
 \\
  o--o--o--M--A' [master]

X represents the place where we branched 2.4, A represents the change
to disable incomplete pncconf features, and A' represents the revert of
A.  (Optionally, squash A' into M so that they're a single commit)

Another answer is to remember this, and do something special at the next
merge:
X--o--A--o--o [v2.4_branch]
 \  \  \  
  o--M1-M2--o [master]

M1 is a merge done from the last commit before A.  It is done like a
normal merge.  M2 is done immediately after M1 but uses the ours merge
strategy, so that none of the changes introduced by A are in M2.

I'll do a bit more googling because I'm sure there are other ways, and
maybe there's a better one.

Jeff

--
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] git workflow question

[Chris Morley]

 At this point we may want to investigate some of the workflows suggested
 in the gitworkflows[1] document.  Specifically, here's how we can use
 topic branches, integration branches and merging upwards to put safe new
 features in 2.4.x after they're proven on master:
 

pncconf in 2.4 will need some features disabled.
In master I wish to continue to develop them, obviously.
 
How do I handle this with out messing up future merges 
from trunk to 2.4 ? 

Thanks 

Chris M
  
_
Check your Hotmail from your phone.
http://go.microsoft.com/?linkid=9708121--
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git workflow question

[Alexey Starikovskiy]

You may find stgit useful.

Regards,
Alex.

Chris Morley пишет:

  At this point we may want to investigate some of the workflows suggested
  in the gitworkflows[1] document. Specifically, here's how we can use
  topic branches, integration branches and merging upwards to put safe new
  features in 2.4.x after they're proven on master:
 

 pncconf in 2.4 will need some features disabled.
 In master I wish to continue to develop them, obviously.
  
 How do I handle this with out messing up future merges
 from trunk to 2.4 ?

 Thanks

 Chris M

 
 Live connected with Hotmail on your phone. Learn more.
 http://go.microsoft.com/?linkid=9708117
 

 --
 SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
 Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
 http://p.sf.net/sfu/solaris-dev2dev
 

 ___
 Emc-developers mailing list
 Emc-developers@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/emc-developers
   


--
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] git repository down?

[Michael Buesch]

Is the git repository down?
I always get The remote end hung up unexpectedly when trying to pull.

-- 
Greetings, Michael.

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git repository down?

[Michael Buesch]

On Monday 09 November 2009 23:02:31 Chris Radek wrote:
 On Mon, Nov 09, 2009 at 10:37:59PM +0100, Michael Buesch wrote:
  Is the git repository down?
  I always get The remote end hung up unexpectedly when trying to pull.
 
 It was down for about 10 minutes due to a power problem.  It is fixed
 now.

Doh, and I hit this ten minute window. :D

Thanks a lot Chris!


-- 
Greetings, Michael.

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git repository down?

[Michael Buesch]

On Monday 09 November 2009 23:11:52 Michael Buesch wrote:
 On Monday 09 November 2009 23:02:31 Chris Radek wrote:
  On Mon, Nov 09, 2009 at 10:37:59PM +0100, Michael Buesch wrote:
   Is the git repository down?
   I always get The remote end hung up unexpectedly when trying to pull.
  
  It was down for about 10 minutes due to a power problem.  It is fixed
  now.
 
 Doh, and I hit this ten minute window. :D
 
 Thanks a lot Chris!
 
 

Hm, I do still get it.
Routing to the machine seems to work, however. I can ping and traceroute it.

m...@homer:~/develop/git/emc2$ git pull
fatal: The remote end hung up unexpectedly
Cannot get the repository state from git://git.linuxcnc.org/git/emc2.git

-- 
Greetings, Michael.

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git repository down?

[Chris Radek]

On Mon, Nov 09, 2009 at 11:14:41PM +0100, Michael Buesch wrote:
 
 Hm, I do still get it.
 Routing to the machine seems to work, however. I can ping and traceroute it.
 
 m...@homer:~/develop/git/emc2$ git pull
 fatal: The remote end hung up unexpectedly
 Cannot get the repository state from git://git.linuxcnc.org/git/emc2.git

Sorry, I checked ssh git access, but not git://.  Both are working now.

Chris

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git repository down?

[Michael Buesch]

On Monday 09 November 2009 23:19:06 Chris Radek wrote:
 On Mon, Nov 09, 2009 at 11:14:41PM +0100, Michael Buesch wrote:
  
  Hm, I do still get it.
  Routing to the machine seems to work, however. I can ping and traceroute it.
  
  m...@homer:~/develop/git/emc2$ git pull
  fatal: The remote end hung up unexpectedly
  Cannot get the repository state from git://git.linuxcnc.org/git/emc2.git
 
 Sorry, I checked ssh git access, but not git://.  Both are working now.

I can confirm that. Thanks a lot!

-- 
Greetings, Michael.

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git questions

[Jeff Epler]

On Thu, Jul 02, 2009 at 04:09:22AM +, Chris Morley wrote:
 It does seem to promote waiting to push until
 something is quite far along - not sure if thats
 goos or bad. Good cause trunk is more stable
 bad cause you could get along ways before
 you find out about problems from interaction
 of other's work. I'll be interesting to see
 how it changes development.

If you want to share work earlier than when it's ready to go on 'master'
there are lots of options.

You can push the branch to git.linuxcnc.org, and then collaborate with
others on it.

You can use 'git format-patch' to create a bunch of patch-emails to send
to the list for discussion.

You can create a repository on a free site like github or gitorious,
push your work there, and tell others where it is so that they can pull
it.

And, yes, you can work on it privately a lot easier too, committing work
as you see fit but only pushing to master when it's time.

Jeff

--
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] git questions

[Chris Morley]

Is there anyway to push a specific file with 
out pushing other already committed files?
Also how does one diff already committed files 
to whats in master so i can confirm the changes
before pushing. (is that git diff --cached)

in cvs i could modify all kinds of files and then 
commit (push in git talk) only the file I wanted.
in git I have committed a bunch of stuff that I 
don't want to push yet but I do want to push 
two other files. I could reset then commit the
 two files and push but won't that lose all my 
commit history?

Thanks for any advice.

Chris M

_
Windows Live helps you keep up with all your friends, in one place.
http://go.microsoft.com/?linkid=9660826--
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git questions

[Jeff Epler]

On Thu, Jul 02, 2009 at 01:55:18AM +, Chris Morley wrote:
 Is there anyway to push a specific file with 
 out pushing other already committed files?

Go ahead and commit the last bit of work, so that your tree is clean
according to 'git status'

(Before continuing with these instructions, feel free to make a full
copy of your checkout; git is unlikely to lose information, even if you
type something wrong, but it's entirely possible that I've botched one
of the commands and it won't turn out like I expect .. a copy is a nice
bit of extra insurance)

Turn your current work into a (local) branch:
git branch my-branch-name
the work on this branch will remain private to you until you make it
otherwise.  this branch will have all the work on it that you committed
so far.

At each step, it'll be helpful to look at the top of 'gitk --all', to
see where each branch is pointing.   Right now, you'll see master and
my-branch-name both pointing at the top, and master/origin somewhere
further down.

Next, move master back to origin/master:
git reset --hard origin/master
in gitk, master and origin/master now point to the same place, but
my-branch-name stayed where it is.

Now, you can 'cherry-pick' the change you wanted and make it on master.
Find its hex identifier in gitk or git log, and then give it as the
argument to cherry-pick:
git cherry-pick 884c0a154
After this, gitk will show a Y-shaped history, with the commit you just
chose on master and all your commits on my-branch-name.  One commit
on each arm of the Y will have the same commit message and diff.  Don't
worry, git generally handles this just fine when you merge later.

At this point, you can 'git push origin master' to send the change you
just cherry-picked, and nothing else.

To continue working on the work you were doing before, you have two
choices:  Choice 1 is to
git merge my-branch-name
git branch -d my-branch-name
this turns the Y shape into the diamond shape of a merge, then gets
rid of my-branch-name because it's not needed anymore.

Choice 2 is to
git checkout my-branch-name
and work on your not-ready-to-share work there.  (you can switch freely
between my-branch-name and master with 'git checkout' as long as your
tree is clean)  If you think it will be awhile before the work is ready
to share, this is a good idea.  From time to time you can
git fetch; git merge origin/master
to keep up to date with other changes.  When your work is ready to
share, switch back to master and merge the other way:
git checkout master
git merge my-branch-name
git branch -d my-branch-name

 Also how does one diff already committed files 
 to whats in master so i can confirm the changes
 before pushing.

To view what would be pushed, assuming you're on master and would push
to origin/master which is behind you (not needing to be merged):
git log master..origin/master
you can include the -p flag if you like to view diffs, or other flags
mentioned in the git docs.

You can also use
git push --dry-run
to get a summary of what would happen if you pushed now, but I don't
find the summary info very useful (aside from telling you if it would be
rejected because of somebody else's changes)

 (is that git diff --cached)
The purpose of 'git diff --cached' is to show you the differences
between the last commit and the changes you've staged with 'git add'.

Jeff

--
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] git questions

[Chris Morley]

 Date: Wed, 1 Jul 2009 22:17:38 -0500
 From: jep...@unpythonic.net
 To: emc-developers@lists.sourceforge.net
 Subject: Re: [Emc-developers] git questions
 
 On Thu, Jul 02, 2009 at 01:55:18AM +, Chris Morley wrote:
  Is there anyway to push a specific file with 
  out pushing other already committed files?
 
 Go ahead and commit the last bit of work, so that your tree is clean
 according to 'git status'
 
 (Before continuing with these instructions, feel free to make a full
 copy of your checkout; git is unlikely to lose information, even if you
 type something wrong, but it's entirely possible that I've botched one
 of the commands and it won't turn out like I expect .. a copy is a nice
 bit of extra insurance)

Thanks Jeff, I appreciate the example .
I will put it to use.
I can see git is very powerful.   
It does seem to promote waiting to push until
something is quite far along - not sure if thats
goos or bad. Good cause trunk is more stable
bad cause you could get along ways before
you find out about problems from interaction
of other's work. I'll be interesting to see
how it changes development.

Chris M

_
We are your photos. Share us now with Windows Live Photos.
http://go.microsoft.com/?linkid=9666047--
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers