web commit by http://diabolist.myopenid.com/

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

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index b457d3e60ac1687b9f10c34208b4e949b5b7cea1..9006030d929495aae535bdbe01ebc1dc99d0cae8 100644 (file)
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -7,13 +7,17 @@ directory should that be - `$SRCDIR?` --Andy
 > 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
+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
+    ikiwiki-makerepo git $SCDIR $REPOSITORY
 
-might clear things up a little. Apologies if I'm being a bit dim, learning ikiwiki and git at same time :) 
+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
 
@@ -28,6 +32,71 @@ 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
+
+
+OK here goes - I'm afraid its to color codes in it, so its a bit bigger and less readable than yours - apologies.
+
+<pre>
+Script started on Fri 11 Jan 2008 19:29:44 GMT
+^[]0;deploy@little-un: ~/tmp^G^M^M
+^[[44;01;33mdeploy@little-un^[[40;0;37m:^[[01;34m~/tmp^[[00m$ ls^M
+^[[00m^[[00;32msrc^[[00m  ^[[00mtypescript^[[00m^M
+^[[m^[]0;deploy@little-un: ~/tmp^G^M^M
+^[[44;01;33mdeploy@little-un^[[40;0;37m:^[[01;34m~/tmp^[[00m$ echo hi src/index.mdwn^M
+hi src/index.mdwn^M
+^[]0;deploy@little-un: ~/tmp^G^M^M
+^[[44;01;33mdeploy@little-un^[[40;0;37m:^[[01;34m~/tmp^[[00m$ echo hi src/index.mdwn^H^H^H^H^H^H^H^H^H^H^H^H^H^H^H^H^H^[[4h>^[[4l^[[4h ^[[4l^M
+^[]0;deploy@little-un: ~/tmp^G^M^M
+^[[44;01;33mdeploy@little-un^[[40;0;37m:^[[01;34m~/tmp^[[00m$ ikiwiki-makerepo src ^H^[[K^H^[[K^H^[[K^H^[[Kgit src repo^M
+Importing src into git^M
+Initialized empty shared Git repository in /home/deploy/tmp/^M
+Initialized empty Git repository in .git/^M
+Created initial commit 9f55e11: initial commit^M
+ 1 files changed, 1 insertions(+), 0 deletions(-)^M
+ create mode 100644 .gitignore^M
+fatal: '/home/deploy/tmp/repo': unable to chdir or not a git archive^M
+fatal: The remote end hung up unexpectedly^M
+error: failed to push to '/home/deploy/tmp/repo'^M
+^[]0;deploy@little-un: ~/tmp^G^M^M
+^[[44;01;33mdeploy@little-un^[[40;0;37m:^[[01;34m~/tmp^[[00m$ ls^M
+^[[00m^[[00;32mbranches^[[00m  ^[[00mconfig^[[00m  ^[[00mdescription^[[00m  ^[[00mHEAD^[[00m  ^[[00mhi^[[00m  ^[[00;32mhooks^[[00m  ^[[00;32minfo^[[00m  ^[[00;32mobjects^[[00m  ^[[00;32mrefs^[[00m  ^[[00;32msrc^[[00m  ^[[00mtypescript^[[00m^M
+^[[m^[]0;deploy@little-un: ~/tmp^G^M^M
+^[[44;01;33mdeploy@little-un^[[40;0;37m:^[[01;34m~/tmp^[[00m$ exit^M
+
+Script done on Fri 11 Jan 2008 19:32:21 GMT
+</pre>
+
 ----
 
 It isn't intended that .ikiwiki be versioned, is it? Do you have a svn:ignore set?