108 lines
4.7 KiB
Markdown
108 lines
4.7 KiB
Markdown
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 $SCDIR $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
|
|
|
|
> Initialized empty shared Git repository in /home/deploy/tmp/
|
|
> Initialized empty Git repository in .git/
|
|
> fatal: '/home/deploy/tmp/repo': unable to chdir or not a git archive
|
|
|
|
Looks like your git does not support GIT_DIR being used with git-init. I
|
|
see some mentions of changes in git's changelog for 1.5.3 that look
|
|
relevant. I've changed ikiwiki-makerepo to use a method more portable to
|
|
older versions of git. --[[Joey]]
|
|
|
|
Many thanks Joey, upgraded my git, and now have working iki :) -- Andy
|
|
|
|
----
|
|
|
|
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?
|
|
If not, maybe a note should be made that the user should delete this file before
|
|
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]]
|
|
|
|
----
|
|
|
|
These instructions should probably show how to use a bare Git repository
|
|
(`GIT_DIR=somewhere.git git-init-db`) rather than a repository with a full
|
|
working copy. You can always clone the repository if you want your own local
|
|
working copy. Furthermore, this allows you to make multiple commits to your
|
|
working copy before pushing them to the repository and causing the wiki to
|
|
update. --[[JoshTriplett]]
|
|
|
|
> I'm currently testing and running such a setup. --[[tschwinge]]
|
|
|
|
Furthermore the git instructions should be changed to move the *.ikiwiki*
|
|
directory back into the wiki's working copy directory, isn't it? --[[tschwinge]]
|
|
|
|
> Yes, I think so. I will clean these instructions up unless somebody tells me we're missing something fundamental. --[[BartMassey]]
|
|
|
|
>> Either you do it or I'll do it somewhen soon. --[[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]]
|
|
|
|
----
|
|
|
|
What is the syntax for specifying the adminuser as an openid user? I've tried a couple things but I'm missing something. Thanks for any pointers. -- [[AdamShand]]
|
|
|
|
> Just put the openid url in there. It has to be the full url with
|
|
> "http://". --[[Joey]]
|
|
|
|
----
|
|
|
|
I apologize if this is the incorrect forum for this question, but I am trying to get ikiwiki set up and running with git. I followed all the directions and all seems to work until I go back and try to make changes. The steps I am performing:
|
|
|
|
cd $SRCDIR (e.g. ~/ikisrc)
|
|
vim index.mdwn (add a couple lines)
|
|
git commit -a -m 'test'
|
|
git push
|
|
|
|
I then get a long error message which reads in part "You asked me to pull without telling me which branch you
|
|
want to merge with, and 'branch.master.merge' in your configuration file does not tell me either." From that point on, I get:
|
|
|
|
sws@odin:~/dev/ikisrc$ git push
|
|
To /home/git/repos/myikiwiki.git
|
|
! [rejected] master -> master (non-fast forward)
|
|
error: failed to push to '/home/git/repos/myikiwiki.git'
|
|
|
|
If I do a git clone ssh://odin/path/to/$REPOSITORY from another machine and try to edit I get the same error sequence. What am I doing wrong?
|