subversion/libsvn_client/merge.c

99  *    # Notice that this copy leaves a gap between 865262 and 865417.
155  *    (and there is a gap, the revision range [865262, 865416])
273   /* Rangelist containing single range which describes the gap, if any,
277      is no gap. */
1296  * editor drives because of a gap in the range of eligible revisions.)
3641       /* If the merge source has a gap, then don't mention
3642          those gap revisions in the notification. */
4585    If not null, IMPLICIT_SRC_GAP is the gap, if any, in the natural history
4633      to SOURCE (excluding any gap in SOURCE): first get all ranges from
4635      any ranges that lie in the gap in SOURCE.
4645       /* Remove any mergeinfo referring to the 'gap' in SOURCE, as that
4749    allow for a *single* gap in SOURCE, GAP_REV1:GAP_REV2 exclusive:inclusive
4752    a gap exists, set *GAP_START and *GAP_END to the starting and ending
4753    revisions of the gap.  Otherwise set both to SVN_INVALID_REVNUM.
4761    ### GAP_START is basically redundant, as (if there is a gap at all) it is
4784   /* Start by assuming there is no gap. */
4787   /* Easy out: There can't be a gap between adjacent revisions. */
4803   /* A gap in natural history can result from either a copy or
4814     In both cases the gap, if it exists, is M-N, where M = X + 1 and
4827       const svn_merge_range_t *gap;
4831       gap = APR_ARRAY_IDX(rangelist, rangelist->nelts - 1,
4835       *gap_end = gap->start;
4863       /* If there is anything left it is the gap. */
4998   /* Stash any gap in the merge command baton, we'll need it later when
5078       /* Deal with any gap in SOURCE's natural history.
5080          If the gap is a proper subset of CHILD->REMAINING_RANGES then we can
5083          If the gap exactly matches or is a superset of a range in
5088          If the gap adjoins or overlaps a range in CHILD->REMAINING_RANGES
5089          then we must *add* the gap so we span the missing revisions. */
5127               /* We need to make adjustments.  Remove from, or add the gap
6943          represents a gap, ignore it. */
6960           /* If we've backed PATH1 up into a segment gap, let's back
6961              it up further still to the segment before the gap.  We'll
7069      case to deal with.  Or if the first segment represents a gap,
7086          gap), then we'll fetch the copy source revision from the
8480               /* If the merge source has a gap, then don't mention
8481                  those gap revisions in the notification. */
12277          might have a gap there.) */