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 2014-06-16 11:33:00 -04:00
commit e8b4eb0cdb
10 changed files with 279 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

40
doc/bugs/assistant_expensive_scan_unnecessarily_queues_files/comment_2_a7e9d8ec500399dd6794e168f85e6a5c._comment Normal file
View file

@ -0,0 +1,40 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU"
nickname="Matthias"
subject="comment 2"
date="2014-06-13T18:30:25Z"
content="""
Thanks for your fast reply, Joey. I appended the shortened config below. Wanted and groupwanted were untouched and therefore still commented out. I removed the hash from wanted to explicitly set it standard. Now the assistant behaves as expected. However I’m wondering:
* Shouldn’t ‘standard’ be the default rule to apply for wanted/groupwanted in case both are not explicitly set in the config? I assumed this to be the case.
* Shouldn’t “find --want-get” list the identical set of files that is also requested by the assistant? Especially this one confused me.
[[!format sh \"\"\"
# Repository trust configuration
# (for macbook)
#trust 3938865a-ce40-4166-a918-2012078846c7 = semitrusted
# Repository groups
# (for macbook)
group 3938865a-ce40-4166-a918-2012078846c7 = manual
# Repository preferred contents
# (for macbook)
#wanted 3938865a-ce40-4166-a918-2012078846c7 = standard
# Group preferred contents
# (Used by repositories with \"groupwanted\" in their preferred contents)
(config defaults - all commented out)
# Standard preferred contents
(config defaults - all commented out)
# Repository required contents
# (for macbook)
#required 3938865a-ce40-4166-a918-2012078846c7 =
# Scheduled activities
# (for macbook)
#schedule 3938865a-ce40-4166-a918-2012078846c7 =
\"\"\"]]
"""]]

10
doc/bugs/assistant_expensive_scan_unnecessarily_queues_files/comment_3_a0824e00f04f95c39823f29d6c76e7fe._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="108.236.230.124"
subject="comment 3"
date="2014-06-13T18:35:53Z"
content="""
I need to look into why --want-get didn't behave as expected.
It would probably make sense to make standard be the default. There could be upgrade concerns though.
"""]]

13
doc/bugs/failed_sync_with_direct_mode_repo/comment_1_fb4026cc81eb0ec1e656e4a81ffacc4f._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="108.236.230.124"
subject="comment 1"
date="2014-06-16T15:10:42Z"
content="""
Reproduced this as described.
Only happens when using the assistant in the second repository, which is a ssh remote of the first, and when there is not also a remote going the other way (so does not affect pairing).
As I thought, the problem is that the master branch is not updated by the assistant when in direct mode, and while annex/direct/master is pulled by the other assistant, it does not merge it.
"""]]