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

This commit is contained in:
Joey Hess 2013-10-28 13:47:42 -04:00
commit 16045d15fe
2 changed files with 30 additions and 0 deletions

View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.47"
subject="comment 1"
date="2013-10-28T16:56:20Z"
content="""
I think you're stressing way too much about a number.
It's quite possible for the known and local key counts to diverge while no data is missing. For example:
<pre>
joey@darkstar:~/tmp/test>touch foo
joey@darkstar:~/tmp/test>touch bar
joey@darkstar:~/tmp/test>git annex add foo bar
local annex keys: 1
known annex keys: 2
</pre>
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.47"
subject="comment 1"
date="2013-10-28T17:11:04Z"
content="""
It would be nice, but it adds quite a lot of complexity to have a --dry-run, and if I add it to just drop, the next bug is going to ask for get to have it..
I feel that the right approach is to add a --wanted, which could then be used with find to find files that are and are not wanted, according to the preferred content settings. To see what it would want to get: `git annex find --wanted --not --in .` To see what it would want to drop: `git annex find --not --wanted --in .`
"""]]