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 2013-11-14 14:29:57 -04:00
commit ac000241b5
2 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
doc/bugs/Endless_SSH_password_prompts/comment_3_46210f7745b8c7c237fc8b08309390fe._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlHNJ7FpiXJNwSmojlwKwXhhF5QvwpNPmI"
nickname="Colin"
subject="Confirmed"
date="2013-11-14T17:57:23Z"
content="""
I am seeing the same problem. It happened on a machine running git-annex on Debian Testing some weeks ago, and I eventually disabled the offending repository for my sanity (incidentally - it seems to have vanished so I don't know how to re-enable it apart from adding it again).
It has just very recently (some days) started on this machine running Debian Unstable.
"""]]

45
doc/bugs/Incorrect_merge___40__a_special_case__41__/comment_2_8b2a188696f46819f6e3f0e9660362d2._comment Normal file
View file

@ -0,0 +1,45 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg"
nickname="Tim"
subject="comment 2"
date="2013-11-14T18:06:55Z"
content="""
You were missing a: test/a$ git annex sync
This did the trick on my system
[[!format sh \"\"\"
#!/bin/sh
set -e
mkdir test
cd test
git init a
cd a
git annex init
git annex direct
touch firstfile
git annex add firstfile
git annex sync # think this was left out of recipe # indeed it was
cd ..
git clone a b
cd b
git annex direct
echo bbbb > f
git annex add f
git annex sync || true # why add a || true?
cd ../a
git annex sync
echo aaaa > f
git annex add f
git annex sync
cd ../b
rm f
git annex sync
ls
cd ../a
git annex sync
ls
\"\"\"]]
"""]]