Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2014-02-16 17:43:21 -04:00
commit c54792e367
6 changed files with 106 additions and 0 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo"
nickname="Dirk"
subject="No working ubuntu package"
date="2014-02-16T20:50:50Z"
content="""
The 5.20140210 package from François Marier tells me \"WebDAV not supported by this build\" when trying to add a box.com repository. So, can't really test this anymore on ubuntu.
"""]]

View file

@ -0,0 +1,26 @@
### Please describe the problem.
Joey, it looks like the git version wasn't updated with the latest release as is still too old to respect .gitignore files. I'm hoping that I haven't just made a silly mistake but I don't think I have...
See http://git-annex.branchable.com/bugs/Mac_OS_git_version_too_old_to_honour_.gitignore/ for bug that was closed.
### What steps will reproduce the problem?
Install git-annex 5.20140209-g3a61dbe and try to use .gitignore file to exclude items from git annex.
### What version of git-annex are you using? On what operating system?
5.20140209-g3a61dbe on Mac OS 10.9.1.
### Please provide any additional information below.
[/Applications/git-annex.app/Contents/MacOS]# ./git annex version
git-annex version: 5.20140209-g3a61dbe
build flags: Assistant Webapp Pairing S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
[/Applications/git-annex.app/Contents/MacOS]# ./git --version
git version 1.8.3.4 (Apple Git-47)

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlVsvZpOtQ_ukVysPjQxJEBlKCM5lsgPkk"
nickname="Abhishek"
subject="nice"
date="2014-02-15T09:51:31Z"
content="""
Very useful information. Thank you for sharing it. Thanks <a href=http://www.99th.in>99th.in</a>
"""]]

View file

@ -0,0 +1,21 @@
I have set up an annex on a remote machine and I am connecting via ssh. But, since it is a managed machine, I installed the git-annex binary in my own ~/bin. Well, when I try
$git annex sync
I get:
$git annex sync
(merging origin/git-annex into git-annex...)
(Recording state in git...)
bash: git-annex-shell: command not found
Remote origin does not have git-annex installed; setting annex-ignore
commit ok
pull origin
merge: refs/remotes/origin/master - not something we can merge
merge: refs/remotes/origin/synced/master - not something we can merge
failed
git-annex: sync: 1 failed
The git remote -v looks correct. So, how do I tell git annex on my local machine where to use $HOME/bin in PATH on the remote machine when syncing with remotes?

View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawk3HGoDpnOPob5jOjvIootmkve1-nCpRiI"
nickname="Kalle"
subject="Declare path on first line of bashrc?"
date="2014-02-15T18:36:35Z"
content="""
If i don't misremember some systems including Debian require you to set the path on the very first line of .bashrc for it to work. Can't remember why just now.
in other words paste the following into the very first line of `$HOME/.bashrc`
`PATH=$PATH:$HOME/bin:$HOME/bin/git-annex.linux`
Modify the line above if you haven't installed to `~/bin/git-annex.linux`
"""]]

View file

@ -0,0 +1,27 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn3rK4VDzxyhmrIc18z7F5OuXvEbUsgUac"
nickname="Srinath"
subject="build issue with brew technique on Darwin Kernel Version 13.0.0"
date="2014-02-15T02:17:16Z"
content="""
Following the Mac OS X brew instructions from the top of the board, I got the following error:
[5 of 5] Compiling Yesod ( Yesod.hs, dist/build/Yesod.o )
In-place registering yesod-1.2.5...
Installing library in /Users/srinathv/.cabal/lib/yesod-1.2.5/ghc-7.6.3
Registering yesod-1.2.5...
Installed yesod-1.2.5
cabal: Error: some packages failed to install:
git-annex-5.20140210 depends on libxml-sax-0.7.4 which failed to install.
libxml-sax-0.7.4 failed during the configure step. The exception was:
ExitFailure 1
network-protocol-xmpp-0.4.5 depends on libxml-sax-0.7.4 which failed to
install.
Then I perused the comments and did:
$brew link libmxl2 --force
$cabal install git-annex --bindir=$HOME/bin
with success.
"""]]