# HG changeset patch # User Paul Crowley # Date 1255598690 -3600 # Node ID afb1d57ca9f7a8bbff5a6e2c2393919cac879d48 # Parent 0f79d1bea07e5655f287235e82eb63914692083c# Parent fb64f9ac44c5a56b487aeb64d486001c2b08120e Merge diff -r fb64f9ac44c5 -r afb1d57ca9f7 doc/manual.docbook --- a/doc/manual.docbook Thu Oct 15 09:26:19 2009 +0100 +++ b/doc/manual.docbook Thu Oct 15 10:24:50 2009 +0100 @@ -267,7 +267,8 @@ The way these conditions work is subtle and can be counterintuitive. Unless you need what they provide, ignore this section, stick to user and repo -conditions, and then things are likely to work the way you would expect. +conditions, and then things are likely to work the way you would expect. If +you do need what they provide, read what follows very carefully. File and branch conditions are added to the conditions against which a rule @@ -296,18 +297,20 @@ Whether to allow any access to a repository -Whether to allow a changeset, which is on a some branch - - -Whether to allow a changeset which changes a particular file +Whether to allow a changeset When the first two of these decisions are being made, nothing is known -about what files might be changed, and so all file and branch conditions -automatically succeed for the purpose of such decisions. This means that -doing tricky things with file conditions can have counterintuitive -consequences: +about any changsets that might be pushed, and so all file and branch +conditions automatically succeed for the purpose of such decisions. For the +third condition, every file changed in the changeset must be allowed by a +write or init rule for the changeset +to be allowed. + + +This means that doing tricky things with file conditions can have +counterintuitive consequences: