From 6ce7f9fd7d30b05a905eda2299c43cdea49f0193 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus" Date: Mon, 29 Oct 2012 08:17:03 +0000 Subject: [PATCH 01/11] --- doc/install/OSX.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index 00ce5bdb19..7fffbe3ee0 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. 
 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
From 0a35ebbcb2988ead75f9dfe51f141a8f34c14e58 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus" Date: Mon, 29 Oct 2012 08:25:33 +0000 Subject: [PATCH 02/11] --- doc/bugs/build_problem_on_OSX.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/bugs/build_problem_on_OSX.mdwn diff --git a/doc/bugs/build_problem_on_OSX.mdwn b/doc/bugs/build_problem_on_OSX.mdwn new file mode 100644 index 0000000000..892daa5943 --- /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 + +
+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
+
From f6e0c0c9d6aaf61e411d80c94562d1c9786cac23 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0" Date: Mon, 29 Oct 2012 12:36:08 +0000 Subject: [PATCH 03/11] --- ...sing___34__sync__34___to_sink_all_branches__63__.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/Using___34__sync__34___to_sink_all_branches__63__.mdwn 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 0000000000..7facb53ab5 --- /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 aksing because I would like to use git-annex to keep git repositories with normal git files (with versioned 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 From 4db20a9cdb0bba6029393559c2141231101ce579 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlKguAW2rkgcUqK2mmxlYnh4Jj578A4AIA" Date: Mon, 29 Oct 2012 12:40:50 +0000 Subject: [PATCH 04/11] --- doc/bugs/Detection_assumes_that_shell_is_bash.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/bugs/Detection_assumes_that_shell_is_bash.mdwn 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 0000000000..86a540bbaa --- /dev/null +++ b/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn @@ -0,0 +1,14 @@ +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. From f5f5245ef0b747055b4578efa73f3c6816f7fd4b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlKguAW2rkgcUqK2mmxlYnh4Jj578A4AIA" Date: Mon, 29 Oct 2012 12:43:17 +0000 Subject: [PATCH 05/11] --- doc/bugs/Detection_assumes_that_shell_is_bash.mdwn | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn b/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn index 86a540bbaa..23298bff67 100644 --- a/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn +++ b/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn @@ -1,14 +1,18 @@ -What steps will reproduce the problem? +###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? +###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?### -What version of git-annex are you using? On what operating system? git-annex version: 3.20121017 -Please provide any additional information below. +###Please provide any additional information below.### + +Not everyone has bash as there login-shell. From 9af3838134d47d0bb6764a3053c56de1a18a86ea Mon Sep 17 00:00:00 2001 From: "http://www.dbruhn.de/" Date: Mon, 29 Oct 2012 14:39:18 +0000 Subject: [PATCH 06/11] --- ..._Not_in_scope:___96__myHomeDir__39___.mdwn | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn 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 0000000000..0c91cc4b69 --- /dev/null +++ b/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn @@ -0,0 +1,41 @@ +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? + +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' + +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. + + From 7eb833b699044669275f6e8c023ae0f65497d94f Mon Sep 17 00:00:00 2001 From: "http://www.dbruhn.de/" Date: Mon, 29 Oct 2012 14:40:35 +0000 Subject: [PATCH 07/11] --- .../Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn | 2 ++ 1 file changed, 2 insertions(+) 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 index 0c91cc4b69..7fc8a6e729 100644 --- a/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn +++ b/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn @@ -2,6 +2,7 @@ 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? +
 dominik@Atlantis:/var/tmp$ git clone git://github.com/joeyh/git-annex.git
 Cloning into 'git-annex'...
 remote: Counting objects: 40243, done.
@@ -27,6 +28,7 @@ Resolving dependencies...
 [ 7 of 21] Compiling Utility.OSX      ( Utility/OSX.hs, dist/setup/Utility/OSX.o )
 
 Utility/OSX.hs:22:17: Not in scope: `myHomeDir'
+
What is the expected output? What do you see instead? From 65afa89a10a1d48a05423856eb2976fa52128786 Mon Sep 17 00:00:00 2001 From: "http://www.dbruhn.de/" Date: Mon, 29 Oct 2012 14:42:58 +0000 Subject: [PATCH 08/11] --- ..._fails:_Not_in_scope:___96__myHomeDir__39___.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 index 7fc8a6e729..f1766ce2af 100644 --- a/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn +++ b/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn @@ -40,4 +40,16 @@ github HEAD on Ubuntu 12.10 Please provide any additional information below. +
+$ 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
+
+
From 5eb39db52cd8c3e16e8cd6f4723f511cbc22b60c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0" Date: Mon, 29 Oct 2012 16:54:06 +0000 Subject: [PATCH 09/11] --- .../Using___34__sync__34___to_sink_all_branches__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 7facb53ab5..e3da5148a2 100644 --- 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 @@ -2,7 +2,7 @@ Is there a way to sync all (or a subset of) local branches, not just the current Does this make sense at all, or does this show I am missing some important point in git-annex? -I am aksing because I would like to use git-annex to keep git repositories with normal git files (with versioned content) in sync. +I am aksing 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? From 93b94da99508b6a6e3fa0573755ca09df5e0e05d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0" Date: Mon, 29 Oct 2012 16:54:19 +0000 Subject: [PATCH 10/11] --- .../Using___34__sync__34___to_sink_all_branches__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index e3da5148a2..99ddcc3281 100644 --- 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 @@ -2,7 +2,7 @@ Is there a way to sync all (or a subset of) local branches, not just the current Does this make sense at all, or does this show I am missing some important point in git-annex? -I am aksing because I would like to use git-annex to keep git repositories with normal git files (with versioned and branched content) in sync. +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? From ce97082d07d2112b7807075450b7494b249814dd Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0" Date: Mon, 29 Oct 2012 17:04:30 +0000 Subject: [PATCH 11/11] Added a comment --- ...t_1_ef3d5c5e2600ffa36dd933c8a42cdf96._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/Using___34__sync__34___to_sink_all_branches__63__/comment_1_ef3d5c5e2600ffa36dd933c8a42cdf96._comment 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 0000000000..2b060197ba --- /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? + + +"""]]