Changes between Version 1 and Version 2 of Website


Ignore:
Timestamp:
Aug 18, 2008, 11:19:53 PM (9 years ago)
Author:
Dominic Hargreaves
Comment:

merging

Legend:

Unmodified
Added
Removed
Modified
  • Website

    v1 v2  
     1== Making changes ==
     2
    13The project website http://openguides.org/ is maintained in subversion.
    24
     
    911Changes should always be made in preview and then merged (using svn merge) to publish.
    1012(but don't merge the `robots.txt` across!)
     13
     14== Merging in more detail ==
     15
     16Subversion 1.5 should make this easier but assuming you don't have that yet, here is
     17(probably not that elegant, I'm sure there are better ways) how to merge some changes
     18from preview to publish:
     19
     20{{{
     21svn up preview
     22svn log preview|less
     23}}}
     24
     25Note down the revision before you started, and the revision of your most recent change - ie the two revisions that would give you a diff of your changes if you asked
     26
     27{{{
     28svn merge preview@[first revision number] preview@[second revision number] publish`
     29}}}
     30
     31== Publishing ==
    1132
    1233At the moment, changes in both branches are not automatically reflected in the web server.