Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

OK, so here is what I did on the config side:

  1. Install Git on your machine.

  2. Install Git Extenstions on your machine.

  3. If you want the capability of comparing, make sure you have Logix Designer Compare Tool installed on your machine as well.

  4. Make an empty directory in a local location (i.e. somewhere on your computer), then right click in windows explorer, and click Create GitExt new repository... then select Personal Rep then Create.

  5. Once you have this empty repository, right click in windows explorer, and then GitExt Open repository.

  6. In GitExt, click Repository on the menu bar then Edit .gitignore.

  7. In the Edit .gitignore pop-up window paste the following:
    #Ignore useless packages created by RSLogix.
    .bakacd
    *.acd.recovery
    *.sem
    *.wrk
    This will stop the temporary files from being included in the git and will declutter your system.

  8. Hit save.

  9. Now go to Tools > Settings > Git > Config. Enter your username and email. Hit save.

  10. Install Logix Designer Compare Tool

  11. Open the Setting dialog box in Git Extensions by clicking Tools > Settings in the menu bar.

  12. In the navigation pane select Git then Config.

  13. In the Config window:
    • You’ll find an option to fill in your username, email, etc.
    • In MergeTool: Type in a name for the Merge Tool, something like RSLogixMerge.
    • The default Path to Mergetool is C:/Program Files (x86)/Rockwell Software/Logix Designer Tools/Logix Designer Compare Tool/RSLCompare.exe
    • The Mergetool command is "C:/Program Files (x86)/Rockwell Software/Logix Designer Tools/Logix Designer Compare Tool/RSLCompare.exe" -m "$LOCAL" "$REMOTE" -PM FastestCompare
    • In Difftool type in something like RSLogixDiff, which defines a new difftool in git.
    • My path to difftool was: C:/Program Files (x86)/Rockwell Software/Logix Designer Tools/Logix Designer Compare Tool/RSLCompare.exe
    • My difftool command was: "C:/Program Files (x86)/Rockwell Software/Logix Designer Tools/Logix Designer Compare Tool/RSLCompare.exe" "$LOCAL" "$REMOTE" -PM FastestCompare
    • Line endings: Not Set.

  14. Hit apply, and you are set! Now, if you commit an ACD file, make a change, save it, and then commit another file.

Where are the remote repositories?

...

HMI Files: http://bitbucket.org/dkist/TIM.git

Other Useful tools

Slack has Bitbucket app that will let you subscribe to various messages when the repositories are updated. Integrate Bitbucket Cloud with Slack