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-09-14 12:19:28 -04:00
commit a417b1db6e
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 46 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/build_fails_on_debian_jessie/comment_2_36edcd5a3eaba6382ada92b07ede728f._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="jk@3f2b4ce16bbac41470815333505aa47b91b7a9a6"
nickname="jk"
subject="comment 2"
date="2016-09-12T19:57:03Z"
content="""
Got round to this eventually - build disk-space-free and mountpoints easily enough but then got into dependency hell over the shakespeare package: debian build process wants a later version than present in jessie, but won't build the stretch version against the jessie haskell packages.
I haven't got much experience of haskell, especially under debian build: is there a way out of this?
"""]]

8
doc/bugs/build_fails_on_debian_jessie/comment_3_3f6e35e7b618bf1762e37611b13e26bb._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="jk@3f2b4ce16bbac41470815333505aa47b91b7a9a6"
nickname="jk"
subject="comment 3"
date="2016-09-13T07:05:48Z"
content="""
A bit more detail: the version of git-annex in jessie-backports has shakespeare 2 as a dependency, but jessie-backports does not contain a package of that; also my attempts to build shakespeare 2 in a jessie{,-backports} enviroment fails with a long list of failed dependencies.
"""]]

14
doc/forum/partial_annex_repository.mdwn Normal file
View file

@ -0,0 +1,14 @@
After I created a git repository, I added annex to it.
Now, if I add a new file with 'git add', it goes into the annex. However previously existing files are not in the annex.
What are the implications of this? Should I care?
FWIW, most of the files are small, so I see no reason for the annex for them.
How do I add a new file and not put it in the annex?
How to I switch a file from one to the other?
Thanks.

14
doc/forum/partial_annex_repository/comment_1_5e594914724a04e21087e1e4e57c2d30._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="git-starter"
subject="clarification"
date="2016-09-13T20:27:22Z"
content="""
My previous posting looks like I'm not aware of largefiles, which would mostly answer my question. My problem was that, after reading some doc that might not have been fully updated for v6, I got confused about the difference between an unlocked file in the annex, and a file not in the annex.
In any case, since I added some small files before using largefiles, those small files were put in the annex. How do I change them to be in the git repository not in the annex?
Thanks.
"""]]