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 2014-02-04 17:34:34 -04:00
commit 05745e88d2
5 changed files with 61 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
doc/bugs/Building_on_OpenBSD/comment_2_4a37935080b86643ecda717fe17f8f87._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
nickname="dxtrish"
subject="comment 2"
date="2014-02-04T13:45:25Z"
content="""
Sorry for the long delay, but I've tried what you said:
``% cabal install git-annex --bindir=$HOME/bin --flags=\"-pairing -webdav\" -j2``
and it STILL fails with:
``cabal: user error (Error: some packages failed to install:
git-annex-5.20140129 depends on network-info-0.2.0.3 which failed to install.
network-info-0.2.0.3 failed during the building phase. The exception was:
ExitFailure 1
uuid-1.3.3 depends on network-info-0.2.0.3 which failed to install.
)``
"""]]

24
doc/bugs/Building_on_OpenBSD/comment_3_2df229eb965189e2f7ea6dcd66cf68ca._comment Normal file
View file

@ -0,0 +1,24 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
nickname="dxtrish"
subject="comment 3"
date="2014-02-04T14:04:33Z"
content="""
And the UUID package requires network-info and git-annex seems to require the UUID package.
Also notice that the configure can't find the SHA commands:
checking sha1... not available
checking sha256... not available
checking sha512... not available
checking sha224... not available
checking sha384... not available
Configuring git-annex-5.20140129...
setup: user error (At least the following dependencies are missing:
uuid -any)
Even though:
% which sha1
/bin/sha1
% which sha256
/bin/sha256
"""]]

8
doc/bugs/Building_on_OpenBSD/comment_4_d141c0bac92bdfbc8b95d532d032174c._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
nickname="dxtrish"
subject="comment 4"
date="2014-02-04T14:05:19Z"
content="""
And why isn't the formatting working? :p
"""]]

10
doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__/comment_8_02699dbf30270db090b00192850831db._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
nickname="Justin"
subject="comment 8"
date="2014-02-04T02:05:36Z"
content="""
With the changes pushed today, I confirm I also have all 72 tests passing on Windows 7 with 5.20140203-g83e6fb7.
Thanks!
"""]]

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 Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant? to use with the git-annex assistant?
[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 71 "My phone (or MP3 player)" 23 "Tahoe-LAFS" 10 "OpenStack SWIFT" 31 "Google Drive"]] [[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 71 "My phone (or MP3 player)" 24 "Tahoe-LAFS" 10 "OpenStack SWIFT" 31 "Google Drive"]]
This poll is ordered with the options I consider easiest to build This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they listed first. Mostly because git-annex already supports them and they