diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-03 14:32:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-03 14:32:44 -0400 |
| commit | f180e741eda5ac16558e481c1e85faec647f8f07 (patch) | |
| tree | 8b0576c6b74b687a5f72d57cdf8d9fef3dbdb043 | |
| parent | 21376d8937b4ab2994338060d7a15eb8392c6f77 (diff) | |
| parent | cfa0a99194ff788e1f48633f6e1b24f673578534 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/forum/Help_Windows_walkthrough/comment_1_5fc22393a1b28235eabb2871ad83d0a7._comment | 12 | ||||
| -rw-r--r-- | doc/news/version_4.20130827/comment_5_8991648dda991768e3a58477a4c3c923._comment | 10 |
2 files changed, 22 insertions, 0 deletions
diff --git a/doc/forum/Help_Windows_walkthrough/comment_1_5fc22393a1b28235eabb2871ad83d0a7._comment b/doc/forum/Help_Windows_walkthrough/comment_1_5fc22393a1b28235eabb2871ad83d0a7._comment new file mode 100644 index 000000000..95623a645 --- /dev/null +++ b/doc/forum/Help_Windows_walkthrough/comment_1_5fc22393a1b28235eabb2871ad83d0a7._comment @@ -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. +"""]] diff --git a/doc/news/version_4.20130827/comment_5_8991648dda991768e3a58477a4c3c923._comment b/doc/news/version_4.20130827/comment_5_8991648dda991768e3a58477a4c3c923._comment new file mode 100644 index 000000000..55fa6d10a --- /dev/null +++ b/doc/news/version_4.20130827/comment_5_8991648dda991768e3a58477a4c3c923._comment @@ -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.. +"""]] |