diff options
| -rw-r--r-- | doc/setup.mdwn | 12 | ||||
| -rw-r--r-- | doc/setup/discussion.mdwn | 7 |
2 files changed, 15 insertions, 4 deletions
diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 116501768..48f63fa55 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -101,9 +101,11 @@ This tutorial will walk you through setting up a wiki with ikiwiki. [[toggleable id=subversion text=""" REPOSITORY=~/wikirepo svnadmin create $REPOSITORY - svn import $SRCDIR file://$REPOSITORY/trunk -m "initial import" - rm -rf $SRCDIR - svn co file://$REPOSITORY/trunk $SRCDIR + svn mkdir file://$REPOSITORY/trunk -m "create trunk" + cd $SRCDIR + svn co file://$REPOSITORY/trunk . + svn add * + svn commit -m "initial import" """]] [[toggle id=git text="Git"]] @@ -136,7 +138,11 @@ This tutorial will walk you through setting up a wiki with ikiwiki. [[toggle id=mercurial text="Mercurial"]] [[toggleable id=mercurial text=""" REPOSITORY=$SRCDIR + rm -rf $SRCDIR/.ikiwiki # not for checkin hg init $REPOSITORY + cd $REPOSITORY + hg add * + hg commit -m "initial import" """]] 9. Configure ikiwiki to use revision control. diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn index dc09f0634..b2c2e7e72 100644 --- a/doc/setup/discussion.mdwn +++ b/doc/setup/discussion.mdwn @@ -2,4 +2,9 @@ It isn't intended that .ikiwiki be versioned, is it? Do you have a svn:ignore se Is there some magic way you can make the svn commands (and presumably commands for the other VCSs here) ignore the .ikiwiki directory during step 8, when they import it? If not, maybe a note should be made that the user should delete this file before -they import. --Ethan
\ No newline at end of file +they import. --Ethan + +> No, .ikiwiki should not be versioned, and a svn:ignore of it is reasonable, +> although probably too much noise for the setup instructions. +> I've switched to a different method that preserves .ikiwiki, w/o checking +> it in. --[[Joey]] |