followup

[ikiwiki.git] / doc / setup / discussion.mdwn

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 16e88601e02fcfc09d0287c583c65c9dd8fec8b5..1c3cd98cd56b378b24887c04d65aeebc23cb6120 100644 (file)
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -1,3 +1,71 @@
+Can the instructions for using `ikiwiki-makerepo` be clarified. This
+command wants to create folders in the directory it is run in. Which
+directory should that be - `$SRCDIR?` --Andy
+
+> No, `ikiwiki-makerepo` does not create directories in the current
+> directory. You specify the directory you want it to create and it creates
+> the directory and makes it into a repository. The setup instuctions have
+> examples of doing this. I don't see anything unclear. --[[Joey]]
+
+Sorry, was not precise enough. It does if you are using the git option. I
+believe this is partially explained on the rcs/git/ page. However I'm still
+not totally clear where I should run the command when using git. If I
+should be in $SRCDIR then updating the instructions to something like
+
+    REPOSITORY=~/wiki.git
+    cd $SRCDIR
+    ikiwiki-makerepo git $SRCDIR $REPOSITORY
+
+might clear things up a little. Apologies if I'm being a bit dim, learning
+ikiwiki and git at same time :) 
+
+Have tried 3 options
+
+1. mkdir $REP cd $REP run command (says $REP already exists so won't run)
+2. rm -rf $REP cd $SRC run command (creates a repository in $SRC, does not create $REP ends with "remote origin already exists"
+3. mkdir $TMP cd $TMP run command (creates a repository in $SRC/.git creates a repository in $TMP, does nothing to $REP, ends with "remote origin already exists".
+
+Version of ikiwiki installed is package from Ubuntu/Hardy 2.19
+Git version is 1.5.2.5
+
+n.b. svn version of command worked fine :)
+
+--Andy
+
+> Please show me a transcript of it not working. Here is a transcript of it
+> working just as the tutorial describes it to work:
+>      
+>      joey@kodama:~/tmp/work>ls
+>      repo/  src/
+>      joey@kodama:~/tmp/work>rm -rf repo src
+>      joey@kodama:~/tmp/work>mkdir src
+>      joey@kodama:~/tmp/work>echo hi > src/index.html
+>      joey@kodama:~/tmp/work>ikiwiki-makerepo git src repo
+>      Importing src into git
+>      Initialized empty shared Git repository in /home/joey/tmp/work/repo/
+>      Initialized empty Git repository in .git/
+>      Created initial commit 2254e46: initial commit
+>       2 files changed, 2 insertions(+), 0 deletions(-)
+>       create mode 100644 .gitignore
+>       create mode 100644 index.html
+>      updating 'refs/heads/master'
+>        from 0000000000000000000000000000000000000000
+>        to   2254e462e31429e755bae56939c4319be8bb912b
+>       Also local refs/remotes/origin/master
+>      Generating pack...
+>      Done counting 4 objects.
+>      Deltifying 4 objects...
+>       100% (4/4) done
+>      Writing 4 objects...
+>      Unpacking 4 objects...
+>       100% (4/4) done
+>      refs/heads/master: 0000000000000000000000000000000000000000 -> 2254e462e31429e755bae56939c4319be8bb912b
+>      
+>      Total 4 (delta 0), reused 0 (delta 0)
+>      Directory src is now a clone of git repository /home/joey/tmp/work/repo
+
+----
+
 It isn't intended that .ikiwiki be versioned, is it? Do you have a svn:ignore set? 
 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?
@@ -32,22 +100,3 @@ directory back into the wiki's working copy directory, isn't it? --[[tschwinge]]
 Curious as to why support for CVS is not built in. --[[Luther]]
 
 > See [[todo/CVS_backend|todo/CVS_backend]], but you might consider switching to a better version control system. --[[JoshTriplett]]
-
-----
-
-On the git setup instuctions, I wonder if this wouldn't work as well and be
-simpler? --[[Joey]]
-
-       REPOSITORY=~/wiki.git
-       mkdir $REPOSITORY
-       cd $REPOSITORY
-       git --bare init --shared
-       mv $SRCDIR $SRCDIR.old
-       git clone $REPOSITORY $SRCDIR
-       cd $SRCDIR
-       echo /.ikiwiki > .gitignore
-       mv $SRCDIR.old/* $SRCDIR.old/.* .
-       rmdir $SRDDIR.old
-       git add .
-       git commit -m "initial commit"
-       git push