diff options
author | 2012-10-28 21:28:09 -0400 | |
---|---|---|
committer | 2012-10-28 21:28:09 -0400 | |
commit | 8f0c5a5e1953684c1000bcf0c2ed2b679021a40c (patch) | |
tree | 9b397d424deebf99299ffad1cb7cd15267984d48 /doc | |
parent | 3f4471609c11083429914372978f8c852cd1cf0b (diff) | |
parent | 0541a9469a62b943cff514e2084f948a017a3472 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
4 files changed, 35 insertions, 5 deletions
diff --git a/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content/comment_3_1892bcfbe3c462aa74552a241d65cad9._comment b/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content/comment_3_1892bcfbe3c462aa74552a241d65cad9._comment new file mode 100644 index 000000000..8dfc30a60 --- /dev/null +++ b/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content/comment_3_1892bcfbe3c462aa74552a241d65cad9._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="2001:4978:f:21a::2" + subject="comment 3" + date="2012-10-28T23:29:46Z" + content=""" +numcopies=0 is inherently unsafe, and unreasonable if you value your data at all. I've added some warnings about it to the man page. +"""]] diff --git a/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content/comment_4_dfa0e31996eaa14e2945c1d11670c4d9._comment b/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content/comment_4_dfa0e31996eaa14e2945c1d11670c4d9._comment new file mode 100644 index 000000000..d82a3026d --- /dev/null +++ b/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content/comment_4_dfa0e31996eaa14e2945c1d11670c4d9._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0" + nickname="Sehr" + subject="comment 4" + date="2012-10-29T00:00:33Z" + content=""" +Thanks, that's cool. Admittedly, I cannot think of too many scenarios, where there are two identical files without the user's knowloedge. And an even smaller subset of scenarios, where one would want to issue a \"drop\" on (only) one of these due to storage shortages. + + + +By the way, I LOVE git-annex. + + +PS: I just realized, that the same applies to the \"move\" command. +"""]] diff --git a/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content/comment_5_e2a9336cf1080c158765d4adfe72f26b._comment b/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content/comment_5_e2a9336cf1080c158765d4adfe72f26b._comment new file mode 100644 index 000000000..cc93b0f49 --- /dev/null +++ b/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content/comment_5_e2a9336cf1080c158765d4adfe72f26b._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="2001:4978:f:21a::2" + subject="comment 5" + date="2012-10-29T00:03:40Z" + content=""" +You're guaranteed to still have at least 1 copy of the file after move though, so you can get it back. + +"""]] diff --git a/doc/walkthrough/unused_data/comment_1_684b7b652d3a8ec04f32129c5528f1ab._comment b/doc/walkthrough/unused_data/comment_1_684b7b652d3a8ec04f32129c5528f1ab._comment index cb2324703..2be2a6463 100644 --- a/doc/walkthrough/unused_data/comment_1_684b7b652d3a8ec04f32129c5528f1ab._comment +++ b/doc/walkthrough/unused_data/comment_1_684b7b652d3a8ec04f32129c5528f1ab._comment @@ -6,8 +6,8 @@ content=""" Sometimes links to annexed data still exists on some branch, when it was supposed to be dropped. Here is how I found these; perhaps there is a simpler way. - % git annex find --format '${key}\n' > /tmp/known-keys - % find .git/annex/objects -type f -exec basename {} \; > /tmp/local-keys + % git annex find --format '${key}\n' | sort > /tmp/known-keys + % find .git/annex/objects -type f -exec basename {} \; | sort > /tmp/local-keys % comm -23 /tmp/local-keys /tmp/known-keys to look for what branch these are on, try @@ -17,8 +17,6 @@ to look for what branch these are on, try for one of the keys output above. In my case it was the same remote branch keeping them all alive. - - - +*EDIT* sort key lists to make comm work properly """]] |