summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-02 16:03:28 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-02 16:03:28 -0400
commit27733edfcbb4775b07139bf2b8f270cc2457dc15 (patch)
treea1ca635299aa1e3c8ee0dcd81019168fafb2749a
parentc056b953033c20f6816cea832215ee1c51a34744 (diff)
parentc07f8c46a6fd35f0cdd1177ced3c901b98dec717 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/forum/Can_Not_Sync_to_Git_Repo/comment_2_1797c2fef5c20e885b56b8a2c6330ff0._comment8
-rw-r--r--doc/forum/rebuild_location_log_from_encrypted_remote/comment_3_06a73ca3dc73399ff000b642cca72de7._comment10
2 files changed, 18 insertions, 0 deletions
diff --git a/doc/forum/Can_Not_Sync_to_Git_Repo/comment_2_1797c2fef5c20e885b56b8a2c6330ff0._comment b/doc/forum/Can_Not_Sync_to_Git_Repo/comment_2_1797c2fef5c20e885b56b8a2c6330ff0._comment
new file mode 100644
index 000000000..8d08c3276
--- /dev/null
+++ b/doc/forum/Can_Not_Sync_to_Git_Repo/comment_2_1797c2fef5c20e885b56b8a2c6330ff0._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.64"
+ subject="comment 2"
+ date="2013-12-02T19:52:04Z"
+ content="""
+Post the version of git-annex you're using, and `git annex sync --debug` output.
+"""]]
diff --git a/doc/forum/rebuild_location_log_from_encrypted_remote/comment_3_06a73ca3dc73399ff000b642cca72de7._comment b/doc/forum/rebuild_location_log_from_encrypted_remote/comment_3_06a73ca3dc73399ff000b642cca72de7._comment
new file mode 100644
index 000000000..9cd442427
--- /dev/null
+++ b/doc/forum/rebuild_location_log_from_encrypted_remote/comment_3_06a73ca3dc73399ff000b642cca72de7._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.64"
+ subject="comment 3"
+ date="2013-12-02T19:53:11Z"
+ content="""
+Hmm, it seems I was wrong about copy --from not checking the location log. It does.. Probably to avoid large copies trying to copy a lot of files that are not present in a remote.
+
+I have now made `git annex copy --force --from remote` do what I said it would do, and that should work in your situation, I think.
+"""]]