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

This commit is contained in:
Joey Hess 2012-10-16 01:25:18 -04:00
commit a10b9a552c
4 changed files with 43 additions and 0 deletions

View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.8"
subject="comment 5"
date="2012-10-16T04:23:59Z"
content="""
`git annex sync` only syncs the git repository, not file contents, and the special remote has no git repo, only file contents. `git annex copy` will avoid transferring things that are already there, so it's the way to go.
If you want automatic syncing of file contents and lots of other magic including automatic commit of new files, you could try the [[assistant]].
"""]]

View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM"
nickname="Meng"
subject="comment 6"
date="2012-10-16T04:38:40Z"
content="""
OK; The reason i ask about `git annex sync` is because I had previously copied the large files onto `smb://` before setting up the `annex` and don't want to unnecessarily transfer large data over Internet again. But now if i do `git annex copy --to smb`, and check what's added/changed in `smb` end, i found
$ cd /Volumes/subproject
$ ls
091 383 bigdir1 bigfile1 ...
The files with numbers in names such as`091`, `383` are being added, the `bigfile1` and `bigdir1` are the ones previously copied there. What are those `091`, `383` etc.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.8"
subject="comment 7"
date="2012-10-16T04:52:12Z"
content="""
That's where it stores files in the directory special remote. You can move the similar contents of /Volumes/subproject/.git/annex/objects/ to the same place as those and then run `git annex fsck --from smb --fast` and it'll learn about those files you already transferred.
You probably also want to delete /Volumes/subproject/.git afterwards, and any git working tree that was checked out there before; the directory special remote does not use the git repository that you had there before.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM"
nickname="Meng"
subject="comment 8"
date="2012-10-16T05:22:54Z"
content="""
Oh, I see. But what I need on the remote partition `/Volumes/subproject` connected via `smb://` is the actual `bigdir1` and `bigfile`, not the encoded objects. Maybe I should use some other types of special remote?
"""]]