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 2012-10-17 22:05:11 -04:00
commit 3735063869
6 changed files with 77 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/Most_recent_git-annex_will_not_build_on_OpenIndiana/comment_2_102c0e998934e84deca92fd1c90145fa._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89"
nickname="John"
subject="uname on OpenIndiana"
date="2012-10-17T22:19:04Z"
content="""
The uname is actually SunOS, surprisingly enough. I'll give it a try!
"""]]

19
doc/bugs/Most_recent_git-annex_will_not_build_on_OpenIndiana/comment_3_1449dd796ce9f2209f085d4b017a5f33._comment Normal file
View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89"
nickname="John"
subject="Doesn't quite work"
date="2012-10-17T22:23:16Z"
content="""
Your Makefile change, even with the uname corrected, had no impact at all. I'm running \"cabal install\". When I try just \"make\", I get this error:
Annex.hs:69:28:
No instance for (MonadBase IO (StateT AnnexState IO))
arising from a use of `liftBase'
Possible fix:
add an instance declaration for
(MonadBase IO (StateT AnnexState IO))
In the second argument of `(.)', namely `liftBase'
In the expression: Annex . liftBase
In an equation for `liftBase': liftBase = Annex . liftBase
"""]]

10
doc/bugs/Most_recent_git-annex_will_not_build_on_OpenIndiana/comment_4_c4aa8a4379b2c056ca9b7afcff412bbc._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.23"
subject="comment 4"
date="2012-10-18T02:04:47Z"
content="""
You might be able to use the cabal file now. (Not sure.. the OS name used there is different from uname.)
cabal may have better luck, the make error suggests that you have too old a version of the haskell transformers-base library installed.
"""]]

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

@ -0,0 +1 @@
Since I'm just starting out with git-annex, I've had several false starts in getting things setup nicely between three machines. In the course of so doing, I've ended up with several repositories which no longer exist, and which I've marked dead. However, this is making the "git annex status" report a bit ugly, since these repositories no longer exist and can never exist again. Is there a way to truly purge dead repositories from my annex? I'd be fine with a command that must be ran in tandem on all annexes before doing a sync...

15
doc/install/OSX/comment_6_12bd83e7e2327c992448e87bdb85d17e._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/6xTna_B_h.ECb6_ftC2dYLytAEwrv36etg_054U-#4c1e7"
nickname="Fake"
subject="libncurses on 10.7"
date="2012-10-17T21:24:24Z"
content="""
I'm getting an error from gpg when I try to set up a repository on a remote server with encrypted rsync. Looks like libncurses in /usr/lib is 32 bit:
Dyld Error Message:
Library not loaded: /opt/local/lib/libncurses.5.dylib
Referenced from: /Applications/git-annex.app/Contents/MacOS/opt/local/lib/libreadline.6.2.dylib
Reason: no suitable image found. Did find:
/usr/lib/libncurses.5.dylib: mach-o, but wrong architecture
/usr/lib/libncurses.5.dylib: mach-o, but wrong architecture
"""]]

24
doc/walkthrough/unused_data/comment_1_684b7b652d3a8ec04f32129c5528f1ab._comment Normal file
View file

@ -0,0 +1,24 @@
[[!comment format=mdwn
username="bremner"
ip="156.34.89.108"
subject="finding data that isn't unused, but should be."
date="2012-10-17T20:32:11Z"
content="""
Sometimes links to annexed data still exists on some branch, when it was supposed to be dropped. Here is how I found these; perhaps there is a simpler way.
% git annex find --format '${key}\n' > /tmp/known-keys
% find .git/annex/objects -type f -exec basename {} \; > /tmp/local-keys
% comm -23 /tmp/local-keys /tmp/known-keys
to look for what branch these are on, try
% git log --stat --all -S$key
for one of the keys output above. In my case it was the same remote branch keeping them all alive.
"""]]