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

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

Browse source
This commit is contained in:
Joey Hess 2014-01-27 13:20:10 -04:00
commit 7ad63520a6
4 changed files with 55 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency/comment_1_86e26ee9ec90aa00f25392052737f0f0._comment Normal file
View file

@ -0,0 +1,36 @@
[[!comment format=txt
username="https://www.google.com/accounts/o8/id?id=AItOawnlotDRSLW2JVXY3SLSwhrcHteqUHhTtoY"
nickname="Péter"
subject="Not fixed."
date="2014-01-27T00:43:45Z"
content="""
It's still failing for me, on both i386 and amd64.
Where exactly is it fixed?
How is it possible to install git-annex using Cabal?
http://stackoverflow.com/questions/21371272/cabal-missing-dependency-error
$ cabal install git-annex --force-reinstalls --bindir=$HOME/bin.local -f\"-assistant -webapp -webdav -pairing -xmpp -dns\"
...
Configuring git-annex-5.20140116...
Building git-annex-5.20140116...
Preprocessing executable 'git-annex' for git-annex-5.20140116...
Remote/External.hs:29:8:
Could not find module `Control.Concurrent.STM'
It is a member of the hidden package `stm-2.4.2'.
Perhaps you need to add `stm' to the build-depends in your .cabal file.
It is a member of the hidden package `stm-2.2.0.1'.
Perhaps you need to add `stm' to the build-depends in your .cabal file.
Use -v to see a list of the files searched for.
cabal: Error: some packages failed to install:
git-annex-5.20140116 failed during the building phase. The exception was: ExitFailure 1
$ cabal install stm --force-reinstalls --bindir=$HOME/bin.local
Resolving dependencies...
All the requested packages are already installed:
stm-2.4.2
Use --reinstall if you want to reinstall anyway.
"""]]

2
doc/design/assistant/telehash.mdwn
View file

@ -33,7 +33,7 @@ git-annex (assistant) repositories.
* XMPP pairing can also be used for telehash address discovery. (Note that
MITM attacks are possible.) Is it worth keeping XMPP in git-annex just
for this?
* Telehash addresses of repoitories can be communicated out of band (eg,
* Telehash addresses of repositories can be communicated out of band (eg,
via an OTR session or gpg signed mail), and pasted into the webapp to
initiate a repository pairing that then proceeds entirely over telehash.
Once both sides do this, the pairing can proceed automatically.

8
doc/sync/comment_10_2cd8ab86f498d6f676f859b552f831eb._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkI9AR8BqG4RPw_Ov2lnDCJWMuM6WMRobQ"
nickname="Dav"
subject="Sorry to just be getting back..."
date="2014-01-26T22:51:28Z"
content="""
The URLs in question in this case were read-only github https URLs. In any case, my problems are solved by what you've already suggested. I think a less error-sounding response to read-only https repos sounds nice!
"""]]

10
doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_6bb1432d85faef2087d3744f43f5bf12._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlUmrSFcLMuk2ny0QNlx4BosEuhG0ij0XQ"
nickname="Gregor"
subject="Same thing using the assistant?"
date="2014-01-27T16:44:13Z"
content="""
Hi can this also be done using the assistant. If I follow above instructions I end up with the directories being full of symlinks instead of the actual data. Using the assistant I get repositories that are still my original files (which I prefer). How can I sync two such repositories (created using existing data and the assistant)?
Gregor
"""]]