subversion/libsvn_client/merge.c

1863              Non-inheritable mergeinfo will be recorded, allowing
2673              Non-inheritable mergeinfo will be recorded, allowing
3412    inheritable. This ensures that a future merge might see these skipped
3830  * (inheritable) revision range REV1:REV2, according to CONSIDER_INHERITANCE.
3835  * inheritable input ranges as if they were inheritable.  If it is TRUE, the
3836  * effect is to discard any non-inheritable input ranges.  Therefore the
3837  * ranges in *OUT_RANGELIST will always be inheritable. */
4564              5:3 and TARGET_RANGELIST is r5* (non-inheritable) then the
4571              safe to do because any path whose parent has non-inheritable
5443                  ### TODO:  Set non-inheritable mergeinfo on PATH's immediate
5539    * The 'inheritable' flag is ignored. */
5542    * NULL if no more.  The 'inheritable' flag is ignored. */
6453         its immediate parent has mergeinfo with non-inheritable ranges.  If
6456         equal to the mergeinfo inheritable from its parent.
6534           /* Note if this child has non-inheritable mergeinfo */
6658              only inheritable mergeinfo, we still describe it as having
6659              non-inheritable mergeinfo if it is missing a child due to
6661              to describe the merge must be non-inheritable, so PATH's missing
6663              inheritable allows the logic for case 3 to properly account
6781          gets non-inheritable mergeinfo for the merge range performed and
6797          previously non-inheritable mergeinfo and make it inheritable
6802          mergeinfo, removing the non-inheritable flag, it appears that the
6806          inheritable mergeinfo. */
7395           mrange.inheritable = TRUE;
7441                               requested_range->inheritable, pool);
7560   range.inheritable = TRUE;
7879               n_range.inheritable = TRUE;
8311    mergeinfo should be non-inheritable respectively.
8348      children which necessitates non-inheritable mergeinfo. */
8415              (e.g. record non-inheritable mergeinfo) when recording
8457              non-inheritable? */
8462           /* Only directories can have non-inheritable mergeinfo. */
8465               /* There are two general cases where non-inheritable mergeinfo
8484                      must record non-inheritable mergeinfo.
8487                      ### the merge target needs only normal inheritable
8489                      ### get non-inheritable mergeinfo, assuming they
8500                       non-inheritable mergeinfo. */
8512              non-inheritable mergeinfo, then the explicit mergeinfo it
8579      the added complexity (and user confusion) of non-inheritable ranges.
8582     range.inheritable = TRUE;
8644           /* We may need to record non-inheritable mergeinfo that applies
8818    non-inheritable mergeinfo.
8863          parent have non-inheritable mergeinfo? */
9004   new_range->inheritable = TRUE;
9115              event the inherited mergeinfo is actually non-inheritable. */
9438   range.inheritable = TRUE;
9657       /* If a path has an immediate parent with non-inheritable mergeinfo at
9665          immediate parent (if any, the parent might have only non-inheritable
12244      the youngest merged rev is non-inheritable, the *same* non-inheritable