Loading

Paste #peugklr8z

Wrap Raw Revise
  1. SVN style:
  2.   [branch] -Keyword [FS#12345] (r12345): [section] Message. (credits)
  3.   [1.8] -Fix [FS#12345] (r12345): [NewGRF] Everything. (wizzzard)
  4.  
  5. Discussion:
  6.   - "branch" and "credits" are pointless with non-SVN.
  7.   - Dash: Keep or drop?
  8.   - Keywords kept:
  9.      -Add, -Feature: Adding new stuff. Difference between "Feature" and "Add" is somewhat subjective. "Feature" for user-point-of-view stuff, "Add" for other.
  10.      -Change: Changing behaviour from user-point-of-view.
  11.      -Remove: Removing something from user-point-of-view.
  12.      -Codechange, -Cleanup: Changes without intentional change of behaviour from user-point-of-view. Difference betweeen "Codechange" and "Cleanup" is somewhat subjective.
  13.      -Fix, -Revert: Fixing stuff.
  14.      -Doc, -Update: Documentation changes, version increments, translator commits.
  15.      -Prepare: Rarely used.
  16.   - Keywords removed:
  17.      -Regression: Regression tests are run during deploying, so pointless.
  18.      -Backport: (Cherry-pick-)merges keep the original messages.
  19.      -Branch, -Release: No such thing with non-SVN.
  20.      -Merge, -Sync: We only do fast-forward merges.
  21.   - Section: Kept as is.
  22.   - Message: First line with "-Keyword", other lines optionally with "-Keyword".
  23.   - Issue link: "-Fix #123:" (alternative could be "-Fix GH-123:"
  24.   - Commit links: "-Fix f2da1eb57c" (using short hash)
  25.  
  26. GIT style variants:
  27. A: -Fix #123, fix #456, f2da1eb57c, 1f044d3e: [NewGRF] Everything.
  28. B: -Fix #123, fix #456, fix f2da1eb57c, fix 1f044d3e: [NewGRF] Everything.
  29. C: Fix #123, fix #456, f2da1eb57c, 1f044d3e: [NewGRF] Everything.
  30. D: Fix GH-123, fix GH-456, fix f2da1eb57c, fix 1f044d3e: [NewGRF] Everything.
Posted by Anonymous at 07 Apr 2018, 12:32:35 UTC
Language: text • Views: 513

Comments