Back
[08:49:29] <KGB-linuxcnc> 03Norbert Schechner 052.6 bfbef61 06linuxcnc 10lib/python/gladevcp/hal_gremlin.py hal_gremlin - Emit signal in case of gcode error * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=bfbef61
[09:08:01] <KGB-linuxcnc> 03Norbert Schechner 052.7 6096b1b 06linuxcnc 10src/hal/user_comps/xhc-hb04.cc 03src/hal/utils/halcompile.g Merge branch '2.6' into 2.7 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=6096b1b
[09:10:51] <norbert__> Oh, I did it again, Sorry, but I just pushed a change to 2.6, than I tried to merge my 2.6 branch to my 2.7 branch and instead of getting this right done, I created two files. I do not know how that happened, as I did before pushing git push --dry-run and did not get any strange stuff. Could someone reset the 2.7 branch please.
[09:17:17] <KGB-linuxcnc> 03Norbert Schechner 052.6 230c23a 06linuxcnc 10src/emc/usr_intf/gmoccapy/gmoccapy.glade 10src/emc/usr_intf/gmoccapy/gmoccapy.py 10src/emc/usr_intf/gmoccapy/release_notes.txt gmoccapy_1_3_5 - report about gcode errors * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=230c23a
[09:18:24] <norbert__> Please do merge 2.6 to 2.7 and to master
[09:18:48] <norbert__> I do not know why I get strange files doing that.
[11:16:52] <cradek> norbert__: I don't see anything wrong, I think your merge was in the right direction. You only merged one of your changes though - I think you meant to merge both commits.
[11:16:58] <cradek> I'm pushing a full merge for you
[11:18:00] <KGB-linuxcnc> 03Chris Radek 052.7 f2b7810 06linuxcnc Merge branch '2.6' into 2.7 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=f2b7810
[11:18:00] <KGB-linuxcnc> 03Chris Radek 05master eff27b5 06linuxcnc 10scripts/linuxcnc.in Merge branch '2.7' * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=eff27b5
[11:48:14] <norbert__> cradek: I am surprised, because when I merged 2.6 into 2.7 the merge shows two changed files "xhc-hb04.cc" and "halcompile.g". The strange is, that I never touched theese files. That was the reason for my doubts.
[11:49:00] <norbert__> cradek: Thanks anyway for your help. I did not merge the second push, because I thought having made an error with the first one allready.
[11:50:43] <norbert__> Same happened when you merged 2.7 to master, why is there a changes file "linuxcnc.in" ? That is the stuff i do not understand.
[11:53:27] <mozmck> norbert__: I changed xhc-hb04.cc a day or two ago on 2.6
[11:53:45] <mozmck> so a merge would include that change I'm sure...
[11:58:03] <norbert__> but i did git reset --hard origin/2.6 and git clean -f -x -d before making the changes and pushing that ones, so my repos should be up to date, before a push.
[12:00:41] <mozmck> Yes, and the change I made on 2.6 had not been merged into 2.7 yet, so that makes sense.
[13:04:20] <KGB-linuxcnc> 03Sebastian Kuzminsky 052.6 7d2abee 06linuxcnc 10docs/man/man3/hal_init.3hal docs: fix inaccuracies in hal_init manpage * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=7d2abee
[13:04:56] <KGB-linuxcnc> 03Sebastian Kuzminsky 052.7 00029a1 06linuxcnc Merge remote-tracking branch 'origin/2.6' into 2.7 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=00029a1
[13:48:29] <skunkworks> http://www.linuxcnc.org/index.php/english/forum/10-advanced-configuration/27368-new-trajectory-planner-testersprograms-wanted?start=200#54306