john@cave:~$ cd emc-dev
john@cave:~/emc-dev$ git branch
  2.6
  2.7
* 2.7_Docs
  master
john@cave:~/emc-dev$ git fetch origin
remote: Counting objects: 862, done.
remote: Compressing objects: 100% (196/196), done.
remote: Total 740 (delta 580), reused 687 (delta 536)
Receiving objects: 100% (740/740), 97.57 KiB | 169 KiB/s, done.
Resolving deltas: 100% (580/580), completed with 55 local objects.
From ssh://git.linuxcnc.org/git/emc2
   cda45fe..c277688  2.6        -> origin/2.6
   753e7c1..36480be  2.7        -> origin/2.7
 + c92f0d2...9e5cb86 liblinuxcnc-ui -> origin/liblinuxcnc-ui  (forced update)
   4c0ce18..65603e7  master     -> origin/master
john@cave:~/emc-dev$ git checkout 2.7
Switched to branch '2.7'
Your branch is behind 'origin/2.7' by 12 commits, and can be fast-forwarded.
john@cave:~/emc-dev$ git merge --ff-only origin/2.7
Updating e944466..36480be
Fast-forward
 debian/configure                                   |   32 ++-
 debian/control.in                                  |    3 +-
 docs/src/common/User_Concepts.txt                  |    2 +
 docs/src/drivers/GM.txt                            |    2 +-
 docs/src/gcode/m-code.txt                          |    2 +-
 docs/src/hal/rtcomps.txt                           |    2 +-
 lib/python/gladevcp/hal_sourceview.py              |   12 +-
 src/emc/iotask/ioControl.cc                        |    7 +-
 tests/io-startup/.gitignore                        |    2 +
 tests/io-startup/checkresult                       |    2 +
 tests/io-startup/core_sim.hal                      |   53 +++++
 .../io-startup/nonrandom/no-tool-in-P0/checkresult |    1 +
 .../no-tool-in-P0/expected-startup-tool-number     |    1 +
 tests/io-startup/nonrandom/no-tool-in-P0/test.ini  |    1 +
 tests/io-startup/nonrandom/no-tool-in-P0/test.sh   |    1 +
 .../nonrandom/no-tool-in-P0/tool.tbl.original      |    3 +
 tests/io-startup/nonrandom/test.ini                |   81 +++++++
 tests/io-startup/nonrandom/tool-in-P0/checkresult  |    1 +
 .../tool-in-P0/expected-startup-tool-number        |    1 +
 tests/io-startup/nonrandom/tool-in-P0/test.ini     |    1 +
 tests/io-startup/nonrandom/tool-in-P0/test.sh      |    1 +
 .../nonrandom/tool-in-P0/tool.tbl.original         |    3 +
 tests/io-startup/postgui.hal                       |    4 +
 tests/io-startup/random/no-tool-in-P0/checkresult  |    1 +
 .../no-tool-in-P0/expected-startup-tool-number     |    1 +
 tests/io-startup/random/no-tool-in-P0/test.ini     |    1 +
 tests/io-startup/random/no-tool-in-P0/test.sh      |    1 +
 .../random/no-tool-in-P0/tool.tbl.original         |    3 +
 tests/io-startup/random/test.ini                   |   81 +++++++
 tests/io-startup/random/tool-in-P0/checkresult     |    1 +
 .../random/tool-in-P0/expected-startup-tool-number |    1 +
 tests/io-startup/random/tool-in-P0/test.ini        |    1 +
 tests/io-startup/random/tool-in-P0/test.sh         |    1 +
 .../io-startup/random/tool-in-P0/tool.tbl.original |    3 +
 tests/io-startup/shared-test.sh                    |    8 +
 tests/io-startup/test-ui.py                        |  220 ++++++++++++++++++++
 36 files changed, 513 insertions(+), 28 deletions(-)
 create mode 100644 tests/io-startup/.gitignore
 create mode 100755 tests/io-startup/checkresult
 create mode 100644 tests/io-startup/core_sim.hal
 create mode 120000 tests/io-startup/nonrandom/no-tool-in-P0/checkresult
 create mode 100644 tests/io-startup/nonrandom/no-tool-in-P0/expected-startup-tool-number
 create mode 120000 tests/io-startup/nonrandom/no-tool-in-P0/test.ini
 create mode 120000 tests/io-startup/nonrandom/no-tool-in-P0/test.sh
 create mode 100644 tests/io-startup/nonrandom/no-tool-in-P0/tool.tbl.original
 create mode 100644 tests/io-startup/nonrandom/test.ini
 create mode 120000 tests/io-startup/nonrandom/tool-in-P0/checkresult
 create mode 100644 tests/io-startup/nonrandom/tool-in-P0/expected-startup-tool-number
 create mode 120000 tests/io-startup/nonrandom/tool-in-P0/test.ini
 create mode 120000 tests/io-startup/nonrandom/tool-in-P0/test.sh
 create mode 100644 tests/io-startup/nonrandom/tool-in-P0/tool.tbl.original
 create mode 100644 tests/io-startup/postgui.hal
 create mode 120000 tests/io-startup/random/no-tool-in-P0/checkresult
 create mode 100644 tests/io-startup/random/no-tool-in-P0/expected-startup-tool-number
 create mode 120000 tests/io-startup/random/no-tool-in-P0/test.ini
 create mode 120000 tests/io-startup/random/no-tool-in-P0/test.sh
 create mode 100644 tests/io-startup/random/no-tool-in-P0/tool.tbl.original
 create mode 100644 tests/io-startup/random/test.ini
 create mode 120000 tests/io-startup/random/tool-in-P0/checkresult
 create mode 100644 tests/io-startup/random/tool-in-P0/expected-startup-tool-number
 create mode 120000 tests/io-startup/random/tool-in-P0/test.ini
 create mode 120000 tests/io-startup/random/tool-in-P0/test.sh
 create mode 100644 tests/io-startup/random/tool-in-P0/tool.tbl.original
 create mode 100755 tests/io-startup/shared-test.sh
 create mode 100755 tests/io-startup/test-ui.py
