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-09-03 14:32:44 -04:00
commit 203d7142bc
2 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
doc/forum/Help_Windows_walkthrough/comment_1_5fc22393a1b28235eabb2871ad83d0a7._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.8.7"
subject="comment 1"
date="2013-09-03T17:59:03Z"
content="""
The walkthrough assumes a system that uses indirect mode by default, so it won't work quite right on Windows, which is forced to use direct mode.
Running `git annex fsck` in the server repository will fix up this situation, but the right thing on Windows is to use `git annex sync` rather than the manual `git fetch + git merge` the walkthrough shows.
Guess I'll make the walkthrough use sync, although it may make it harder for people to understand what's going on internally.
"""]]

10
doc/news/version_4.20130827/comment_5_8991648dda991768e3a58477a4c3c923._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.8.7"
subject="sorry for delay.."
date="2013-09-03T18:07:34Z"
content="""
That's weird.. I have a post-update hook that runs git-update-server-info, but I reproduced the problem, and manually running that fixed it.
Guess I will need to keep an eye on this at the next release to see if it was a one-off problem..
"""]]