diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-04-29 13:25:10 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-04-29 13:25:10 -0400 |
commit | f84c14dcb7d2d3800235ac3d823b50a136852c17 (patch) | |
tree | e7f7e5939d72e86bd3a6c4dba58c62741045de09 | |
parent | c6f36b240e648cf41436b9bc53979ea9cc0d4426 (diff) |
comment and improve man page
-rw-r--r-- | doc/bugs/clean-duplicates_causes_data_loss/comment_2_14c5c3417f107a3619a4402f75bc0002._comment | 17 | ||||
-rw-r--r-- | doc/git-annex-import.mdwn | 5 |
2 files changed, 20 insertions, 2 deletions
diff --git a/doc/bugs/clean-duplicates_causes_data_loss/comment_2_14c5c3417f107a3619a4402f75bc0002._comment b/doc/bugs/clean-duplicates_causes_data_loss/comment_2_14c5c3417f107a3619a4402f75bc0002._comment new file mode 100644 index 000000000..c99c7699f --- /dev/null +++ b/doc/bugs/clean-duplicates_causes_data_loss/comment_2_14c5c3417f107a3619a4402f75bc0002._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2015-04-29T17:18:17Z" + content=""" +--clean-duplicates is not really intended to go do a full verification +that the annexed content is present. I can see how this is surprising; +it would probably be better if it were named "--clean-seen-content" +or something like that. + +But, --deduplicate has the same behavior for such files, and I can't see a +way to rename that more effectively. + +For now I have improved the git-annex-import man page to note that +annexed content that's been removed would make a file be considered a +duplicate. +"""]] diff --git a/doc/git-annex-import.mdwn b/doc/git-annex-import.mdwn index 43e619607..b8c8e5691 100644 --- a/doc/git-annex-import.mdwn +++ b/doc/git-annex-import.mdwn @@ -16,8 +16,9 @@ If a directory is specified, the entire directory is imported. When importing files, there's a possibility of importing a duplicate of a file that is already known to git-annex -- its content is either -present in the local repository already, or git-annex knows of anther -repository that contains it. +present in the local repository already, or git-annex knows of another +repository that contains it, or it was present in the annex before but has +been removed now. By default, importing a duplicate of a known file will result in a new filename being added to the repository, so the duplicate file |