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

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

Browse source
This commit is contained in:
Joey Hess 2013-04-16 17:11:40 -04:00
commit d9f9411e59
6 changed files with 111 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/assistant_ignores___34__manual__34___group__44___tries_to_transfer_files/comment_4_b4f811611d14e7392009c539fa6b8574._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 4"
date="2013-04-16T20:28:44Z"
content="""
There's an open bug about this weird commit editor problem. Please follow up there: [[assistant_hangs_during_commit]]
"""]]

34
doc/bugs/git-annex_thinks_files_are_in_repositories_they_are_not/comment_2_508e475f764e1cb453b756eb50bc3a15._comment Normal file
View file

@ -0,0 +1,34 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ"
nickname="Walter"
subject="comment 2"
date="2013-04-16T20:25:45Z"
content="""
walter@dionysus:~/presence$ echo 1 > Here.txt
walter@dionysus:~/presence$ git annex whereis
whereis Here.txt (2 copies)
1c6ffc98-d12c-4844-920b-5e28bc8e8b60 -- here (walter@dionysus:~/presence)
8da299b6-006c-4410-9b3d-a542766d40a4 -- kronos.local_presence (walter@kronos:~/presence)
ok
This is while kronos is turned off.
The contents of .git/config:
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[annex]
uuid = 1c6ffc98-d12c-4844-920b-5e28bc8e8b60
version = 3
direct = true
[gc]
auto = 0
[remote \"kronos.local_presence\"]
url = ssh://walter@git-annex-kronos.local-walter/~/presence/
fetch = +refs/heads/*:refs/remotes/kronos.local_presence/*
annex-uuid = 8da299b6-006c-4410-9b3d-a542766d40a4
annex-cost = 175.0
"""]]

12
doc/bugs/git-annex_thinks_files_are_in_repositories_they_are_not/comment_3_1656ba18c519a262c57ef626a3449e77._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 3"
date="2013-04-16T20:33:44Z"
content="""
> walter@dionysus:~/presence$ echo 1 > Here.txt
> walter@dionysus:~/presence$ git annex whereis
> whereis Here.txt (2 copies)
It seems the file Here.txt must already have been added to git-annex before this point ... or whereis would not show it. Did you leave out a step? Was the file already added? Are you using direct mode?
"""]]

24
doc/bugs/git-annex_thinks_files_are_in_repositories_they_are_not/comment_4_347dc3b6e5bc6c4195ec09d54bc1398e._comment Normal file
View file

@ -0,0 +1,24 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ"
nickname="Walter"
subject="comment 4"
date="2013-04-16T20:42:34Z"
content="""
The repository is a direct mode one.
I think there's something in your comment though; the content (\"1\") had already been added to a file (since deleted on dionysus),
however it does seem a bit inconsistent.
walter@dionysus:~/presence$ echo 1 > New1
walter@dionysus:~/presence$ echo 1 > New1.txt
walter@dionysus:~/presence$ git annex whereis New1 New1.txt
whereis New1 (1 copy)
1c6ffc98-d12c-4844-920b-5e28bc8e8b60 -- here (walter@dionysus:~/presence)
ok
whereis New1.txt (2 copies)
1c6ffc98-d12c-4844-920b-5e28bc8e8b60 -- here (walter@dionysus:~/presence)
8da299b6-006c-4410-9b3d-a542766d40a4 -- kronos.local_presence (walter@kronos:~/presence)
ok
"""]]

23
doc/forum/Drop_with_assistant/comment_8_773e540e46adc43487323e8d38ceb2d9._comment Normal file
View file

@ -0,0 +1,23 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 8"
date="2013-04-16T20:46:09Z"
content="""
@edheil, you used to be right about the middleman. But I'm continually improving things. :)
So, consider this situation:
> A (client) --- B (client) ---- C (archive)
If a file is created on A, inside an `archive` directory, B wants a copy, since it's not archived yet. Once B gets the copy, it sends it on the C. At that point, B notices that hey, this file was archived and is in an archive directory, and so it no longer wants its copy and drops it.
(At this point A will also want to drop the file. However, it cannot! This is because git-annex requires positive, direct verification that some other repository has a file before dropping it, and A cannot talk to C to check.
However, if you set C to be trusted, this verification is bypassed, and then A will be able to drop the file as well.)
This support for middlemen is a new feature, which will be in the next release. You can get it in any recent nightly build.
Amusingly this feature was built without writing any haskell code.. just fine-tuning the preferred content expressions!
We can also consider what happens if B is set to manual. In this case, it won't automatically get the file from A. But if you manually get it, then B will send it on to C. And A will drop the file once it hears that C has it. Due to the manual mode, you'll have to manually drop it from B of course.
"""]]

10
doc/install/OSX/comment_17_19c08b2c6c2c5cd88bf96d2bcbbd9055._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 17"
date="2013-04-16T20:31:10Z"
content="""
@Bret, the assistant relies on FSEvents pretty heavily. It seems to me your best bet is to upgrade OSX to a version that supports FSEvents.
You can certainly use the rest of git-annex on Snow Leopard without FSEvents.
"""]]