mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2012-12-07 12:22:17 -04:00
commit 02bd012587
4 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/OSX_app_issues/comment_19_6d6341b05123cd317c4eac96353c8662._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.2.244"
subject="comment 19"
date="2012-12-07T16:13:42Z"
content="""
This hang seems not to occur on OSX 10.7, which is the version the autobuilder is running. So this is some sort of incompatability.
So, building git-annex from source should avoid the problem. I'd like to get a version of the app built for 10.8, have not yet been able to arrange that.
"""]]

21
doc/bugs/yesod-form_missing.mdwn Normal file
View file

@ -0,0 +1,21 @@
What steps will reproduce the problem?
build using cabal from a git checkout
What is the expected output? What do you see instead?
successful build; error message is:
Assistant/WebApp/Form.hs:15:8:
Could not find module `Yesod.Form.Fields'
It is a member of the hidden package `yesod-form-1.2.0'.
Perhaps you need to add `yesod-form' to the build-depends in your .cabal file.
What version of git-annex are you using? On what operating system?
git checkout commit 90b62db1defdd223294935ec0bbaac883cd20c04 on OS X Lion
Please provide any additional information below.
adding yesod-form to the build depends in git-annex.cabal does indeed fix the problem!

2
doc/design/assistant/polls/prioritizing_special_remotes.mdwn
View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 65 "My phone (or MP3 player)" 17 "Tahoe-LAFS" 6 "OpenStack SWIFT" 23 "Google Drive"]]
[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 66 "My phone (or MP3 player)" 17 "Tahoe-LAFS" 6 "OpenStack SWIFT" 23 "Google Drive"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they

1
doc/forum/Use_reflinks_on_BTRFS_instead_of_symlinks___63__.mdwn Normal file
View file

@ -0,0 +1 @@
On BTRFS it is possible to use [reflinks / clones](https://en.wikipedia.org/wiki/Btrfs#Cloning). This is the equivalent of hardlinks except that when the file is modified, a copy is performed (copy on write). Perhaps git-annex could detect the availability of this feature and use it in case it is available (and the repository and the file are in the same filesystem).