diff options
| author | Preston Holmes <preston@ptone.com> | 2012-09-27 13:19:04 -0700 |
|---|---|---|
| committer | Preston Holmes <preston@ptone.com> | 2012-09-27 13:19:04 -0700 |
| commit | 1df58968a4b2247aff91db40f1325f079ba3cdce (patch) | |
| tree | 92df574ecbef27f8b9e2c5535854b3e9d396d311 /docs/internals/contributing/committing-code.txt | |
| parent | 373932fa6b9137a7e760d81dc66d49fc10ff2942 (diff) | |
Added a note regarding interaction between GitHub and Trac Plugin
Diffstat (limited to 'docs/internals/contributing/committing-code.txt')
| -rw-r--r-- | docs/internals/contributing/committing-code.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index d36bc78fe1..67dda02f8b 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -187,7 +187,15 @@ Django's Git repository: For the curious, we're using a `Trac plugin`_ for this. - .. _Trac plugin: https://github.com/aaugustin/trac-github +.. note:: + + Note that the Trac integration doesn't know anything about pull requests. + So if you try to close a pull request with the phrase "closes #400" in your + commit message, GitHub will close the pull request, but the Trac plugin + will also close the same numbered ticket in Trac. + + +.. _Trac plugin: https://github.com/aaugustin/trac-github * If your commit references a ticket in the Django `ticket tracker`_ but does *not* close the ticket, include the phrase "Refs #xxxxx", where "xxxxx" |