Merge branch 'master' of ssh://git-annex.branchable.com

3 files changed, 94 insertions, 0 deletions

diff --git a/doc/bugs/Auto_update_not_updating_to_newest_version.mdwn b/doc/bugs/Auto_update_not_updating_to_newest_version.mdwn
new file mode 100644
index 000000000..c47f91de9
--- /dev/null
+++ b/doc/bugs/Auto_update_not_updating_to_newest_version.mdwn
@@ -0,0 +1,70 @@
+### Please describe the problem.
+
+I assume this is an assistant problem.
+
+My git-annex version on Mac OS seems to lag significantly behind current releases. I was today informed that it was updated to 5.20131221-g00d1673. Given that there are at least two newer versions I expected it to be updated to the newest one.
+
+There also seems no way to trigger a check for a new version.
+
+### What steps will reproduce the problem?
+
+Install on Mac. Observe over some days and see it not update.
+
+
+### What version of git-annex are you using? On what operating system?
+
+5.20131221-g00d1673,
+Mac OS
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+[2014-01-10 14:46:44 CET] main: starting assistant version 5.20131221-g00d1673
+[2014-01-10 14:46:44 CET] UpgradeWatcher: Finished upgrading git-annex to version 5.20131221-g00d1673 
+(scanning...) [2014-01-10 14:46:44 CET] Watcher: Performing startup scan
+(started...) [2014-01-10 14:47:02 CET] main: starting assistant version 5.20131221-g00d1673
+(scanning...) [2014-01-10 14:47:02 CET] Watcher: Performing startup scan
+(started...) 
+[2014-01-10 14:48:44 CET] main: starting assistant version 5.20131221-g00d1673
+(scanning...) [2014-01-10 14:48:44 CET] Watcher: Performing startup scan
+(started...) 
+[2014-01-10 14:49:35 CET] main: starting assistant version 5.20131221-g00d1673
+(scanning...) [2014-01-10 14:49:35 CET] Watcher: Performing startup scan
+(started...) [2014-01-10 14:52:44 CET] UpgradeWatcher: Upgrading git-annex
+
+[2014-01-10 14:52:44 CET] main: starting assistant version 5.20131221-g00d1673
+[2014-01-10 14:52:44 CET] UpgradeWatcher: Finished upgrading git-annex to version 5.20131221-g00d1673 
+(scanning...) [2014-01-10 14:52:45 CET] Watcher: Performing startup scan
+(started...) [2014-01-10 14:53:13 CET] main: starting assistant version 5.20131221-g00d1673
+(scanning...) [2014-01-10 14:53:13 CET] Watcher: Performing startup scan
+(started...) 
+[2014-01-15 15:22:29 CET] main: starting assistant version 5.20131221-g00d1673
+[2014-01-15 15:22:30 CET] Cronner: Consistency check in progress
+(scanning...) [2014-01-15 15:22:30 CET] Watcher: Performing startup scan
+(started...) 
+(scanning...) [2014-01-15 15:23:05 CET] Watcher: Performing startup scan
+[2014-01-15 15:23:05 CET] Committer: Committing changes to git
+(Recording state in git...)
+(started...) [2014-01-15 15:23:06 CET] main: Syncing with box.com 
+
+[2014-01-15 15:23:28 CET] main: starting assistant version 5.20131221-g00d1673
+(scanning...) [2014-01-15 15:23:28 CET] Watcher: Performing startup scan
+(started...) [2014-01-15 16:23:30 CET] NetWatcherFallback: Syncing with box.com 
+[2014-01-15 17:23:31 CET] NetWatcherFallback: Syncing with box.com 
+[2014-01-15 18:23:32 CET] NetWatcherFallback: Syncing with box.com 
+[2014-01-16 16:42:15 CET] NetWatcherFallback: Syncing with box.com 
+[2014-01-16 16:56:33 CET] UpgradeWatcher: Upgrading git-annex
+
+[2014-01-16 16:56:33 CET] main: starting assistant version 5.20131221-g00d1673
+[2014-01-16 16:56:33 CET] Cronner: Consistency check in progress
+[2014-01-16 16:56:33 CET] UpgradeWatcher: Finished upgrading git-annex to version 5.20131221-g00d1673 
+(scanning...) [2014-01-16 16:56:33 CET] Watcher: Performing startup scan
+(started...) fsck dvi2bitmap ok
+[2014-01-16 16:58:14 CET] main: starting assistant version 5.20131221-g00d1673
+(scanning...) [2014-01-16 16:58:14 CET] Watcher: Performing startup scan
+(started...) 
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/Auto_update_not_updating_to_newest_version/comment_1_6f75569dc960ea5bc4d334b2b321ebf8._comment b/doc/bugs/Auto_update_not_updating_to_newest_version/comment_1_6f75569dc960ea5bc4d334b2b321ebf8._comment
new file mode 100644
index 000000000..7dd540eae
--- /dev/null
+++ b/doc/bugs/Auto_update_not_updating_to_newest_version/comment_1_6f75569dc960ea5bc4d334b2b321ebf8._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.43"
+ subject="comment 1"
+ date="2014-01-16T16:29:01Z"
+ content="""
+What version of OSX?
+
+We can see it upgrading in the log, and 5.20131221 is consistent with this being OSX Lion, which no longer has an autobuilder, so won't be upgrading from that version unless someone steps up and makes a new autobuilder.
+
+It seems that the wrong version got into the .info file for Lion, which probably explains the repeated upgrade attempts since it thinks a newer version is available. I've fixed that.
+"""]]
diff --git a/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_4_ccbba61cdd6fce3e5de82417bcc0cbfb._comment b/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_4_ccbba61cdd6fce3e5de82417bcc0cbfb._comment
new file mode 100644
index 000000000..3ca8a6295
--- /dev/null
+++ b/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_4_ccbba61cdd6fce3e5de82417bcc0cbfb._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkipQLNyt8RHREHpg2k5wdYeRSCCvSNSBg"
+ nickname="Tim"
+ subject="Just happened again"
+ date="2014-01-16T16:23:00Z"
+ content="""
+This happened again and now I have this:
+
+lrwxr-xr-x  1 timmattison  staff  197 Jan 16 11:18 distribute-client-applications.sh -> ../../../.git/annex/objects/JV/91/SHA256E-s921--51fc6a6e2924ff6e2673971b5786fe0f204a5984a700a2241cc77383f04f544e.sh/SHA256E-s921--51fc6a6e2924ff6e2673971b5786fe0f204a5984a700a2241cc77383f04f544e.sh
+
+This was on the machine that had the file, not a remote machine it was syncing to.  I was editing the script, I ran it, the bash script segfaulted (expected), and then git-annex essentially deleted the file.  Can you help me understand why this happens?  It's obvious when it is a file I'm working on but I'm afraid it could be happening to other files and I don't know about it.
+"""]]