Merge branch 'flush' of https://github.com/brunoqc/git-annex

6 files changed, 43 insertions, 0 deletions

diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index f85628d28..da97ed288 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -137,6 +137,7 @@ firstRun listenhost = do
 	mainthread v url htmlshim
 		| isJust listenhost = do
 			putStrLn url
+			hFlush stdout
 			go
 		| otherwise = do
 			browser <- maybe Nothing webBrowser <$> Git.Config.global
@@ -154,6 +155,7 @@ firstRun listenhost = do
 openBrowser :: Maybe FilePath -> FilePath -> Maybe Handle -> Maybe Handle -> IO ()
 openBrowser mcmd htmlshim outh errh = do
 	hPutStrLn (fromMaybe stdout outh) $ "Launching web browser on " ++ url
+	hFlush stdout
 	environ <- cleanEnvironment
 	(_, _, _, pid) <- createProcess p
 		{ env = environ
diff --git a/doc/bugs/True_backup_support.mdwn b/doc/bugs/True_backup_support.mdwn
new file mode 100644
index 000000000..ebf69c617
--- /dev/null
+++ b/doc/bugs/True_backup_support.mdwn
@@ -0,0 +1,5 @@
+I'd like to be able to restore my data from S3/Glacier following a catastrophic loss of information.
+
+As I understand it, git-annex doesn't solve this problem for me because it only stores file *contents* in S3/Glacier.  A restore-from-nothing requires both the file contents and also the file names and metadata, which git-annex doesn't store in S3.
+
+I'm still feeling my way around git-annex, but I think it will probably be sufficient for my purposes to set up a cron job to push my annex to github.  But I think it would be helpful if git-annex could take care of this automatically.
diff --git a/doc/bugs/True_backup_support/comment_1_50aa0bc1e2502622585682cb703e0b85._comment b/doc/bugs/True_backup_support/comment_1_50aa0bc1e2502622585682cb703e0b85._comment
new file mode 100644
index 000000000..33ad32eaa
--- /dev/null
+++ b/doc/bugs/True_backup_support/comment_1_50aa0bc1e2502622585682cb703e0b85._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ"
+ nickname="Walter"
+ subject="I think this already works"
+ date="2013-05-01T03:09:13Z"
+ content="""
+I think this should already work in the latest git version, I have been using this feature for the last week or so.
+
+This change was described in [[/design/assistant/blog/day_245__misc/]], and I asked for it [[here|/forum/Automatically_syncronise_centralised_repository/]].
+"""]]
diff --git a/doc/bugs/True_backup_support/comment_2_d6030c6c49b227e022f05d590746d4ca._comment b/doc/bugs/True_backup_support/comment_2_d6030c6c49b227e022f05d590746d4ca._comment
new file mode 100644
index 000000000..f8059d5a7
--- /dev/null
+++ b/doc/bugs/True_backup_support/comment_2_d6030c6c49b227e022f05d590746d4ca._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c"
+ nickname="Justin"
+ subject="comment 2"
+ date="2013-05-01T03:12:23Z"
+ content="""
+Indeed, this looks like what I'm after.  Thanks!
+"""]]
diff --git a/doc/bugs/Unable_to_switch_back_to_direct_mode/comment_2_5848ebbab38d1244347f7e7351b3a30d._comment b/doc/bugs/Unable_to_switch_back_to_direct_mode/comment_2_5848ebbab38d1244347f7e7351b3a30d._comment
new file mode 100644
index 000000000..2b13674a7
--- /dev/null
+++ b/doc/bugs/Unable_to_switch_back_to_direct_mode/comment_2_5848ebbab38d1244347f7e7351b3a30d._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 2"
+ date="2013-04-30T23:36:12Z"
+ content="""
+@andrew I've reproduced and fixed this problem. It does not seem to be related to cwebber's problem.
+
+Waiting on a test case from cwebber. His permissions seem ok, so I don't know what's causing that.
+"""]]
diff --git a/doc/bugs/Unable_to_switch_back_to_direct_mode/comment_3_1c5c7b0c7bc336e00f43e257b87a6208._comment b/doc/bugs/Unable_to_switch_back_to_direct_mode/comment_3_1c5c7b0c7bc336e00f43e257b87a6208._comment
new file mode 100644
index 000000000..b23697942
--- /dev/null
+++ b/doc/bugs/Unable_to_switch_back_to_direct_mode/comment_3_1c5c7b0c7bc336e00f43e257b87a6208._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q"
+ nickname="Andrew"
+ subject="comment 3"
+ date="2013-04-30T23:38:52Z"
+ content="""
+Ah, cool. What's the recommended way to recover from it?
+"""]]