summaryrefslogtreecommitdiff
path: root/doc/preferred_content.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-20 00:10:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-20 00:10:12 -0400
commite8afcf6e6dcda746ed365c1b64de3b2171418830 (patch)
treee220837a41ad25eb4f722d7ae8dcabc571d26be2 /doc/preferred_content.mdwn
parent1018c549a7e0c7442239533d0c62c83a0978f7d6 (diff)
Improve behavior when unable to parse a preferred content expression (thanks, ion).
Fall back to "present" as the preferred conent expression, which will not result in any content movement.
Diffstat (limited to 'doc/preferred_content.mdwn')
-rw-r--r--doc/preferred_content.mdwn10
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index e031498d5..af76a0e7b 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -149,9 +149,13 @@ group and make its preferred content be "groupwanted" will use it.
It's important that all clones of a repository can understand one-another's
preferred content expressions, especially when using the git-annex
assistant. So using newly added keywords can cause a problem if
-an older version of git-annex is in use elsewhere. When an old version
-of git-annex sees a keyword it does not understand, it assumes that keyword
-will match *all* files.
+an older version of git-annex is in use elsewhere.
+
+Before git-annex version 5.20140320, when git-annex saw a keyword it
+did not understand, it defaulted to assuming *all* files were
+preferred content. From version 5.20140320, git-annex has a nicer fallback
+behavior: When it is unable to parse a preferred content expression,
+it assumes all files that are currently present are preferred content.
Here are recent changes to preferred content expressions, and the version
they were added in.