Digitrax Extended Series 6 by John McMasters v3.5

[AlanUS]

Subject is self-explanatory.
My first attempt with Git / NetBeans.

[mattharris]

Alain,

Did you want this to be included in the main JMRI codebase? Only, as you closed the pull request, it has not yet been incorporated.

[AlanUS]

Still in the learning phase ...

[AlanUS]

Re-opened. Not exactly sure. Do I have write access or not ? If yes, how do I accept this pull request into the JMRI master?

[rhwood]

There are two changes that would be helpful before we accept this:
Please remove the <!-- $Id … $ --> comments. Git makes no sense of those, so they are simply noise at this point.

[rhwood]

I should note: you can edit those files directly in your clone of your fork of master, and this pull request should see the changes once you push the changes to your fork. (Or you can edit them directly in your fork on the GitHub website.)

[AlanUS]

Came back to as it was in the GitHub version.
Note that this was used in the previous SVN context and therefore still used in local copies of people making changes from a 4.1.2 version - like this one.
You should make a note on the Developers list to mention that this is deprecated.

So I don't have write access, do I ?

[pabender]

On Sep 26, 2015, at 7:25 AM, Alain LM notifications@github.com wrote:

Came back to as it was in the GitHub version.
Note that this was used in the previous SVN context and therefore still used in local copies of people make changes from a 4.1.2 version - like this one.
You should make a note on the Developers list to mention that this is deprecated.

I'm not ready to say the SVN keywords should be deprecated yet.

It looks like we can get them to work using got attributes.

https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes

I need to look at that page more closely later to get the proper keyword expansions.

Other than the ID keyword, the one we use most frequently is revision....

Paul

[AlanUS]

Well looking at a few files, it seems that all of the comments have been wiped out when moving to Git.

[rhwood]

Note that per the documentation:

• keyword expansions in git are not included in the commits, so it's retained only locally in the working copy
• it can get ugly if you require certain applications (i.e. bash) to expand keywords, and not everyone is capable of using those applications.

[bobjacobsen]

I think we should move the discussion of keyword expansion to a separate issue, as it's a large question. I've started a new issue for it: #30

Bob