| 89 | | We use a secondary DVCS for doing the sync, edit and merge. |
| 90 | | For example, in the repos:cboos.hg repository: |
| 91 | | - repos:cboos.hg:trac-guide-teo-0.12-prefix contains the snapshots of the raw content of the [[0.12/]] pages, as obtained via: |
| 92 | | {{{ |
| 93 | | $ cd 0.12-stable |
| 94 | | $ PYTHONPATH=. python contrib/checkwiki.py -d -p 0.12 |
| 95 | | }}} |
| 96 | | - repos:cboos.hg:trac-guide-0.12 is the integration branch for the changes from t.e.o; changes that should not been merged in are discarded (once), like the version specific banner (removed after [milestone:0.12.6]), the static content replacing macro expansions, etc. |
| | 89 | * Get the latest changes from the t.e.o wiki: |
| | 90 | {{{#!sh |
| | 91 | $ cd trac/wiki/default-pages |
| | 92 | $ ../../../contrib/check_wiki.py -d |
| | 93 | }}} |
| | 94 | * Inspect the changes. If there's anything that need to be fixed, change it in the t.e.o wiki and download the content again. The `check_wiki` script outputs a highlighted list of missing links. |
| | 95 | * Commit in svn. |
| | 96 | * TODO: Describe how to merge content forward (e.g. merge changes from TracWorkflow to [wiki:1.1/TracWorkflow]. |
| 98 | | Once the initial setup is done, the following is needed: |
| 99 | | - get a new batch of changes from t.e.o |
| 100 | | - inspect the changes, if there's anything that need to be fixed, change it in the wiki, iterate |
| 101 | | - commit on `trac-guide-teo-0.12-prefix` |
| 102 | | - switch to `trac-guide-0.12`, merge from `0.12-stable`, merge from `trac-guide-teo-0.12-prefix` |
| 103 | | - commit in svn |
| | 98 | Note that porting changes from 0.12 to 1.0 happens quite naturally when we port over the changes from [source:branches/1.0-stable] to [source:trunk], //but this happens only in the repository//, the toplevel pages on t.e.o won't contain these changes. It might be useful from time to time to do a sync the other way round. |
| 117 | | |
| 118 | | == How to keep the default wiki pages in sync? == #sync |
| 119 | | |
| 120 | | As some content is only pertinent on t.e.o and not in the packaged docs, downloading new content from t.e.o will lead to repeated merges, so the process described above for [#sync012 0.12] should be followed. |
| 121 | | |
| 122 | | For example, in the repos:cboos.hg repository: |
| 123 | | - repos:cboos.hg:trac-guide-teo contains the snapshots of the raw content of the toplevel pages, as obtained via: |
| 124 | | {{{ |
| 125 | | $ cd trunk |
| 126 | | $ PYTHONPATH=. python contrib/checkwiki.py -d |
| 127 | | }}} |
| 128 | | - repos:cboos.hg:trac-guide-1.0 is the integration branch for the changes from t.e.o; changes that should not been merged in are discarded (once), like the editing caveats, etc. |
| 129 | | |
| 130 | | Once the initial setup is done, the following is needed: |
| 131 | | - get a new batch of changes from t.e.o |
| 132 | | - inspect the changes, if there's anything that need to be fixed, change it in the wiki, iterate |
| 133 | | - commit on `trac-guide-teo` |
| 134 | | - switch to `trac-guide-1.0`, merge from `trunk`, merge from `trac-guide-teo` |
| 135 | | - commit in svn |
| 136 | | |
| 137 | | Note that porting changes from 0.12 to 1.0 happens quite naturally when we port over the changes from [source:branches/0.12-stable] to [source:trunk], //but this happens only in the repository//, the toplevel pages on t.e.o won't contain these changes. It might be useful from time to time to do a sync the other way round. |