john@cave:~/emc-dev$ git checkout 2.7_Docs
Switched to branch '2.7_Docs'
john@cave:~/emc-dev$ man git merge
john@cave:~/emc-dev$ git merge 2.7
Merge made by the 'recursive' strategy.
 debian/configure                                       |   32 ++-
 debian/control.in                                      |    3 +-
 docs/src/common/User_Concepts.txt                      |    2 +
 docs/src/drivers/GM.txt                                |    2 +-
 docs/src/gcode/m-code.txt                              |    2 +-
 docs/src/hal/haltcl.txt                                |   41 +++-
 docs/src/hal/rtcomps.txt                               |    2 +-
 lib/python/gladevcp/hal_sourceview.py                  |   12 +-
 src/emc/iotask/ioControl.cc                            |    7 +-
 src/emc/tp/tp.c                                        |    2 +-
 src/emc/usr_intf/gmoccapy/getiniinfo.py                |    9 +
 src/emc/usr_intf/gmoccapy/gmoccapy.py                  |   58 +++++-
 src/emc/usr_intf/gmoccapy/release_notes.txt            |   11 ++
 src/emc/usr_intf/stepconf/stepconf.py                  |   56 ++++--
 src/emc/usr_intf/touchy/mdi.py                         |   15 +-
 src/hal/hal_lib.c                                      |   53 ++---
 src/hal/hal_priv.h                                     |    6 +-
 src/hal/utils/halcmd_commands.c                        |   37 +++-
 src/hal/utils/halrmt.c                                 |   27 ++-
 tests/io-startup/.gitignore                            |    2 +
 tests/io-startup/checkresult                           |    2 +
 tests/io-startup/core_sim.hal                          |   53 +++++
 tests/io-startup/nonrandom/no-tool-in-P0/checkresult   |    1 +
 .../no-tool-in-P0/expected-startup-tool-number         |    1 +
 tests/io-startup/nonrandom/no-tool-in-P0/test.ini      |    1 +
 tests/io-startup/nonrandom/no-tool-in-P0/test.sh       |    1 +
 .../nonrandom/no-tool-in-P0/tool.tbl.original          |    3 +
 tests/io-startup/nonrandom/test.ini                    |   81 ++++++++
 tests/io-startup/nonrandom/tool-in-P0/checkresult      |    1 +
 .../nonrandom/tool-in-P0/expected-startup-tool-number  |    1 +
 tests/io-startup/nonrandom/tool-in-P0/test.ini         |    1 +
 tests/io-startup/nonrandom/tool-in-P0/test.sh          |    1 +
 .../io-startup/nonrandom/tool-in-P0/tool.tbl.original  |    3 +
 tests/io-startup/postgui.hal                           |    4 +
 tests/io-startup/random/no-tool-in-P0/checkresult      |    1 +
 .../random/no-tool-in-P0/expected-startup-tool-number  |    1 +
 tests/io-startup/random/no-tool-in-P0/test.ini         |    1 +
 tests/io-startup/random/no-tool-in-P0/test.sh          |    1 +
 .../io-startup/random/no-tool-in-P0/tool.tbl.original  |    3 +
 tests/io-startup/random/test.ini                       |   81 ++++++++
 tests/io-startup/random/tool-in-P0/checkresult         |    1 +
 .../random/tool-in-P0/expected-startup-tool-number     |    1 +
 tests/io-startup/random/tool-in-P0/test.ini            |    1 +
 tests/io-startup/random/tool-in-P0/test.sh             |    1 +
 tests/io-startup/random/tool-in-P0/tool.tbl.original   |    3 +
 tests/io-startup/shared-test.sh                        |    8 +
 tests/io-startup/test-ui.py                            |  220 +++++++++++++++++++++
 tests/save.0/expected                                  |    2 +
 48 files changed, 775 insertions(+), 83 deletions(-)
 create mode 100644 tests/io-startup/.gitignore
 create mode 100755 tests/io-startup/checkresult
 create mode 100644 tests/io-startup/core_sim.hal
 create mode 120000 tests/io-startup/nonrandom/no-tool-in-P0/checkresult
 create mode 100644 tests/io-startup/nonrandom/no-tool-in-P0/expected-startup-tool-number
 create mode 120000 tests/io-startup/nonrandom/no-tool-in-P0/test.ini
 create mode 120000 tests/io-startup/nonrandom/no-tool-in-P0/test.sh
 create mode 100644 tests/io-startup/nonrandom/no-tool-in-P0/tool.tbl.original
 create mode 100644 tests/io-startup/nonrandom/test.ini
 create mode 120000 tests/io-startup/nonrandom/tool-in-P0/checkresult
 create mode 100644 tests/io-startup/nonrandom/tool-in-P0/expected-startup-tool-number
 create mode 120000 tests/io-startup/nonrandom/tool-in-P0/test.ini
 create mode 120000 tests/io-startup/nonrandom/tool-in-P0/test.sh
 create mode 100644 tests/io-startup/nonrandom/tool-in-P0/tool.tbl.original
 create mode 100644 tests/io-startup/postgui.hal
 create mode 120000 tests/io-startup/random/no-tool-in-P0/checkresult
 create mode 100644 tests/io-startup/random/no-tool-in-P0/expected-startup-tool-number
 create mode 120000 tests/io-startup/random/no-tool-in-P0/test.ini
 create mode 120000 tests/io-startup/random/no-tool-in-P0/test.sh
 create mode 100644 tests/io-startup/random/no-tool-in-P0/tool.tbl.original
 create mode 100644 tests/io-startup/random/test.ini
 create mode 120000 tests/io-startup/random/tool-in-P0/checkresult
 create mode 100644 tests/io-startup/random/tool-in-P0/expected-startup-tool-number
 create mode 120000 tests/io-startup/random/tool-in-P0/test.ini
 create mode 120000 tests/io-startup/random/tool-in-P0/test.sh
 create mode 100644 tests/io-startup/random/tool-in-P0/tool.tbl.original
 create mode 100755 tests/io-startup/shared-test.sh
 create mode 100755 tests/io-startup/test-ui.py
john@cave:~/emc-dev$ git branch
  2.6
  2.7
* 2.7_Docs
  master
john@cave:~/emc-dev$ git checkout 2.7
Switched to branch '2.7'
john@cave:~/emc-dev$ git checkout 2.7_Docs
Switched to branch '2.7_Docs'
Your branch is ahead of 'origin/2.7_Docs' by 24 commits.
john@cave:~/emc-dev$ git gui
*** when I looked at 2.7_Docs branch history it showed Merge branch '2.7' into 2.7_Docs
john@cave:~/emc-dev$ git checkout 2.7
Switched to branch '2.7'
john@cave:~/emc-dev$ git gui
*** when I looked at 2.7 branch history is did not show a merge