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-12-19 12:48:31 -04:00
commit 5daf86a8bf
5 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.87"
subject="comment 6"
date="2013-12-19T16:36:55Z"
content="""
Taking a screenshot, and running `ps -fax` to find what programs are
running, seem like the logical first steps to get anywhere on this
problem.
"""]]

2
doc/devblog/day_83__armel_webapp.mdwn
View file

@ -7,7 +7,7 @@ second.
Fixed a nasty bug in the assistant on OSX, where at startup it would follow
symlinks in the repository that pointed to directories outside the
repository, and add the files found there. Didn't cause data loss itself
(in direct mode the assistant doesn't touch the files), but certianly
(in direct mode the assistant doesn't touch the files), but certainly
confusingly breaks things and makes it easy to shoot your foot off. I will
be moving up the next scheduled release because of this bug, probably to
Saturday.

14
doc/forum/Can_Not_Sync_to_Git_Repo/comment_9_2fb745aaffe544f97bbdc670261fd4fd._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="etset"
ip="82.155.112.106"
subject="comment 9"
date="2013-12-19T12:45:06Z"
content="""
I seem to have the same problem. I have two repositories added as ssh remotes to one another with the assistant. `git-annex sync` works on one of these, but not on the other, failing with the same error as above. Also, running `git-annex sync --debug` results in the same output as in Remy's above post. `git-annex repair` doesn't find any problem. Running `git branch` on both shows that neither repository has an `annex/direct/master` branch, and both have `master` checked out.
One of the repositories has the current version from debian wheezy-backports, 4.20131106~bpo70+1, installed, and the other one had 5.20131130 from unstable as of when I discovered the problem (I upgraded it today, but the problem persists). I'm not sure, but I think those were the versions I used to create the repositores, too.
Trying to reproduce the problem, I created a new repository via assistant on both computers, the one running 4.20131106~bpo70+1 and the one recently upgraded to 5.20131213. On the 5.* one, a `annex/direct/master` branch was created and checked out, but not on the 4.* one. However, adding each other as ssh remotes with the assistant makes the `annex/direct/master` on 5.* disappear and `master` to be checked out on both.
Is there anything I can do to fix the repositories? Is there any other info I could provide to help with this?
"""]]

10
doc/forum/new_linux_arm_tarball_build/comment_7_6814bdeca94328fe6c3f407795ff923a._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://julien.lefrique.name/"
nickname="jlefrique"
subject="Thanks"
date="2013-12-19T07:20:31Z"
content="""
That's perfect!
On my side, I upgraded to firmware 4.0.2 but the kernel is still the same.
The kernel 3.4.x is available in the beta of QTS 4.1.0, I will wait the official release to upgrade.
"""]]

10
doc/tips/visualizing_repositories_with_gource/comment_1_01c5cd21375990c612b8f291904ddb3e._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm9IQStaE1el95_9s77CgmJhxZwCwUeN9A"
nickname="Sam"
subject="You can also use it for LIVE display now"
date="2013-12-19T14:29:18Z"
content="""
hi, check out http://puffingdev.com/live-gource-visually-display-your-svngit-activity-live/
You can use it to display LIVE updates of a git repo, nice to have on a screen in your company's common area for example.
"""]]