Merge remote-tracking branch 'branchable/master'

5 files changed, 52 insertions, 0 deletions

diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_5_4ea29a6f8152eddf806c536de33ef162._comment b/doc/walkthrough/recover_data_from_lost+found/comment_5_4ea29a6f8152eddf806c536de33ef162._comment
new file mode 100644
index 000000000..0a546bd88
--- /dev/null
+++ b/doc/walkthrough/recover_data_from_lost+found/comment_5_4ea29a6f8152eddf806c536de33ef162._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="comment 5"
+ date="2011-05-14T19:03:43Z"
+ content="""
+Version: 0.20110503
+
+My local non-bare repo is copying to a remote bare repo.
+
+I have been recovering in a non-bare repo.
+
+If there is anything I can send you to help... If I removed said files and went through http://git-annex.branchable.com/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/ -- would that help?
+"""]]
diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_6_0d85f114a103bd6532a3b3b24466012e._comment b/doc/walkthrough/recover_data_from_lost+found/comment_6_0d85f114a103bd6532a3b3b24466012e._comment
new file mode 100644
index 000000000..1e3f32531
--- /dev/null
+++ b/doc/walkthrough/recover_data_from_lost+found/comment_6_0d85f114a103bd6532a3b3b24466012e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 6"
+ date="2011-05-14T19:23:45Z"
+ content="""
+Well, focus on a specific file that exhibits the problem. What does `git annex whereis` say about it? Is the content actually present in annex/objects/ on the bare repository? Does that contradict whereis?
+"""]]
diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_7_d38d5bee6d360b0ea852f39e3a7b1bc6._comment b/doc/walkthrough/recover_data_from_lost+found/comment_7_d38d5bee6d360b0ea852f39e3a7b1bc6._comment
new file mode 100644
index 000000000..f7dfad68c
--- /dev/null
+++ b/doc/walkthrough/recover_data_from_lost+found/comment_7_d38d5bee6d360b0ea852f39e3a7b1bc6._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="comment 7"
+ date="2011-05-14T23:13:15Z"
+ content="""
+It exists locally, whereis tells me it exists locally and locally, only.
+
+The object is _not_ in the bare repo.
+
+The file _might_ have gone missing before I upgraded my annex backend version to 2. Could this be a factor?
+"""]]
diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_8_29c3de4bf5fbd990b230c443c0303cbe._comment b/doc/walkthrough/recover_data_from_lost+found/comment_8_29c3de4bf5fbd990b230c443c0303cbe._comment
new file mode 100644
index 000000000..01248914c
--- /dev/null
+++ b/doc/walkthrough/recover_data_from_lost+found/comment_8_29c3de4bf5fbd990b230c443c0303cbe._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 8"
+ date="2011-05-15T00:09:34Z"
+ content="""
+What you're describing should be impossible; the error message shown can only occur if the object is present in the annex where `git-annex-shell recvkey` is run. So something strange is going on.
+
+Try reproducing it by running on the remote system, `git-annex-shell recvkey /remote/repo.git $key` .. if you can reproduce it, I guess the next thing to do will be to strace the command and see why it's thinking the object is there.
+"""]]
diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_9_2cee4f6bd6db7518fd61453c595162c6._comment b/doc/walkthrough/recover_data_from_lost+found/comment_9_2cee4f6bd6db7518fd61453c595162c6._comment
new file mode 100644
index 000000000..2755cf331
--- /dev/null
+++ b/doc/walkthrough/recover_data_from_lost+found/comment_9_2cee4f6bd6db7518fd61453c595162c6._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="comment 9"
+ date="2011-05-15T09:16:49Z"
+ content="""
+Just to make sure: How do I get $key? What I did was look at the path in the object store of the local repo and see if that exact same path & file existed in the remote.
+"""]]