diff options
author | Joey Hess <joey@kitenet.net> | 2012-10-29 13:10:47 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-10-29 13:10:47 -0400 |
commit | 7dcd6d478831707bf4833e9d671b5ba4cefd8724 (patch) | |
tree | 3604e77ed4ca3b5bd23852e9fd93ab91aa5c0ccc | |
parent | 66e719c1c519449f0bb37b84fd47c01c2ec8d00d (diff) | |
parent | 4b24c3fc45002a5eddea32b07921b41bcf834e1d (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
6 files changed, 115 insertions, 1 deletions
diff --git a/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn b/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn new file mode 100644 index 000000000..f1766ce2a --- /dev/null +++ b/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn @@ -0,0 +1,55 @@ +What steps will reproduce the problem? + +Building of the current github HEAD fails with a strange error message regarding OSX. I'm not using OSX but Ubuntu 12.10, why is cabal trying to build these files? + +<pre> +dominik@Atlantis:/var/tmp$ git clone git://github.com/joeyh/git-annex.git +Cloning into 'git-annex'... +remote: Counting objects: 40243, done. +remote: Compressing objects: 100% (10568/10568), done. +remote: Total 40243 (delta 29647), reused 40044 (delta 29449) +Receiving objects: 100% (40243/40243), 9.12 MiB | 184 KiB/s, done. +Resolving deltas: 100% (29647/29647), done. +dominik@Atlantis:/var/tmp$ cd git-annex/ +dominik@Atlantis:/var/tmp/git-annex$ cabal update +Downloading the latest package list from hackage.haskell.org +dominik@Atlantis:/var/tmp/git-annex$ cabal install --only-dependencies +Resolving dependencies... +All the requested packages are already installed: +Use --reinstall if you want to reinstall anyway. +dominik@Atlantis:/var/tmp/git-annex$ cabal configure +Resolving dependencies... +[ 1 of 21] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, dist/setup/Utility/FileSystemEncoding.o ) +[ 2 of 21] Compiling Utility.Applicative ( Utility/Applicative.hs, dist/setup/Utility/Applicative.o ) +[ 3 of 21] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, dist/setup/Utility/PartialPrelude.o ) +[ 4 of 21] Compiling Utility.UserInfo ( Utility/UserInfo.hs, dist/setup/Utility/UserInfo.o ) +[ 5 of 21] Compiling Utility.Monad ( Utility/Monad.hs, dist/setup/Utility/Monad.o ) +[ 6 of 21] Compiling Utility.Path ( Utility/Path.hs, dist/setup/Utility/Path.o ) +[ 7 of 21] Compiling Utility.OSX ( Utility/OSX.hs, dist/setup/Utility/OSX.o ) + +Utility/OSX.hs:22:17: Not in scope: `myHomeDir' +</pre> + +What is the expected output? What do you see instead? + +I expect cabal to build git-annex. + +What version of git-annex are you using? On what operating system? + +github HEAD on Ubuntu 12.10 + +Please provide any additional information below. + +<pre> +$ cabal --version +cabal-install version 0.14.0 +using version 1.14.0 of the Cabal library + +$ ghc --version +The Glorious Glasgow Haskell Compilation System, version 7.4.2 + +$ uname -a +Linux Atlantis 3.5.0-17-generic #28-Ubuntu SMP Tue Oct 9 19:31:23 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux + +</pre> + diff --git a/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn b/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn new file mode 100644 index 000000000..23298bff6 --- /dev/null +++ b/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn @@ -0,0 +1,18 @@ +###What steps will reproduce the problem?### + +"Adding a remote server using ssh" and try to add a remote server where the account has ex. tcsh as loginshell + +###What is the expected output? What do you see instead?### + +To discover remote programs, it dumps away some born-shell code like: +"echo git-annex-probe loggedin;if which git-annex-shell; then echo git-annex-probe git-annex-shell; fi;if which rsync; then echo git-annex-probe rsync; fi;if which ~/.ssh/git-annex-shell; then echo git-annex-probe ~/.ssh/git-annex-shell; fi" + +just wrap it with a bash -c '..' and you know that its interpreted by bash. + +###What version of git-annex are you using? On what operating system?### + +git-annex version: 3.20121017 + +###Please provide any additional information below.### + +Not everyone has bash as there login-shell. diff --git a/doc/bugs/build_problem_on_OSX.mdwn b/doc/bugs/build_problem_on_OSX.mdwn new file mode 100644 index 000000000..892daa594 --- /dev/null +++ b/doc/bugs/build_problem_on_OSX.mdwn @@ -0,0 +1,16 @@ +I just squelched a bunch of build issues (to do with dependancies) on my autobuilder for OSX, this is currently happening + +<pre> +install -d tmp +ghc -O2 -Wall -outputdir tmp -IUtility -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING -DWITH_XMPP -DWITH_DNS -DWITH_KQUEUE -threaded --make git-annex -o tmp/git-annex Utility/libdiskfree.o Utility/libmounts.o Utility/libkqueue.o + +Assistant/Threads/NetWatcher.hs:29:0: + warning: #warning Building without dbus support; will poll for network connection changes + +Assistant/Threads/MountWatcher.hs:36:0: + warning: #warning Building without dbus support; will use mtab polling +[ 29 of 259] Compiling Utility.OSX ( Utility/OSX.hs, tmp/Utility/OSX.o ) + +Utility/OSX.hs:22:17: Not in scope: `myHomeDir' +make: *** [git-annex] Error 1 +</pre> diff --git a/doc/forum/Using___34__sync__34___to_sink_all_branches__63__.mdwn b/doc/forum/Using___34__sync__34___to_sink_all_branches__63__.mdwn new file mode 100644 index 000000000..99ddcc328 --- /dev/null +++ b/doc/forum/Using___34__sync__34___to_sink_all_branches__63__.mdwn @@ -0,0 +1,9 @@ +Is there a way to sync all (or a subset of) local branches, not just the currently checked out branch? + +Does this make sense at all, or does this show I am missing some important point in git-annex? + +I am asking because I would like to use git-annex to keep git repositories with normal git files (with versioned and branched content) in sync. + +If it's not currently possible, could you provide some pointers on where to start, if I wanted to change to Haskell source? + +Thnx diff --git a/doc/forum/Using___34__sync__34___to_sink_all_branches__63__/comment_1_ef3d5c5e2600ffa36dd933c8a42cdf96._comment b/doc/forum/Using___34__sync__34___to_sink_all_branches__63__/comment_1_ef3d5c5e2600ffa36dd933c8a42cdf96._comment new file mode 100644 index 000000000..2b060197b --- /dev/null +++ b/doc/forum/Using___34__sync__34___to_sink_all_branches__63__/comment_1_ef3d5c5e2600ffa36dd933c8a42cdf96._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0" + nickname="Sehr" + subject="comment 1" + date="2012-10-29T17:04:30Z" + content=""" +Ok, this is what I have come up with: + +Merges can only be done on checked out branches. That's why the only way to do this without breaking the whole idea of git-annex (sync) is to check out each branch and run it separately. + +What would be the easiest way to do this? Considering possible unsaved changes in worktree and index? + +Maybe simply using git-clone /tmp locally, which uses hardlinks for .git/objects/ which should make it perform ok? + + +"""]] diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index 00ce5bdb1..7fffbe3ee 100644 --- a/doc/install/OSX.mdwn +++ b/doc/install/OSX.mdwn @@ -11,7 +11,7 @@ builds a standalone git-annex.app of the git-annex assistant. <pre> sudo brew update -sudo brew install haskell-platform git ossp-uuid md5sha1sum coreutils pcre +sudo brew install haskell-platform git ossp-uuid md5sha1sum coreutils pcre adns libgsasl cabal update cabal install git-annex --bindir=$HOME/bin </pre> |