diff options
author | 2012-11-27 22:56:20 -0400 | |
---|---|---|
committer | 2012-11-27 22:56:20 -0400 | |
commit | 416d47891bd1b1c36ebaee6d94a05bc886e2fef8 (patch) | |
tree | d0251b4f4de5137229975cc828bed0206f05b56b | |
parent | ffec18c1fc9875d5b052c284042326dbede79219 (diff) | |
parent | 29971eeaf1fa39926c34ea946a70bdbf379fa4d6 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
3 files changed, 57 insertions, 0 deletions
diff --git a/doc/bugs/Can__39__t_transfer_files_to_rsync_remote_with_encryption__61__shared/comment_2_c476847665a5320214721497d8fad15b._comment b/doc/bugs/Can__39__t_transfer_files_to_rsync_remote_with_encryption__61__shared/comment_2_c476847665a5320214721497d8fad15b._comment new file mode 100644 index 000000000..def9d19c8 --- /dev/null +++ b/doc/bugs/Can__39__t_transfer_files_to_rsync_remote_with_encryption__61__shared/comment_2_c476847665a5320214721497d8fad15b._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://schnouki.net/" + nickname="Schnouki" + subject="comment 2" + date="2012-11-27T22:33:54Z" + content=""" +Thanks for the quick fix! :) +"""]] diff --git a/doc/bugs/cabal_build:___34__Could_not_find_module___96__Data.AssocList__39____34__.mdwn b/doc/bugs/cabal_build:___34__Could_not_find_module___96__Data.AssocList__39____34__.mdwn new file mode 100644 index 000000000..22f1aa807 --- /dev/null +++ b/doc/bugs/cabal_build:___34__Could_not_find_module___96__Data.AssocList__39____34__.mdwn @@ -0,0 +1,23 @@ +What steps will reproduce the problem? + +Download current git head (fa5100d) and run cabal update; cabal install --only-dependencies; cabal configure; cabal build + +What is the expected output? What do you see instead? + +Expect succcessful build, get: + +Assistant/Install.hs:24:8: + Could not find module `Data.AssocList' + It is a member of the hidden package `hxt-9.3.1.1'. + Perhaps you need to add `hxt' to the build-depends in your .cabal file. + Use -v to see a list of the files searched for. + + +What version of git-annex are you using? On what operating system? + +building using cabal from clone of git clone git://git-annex.branchable.com/, commit fa5100d (same problem happens with last release, 3.20121127). On OS X, "Lion". + + +Please provide any additional information below. + + diff --git a/doc/forum/The_ability_to_leave_a_file_unlocked_for_a_bit_while_committing_it_repeatedly__63__/comment_4_f33fd6f72cb9ad7dd20a04c82199413b._comment b/doc/forum/The_ability_to_leave_a_file_unlocked_for_a_bit_while_committing_it_repeatedly__63__/comment_4_f33fd6f72cb9ad7dd20a04c82199413b._comment new file mode 100644 index 000000000..ba6baad91 --- /dev/null +++ b/doc/forum/The_ability_to_leave_a_file_unlocked_for_a_bit_while_committing_it_repeatedly__63__/comment_4_f33fd6f72cb9ad7dd20a04c82199413b._comment @@ -0,0 +1,26 @@ +[[!comment format=mdwn + username="http://identi.ca/cwebber/" + nickname="cwebber" + subject="comment 4" + date="2012-11-27T23:58:10Z" + content=""" +Ah, thanks Joey... here's an updated version: + + function git-annex-unlocked-commit { + if [ $# -ne 2 ]; then + echo \"Wrong number of args.\" + return 1 + fi + + if [ ! -e \"$1\" ]; then + echo \"Need a filename!\" + return 1 + fi + + read -p \"Really do an unlocked commit? (y/n): \" + if [ \"$REPLY\" == \"y\" ]; then + git add $1 && git commit $1 -m \"$2\" && git annex unlock $1 + fi + } + +"""]] |