Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge trunk | 
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive | 
| Timelines: | family | ancestors | descendants | both | svn-import | 
| Files: | files | file ages | folders | 
| SHA1: | 3cf9f2112d1042eb9e604ae6e855b64f | 
| User & Date: | jan.nijtmans 2015-01-15 10:00:37 | 
Context
| 2015-01-15 | ||
| 16:17 | Fix for new branch detection and handling check-in: 7673518b9b user: baruch tags: svn-import | |
| 10:00 | merge trunk check-in: 3cf9f2112d user: jan.nijtmans tags: svn-import | |
| 09:57 | Remove strglob() function, which isn't used any more. Various doc fixes, (cherry-picked from the svn-import branch). check-in: 2c79aed2d5 user: jan.nijtmans tags: trunk | |
| 09:29 | merge trunk check-in: f332f83b15 user: jan.nijtmans tags: svn-import | |
Changes
Changes to src/checkin.c.
| ︙ | ︙ | |||
| 1185 1186 1187 1188 1189 1190 1191 | 
        if( p->verifyDate ) checkin_verify_younger(mid, zMergeUuid, zDate);
        free(zMergeUuid);
      }
    }
    db_finalize(&q);
    blob_appendf(pOut, "\n");
  }
 | | | 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 | 
        if( p->verifyDate ) checkin_verify_younger(mid, zMergeUuid, zDate);
        free(zMergeUuid);
      }
    }
    db_finalize(&q);
    blob_appendf(pOut, "\n");
  }
  free(zDate);
  db_prepare(&q,
    "SELECT CASE vmerge.id WHEN -1 THEN '+' ELSE '-' END || blob.uuid, merge"
    "  FROM vmerge, blob"
    " WHERE (vmerge.id=-1 OR vmerge.id=-2)"
    "   AND blob.rid=vmerge.merge"
    " ORDER BY 1");
 | 
| ︙ | ︙ | 
Changes to src/glob.c.
| ︙ | ︙ | |||
| 136 137 138 139 140 141 142 | 
    if( z[i]==0 ) break;
    z[i] = 0;
    z += i+1;
  }
  return p;
}
 | < < < < < < < < < < < < < < < < < < < | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | 
    if( z[i]==0 ) break;
    z[i] = 0;
    z += i+1;
  }
  return p;
}
/*
** Return true (non-zero) if zString matches any of the patterns in
** the Glob.  The value returned is actually a 1-based index of the pattern
** that matched.  Return 0 if none of the patterns match zString.
**
** A NULL glob matches nothing.
*/
 | 
| ︙ | ︙ |