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 2016-12-20 15:15:22 -04:00
commit 6cced34fbb
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/bugs/YouTube_-_error_in_importfeed/comment_2_fe28e0f76dbefb1963820011fc8fc3e7._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="m8r-achx62@7323980ed426b7f78c85dfefe7358672bce44e98"
nickname="m8r-achx62"
avatar="http://cdn.libravatar.org/avatar/adaf4c4277529e10e32c467fa4ed4b9a"
subject="comment 2"
date="2016-12-19T22:33:13Z"
content="""
Thanks for following this up Joey!
"""]]

33
doc/bugs/getFileSize_conflict_between_Utility.Directory_and_Utility.FileSize.mdwn Normal file
View file

@ -0,0 +1,33 @@
### Please describe the problem.
directory 1.3.0.0 causes a conflict for "getFileSize"
### What steps will reproduce the problem?
Build git-annex with directory 1.3.0.0 (first need to bump max directory version on concurrent-output (and aws if building with s3))
### What version of git-annex are you using? On what operating system?
6.20161210 on macOS 10.11 El Capitan
### Please provide any additional information below.
[[!format sh """
[23 of 34] Compiling Common ( Common.hs, dist/setup/Common.o )
Common.hs:3:16: error:
Conflicting exports for ‘getFileSize’:
‘module X’ exports ‘X.getFileSize’
imported from ‘Utility.Directory’ at Common.hs:28:1-29
(and originally defined in ‘System.Directory’)
‘module X’ exports ‘X.getFileSize’
imported from ‘Utility.FileSize’ at Common.hs:34:1-28
(and originally defined at Utility/FileSize.hs:26:1-11)
"""]]
A fix, though possibly not best, is to make this change in Common.hs:
[[!format sh """
import Utility.Directory as X hiding (getFileSize)
"""]]
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Yes :)

10
doc/forum/recover_deleted_files___63__/comment_5_29ec08578bc45e4bbdecf76d1eb33826._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="veron_veron@8e19f168a8da3dabcdbf28ccd3f27edfb40941ed"
nickname="veron_veron"
avatar="http://cdn.libravatar.org/avatar/eb7805af696010b4e8844aefeeb89a1b"
subject="easy"
date="2016-12-20T09:19:31Z"
content="""
Indeed the recycle bin, and using Windows Explorer to look in folders; the programs you used are not designed to search for files; especially programs like Elements, which uses a catalog is not what you need now. Moving files confuses PS Elements organiser enough to make it seem like you lost files, while they're actually there. When things go wrong, use the basic tools provided in Windows itself (explorer, search).
For file recovery programs, I've use <a href=\"http://www.passwordmanagers.net/resources/Software-for-Recovering-Deleted-Files-71.html\">Software for Recovering Deleted Files</a> on a few occassions; it's free and it works as good as can be expected. The main thing is to stop using the external hard disk until you use this tool, and avoid writing any files to it.
"""]]