Hey all, this was an incorrect merge of master into the 2.6 branch.
I used push --force to revert 2.6 to where it was before the merge.
This means if you pulled the 2.6 branch in about the last hour, your
next pull will not be a fast-forward, and you may have to use
git pull --force or similar.
Just a reminder: we use the "merging upwards" work flow (see the man
page gitworkflows). In particular I think this incorrect merge came
from a situation it describes [where it says "maint" read "2.6"]:
If you notice that you have applied a fix to e.g. master
that is also required in maint, you will need to cherry-pick
it (using git-cherry-pick(1)) downwards. This will happen a
few times and is nothing to worry about unless you do it
very frequently.
On Sun, Apr 13, 2014 at 08:53:10PM +0000, gmoccapy wrote:
> Merge branch '2.6' of ssh://norb...@git.linuxcnc.org/git/linuxcnc.git into 2.6
>
>
>
> http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=6648df3
>
>
> debian/configure | 4 +
> debian/control.in | 4 +-
> docs/html/gcode.html | 5 +
> docs/html/gcode_fr.html | 5 +
> docs/man/man9/hostmot2.9 | 51 +-
> docs/src/common/Getting_EMC_es.txt | 6 +-
> docs/src/common/starting-emc.txt | 2 +-
> docs/src/config/ini_config.txt | 13 +-
> docs/src/config/ini_config_es.txt | 2 +-
> docs/src/config/ini_homing_fr.txt | 6 +-
> docs/src/gcode/coordinates_fr.txt | 16 +-
> docs/src/gcode/gcode_fr.txt | 590 +++++------
> docs/src/gcode/m-code_fr.txt | 464 ++++++--
> docs/src/gcode/machining_center_fr.txt | 10 +-
> docs/src/gcode/o-code_fr.txt | 80 +-
> docs/src/gcode/other-code_fr.txt | 22 +-
> docs/src/gcode/overview.txt | 9 +-
> docs/src/gcode/overview_fr.txt | 525 +++++++---
> docs/src/gcode/tool_compensation_fr.txt | 46 +-
> docs/src/hal/canonical-devices_es.txt | 5 +-
> docs/src/hal/parallel_port.txt | 2 +-
> docs/src/hal/parallel_port_es.txt | 4 +-
> docs/src/hal/rtcomps.txt | 7 +-
> docs/src/hal/rtcomps_es.txt | 323 ++++--
> src/hal/components/thc.comp | 2 +-
> src/hal/drivers/mesa-hostmot2/encoder.c | 92 +-
> src/hal/drivers/mesa-hostmot2/hm2_pci.c | 23 +
> src/hal/drivers/mesa-hostmot2/hm2_pci.h | 2 +
> src/hal/drivers/mesa-hostmot2/hostmot2.c | 5 +
> src/hal/drivers/mesa-hostmot2/hostmot2.h | 15 +
> src/hal/drivers/mesa-hostmot2/stepgen.c | 1 +
> src/po/it.po | 1691
> +++++++++++++-----------------
> 32 files changed, 2277 insertions(+), 1755 deletions(-)
------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
