Changes between Version 30 and Version 31 of TracProject/DefaultWikiPages

Timestamp:

May 8, 2008, 10:08:26 AM (16 years ago)

Author:

Christian Boos

Comment:

oops, totally wrong Mercurial url and a few other corrections needed, noticed while I was actually trying out the suggested steps ;-)

TracProject/DefaultWikiPages

@@ -87 +87 @@
 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 merge, so we need a system that can handle them efficiently.
 
-Here's how to set up such an environment using [http://selenic.org/hg Mercurial]:
+Here's how to set up such an environment using [http://www.selenic.com/mercurial/wiki Mercurial]:
 ==== Initial Setup ====
 {{{
@@ -96 +96 @@
 $ hg addremove
 $ hg commit -m "Start sync with branch 0.11-stable [T70xx]"
-$ (cd trac/wiki/default-pages; python ../../../contrib/checkwiki.py -d)
+$ (cd trac/wiki/default-pages; \
+   python ../../../contrib/checkwiki.py -d; dos2unix *)
 $ hg branch wiki-guide   # (1)
 $ hg commit -m "Those are the un-processed changes from t.e.o wiki"
-$ hg update -C 1         # (2)
+$ hg update -C 0         # (2)
 $ hg branch repo-guide   # (3)
 $ hg merge wiki-guide
@@ -107 +108 @@
     name for the branch tracking the raw changes made by contributors in 
     the t.e.o wiki
- 2. switch back to revision 1, the one which was in sync with the branch
+ 2. switch back to revision '''0''', the one which was in sync with the svn branch
  3. mark the future commit to be on named branch "repo-guide", the symbolic
     name for the branch tracking the changes we will commit in the svn branch
@@ -126 +127 @@
 $ cd guide-0.11
 $ hg update -C wiki-guide
-$ (cd trac/wiki/default-pages; python ../../../contrib/checkwiki.py -d)
+$ (cd trac/wiki/default-pages; \
+   python ../../../contrib/checkwiki.py -d; dos2unix *)
 $ hg ci -m "Downloaded changes 2008-05-09"
 $ hg update -C repo-guide
@@ -137 +139 @@
 Once you're happy, [#CommitChanges commit the changes] both locally on the "repo-guide" integration branch and on the 0.11-stable branch.
 
+Also, in the (rare) event of a Wiki page move, this has to be tracked manually both at the svn and at the hg level, e.g.:
+{{{
+$ cd trac/wiki/default-pages
+$ svn mv TracWikiMacros WikiMacros
+$ hg mv --after TracWikiMacros WikiMacros
+}}}
 
+New pages as well, once they have been added to the checkwiki.py script and downloaded:
+{{{
+$ cd trac/wiki/default-pages
+$ svn add TracVersionControl
+$ hg add TracVersionControl
+}}}
 
+'''Note:''' as I went through all those steps again, I noticed that there are actually quite few discrepancies at this point (i.e. near 0.11rc time) between the wiki guide and the default-pages in the repository. 
 
+This is not always the case, particularly when we're quite advanced in the release cycle of a new version and the online guide still documents the previous stable version. At those times, the above method is far from overkill, quite the contrary it makes it relatively easy to grab the useful contributions from the Wiki.
 
-
-
+Note also that this method is scalable, and that it can easily be used for tracking ''several'' sources. For [milestone:0.12], we could track the toplevel changes ("wiki-guide" branch in the above), as well as the 0.12 specific pages (0.12/..., in another "wiki-0.12-guide" branch).