Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix for new branch detection and handling |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | svn-import |
| Files: | files | file ages | folders |
| SHA1: | 7673518b9b84703a996670d6cc2ff53e |
| User & Date: | baruch 2015-01-15 16:17:20 |
Context
|
2015-01-18
| ||
| 14:10 | Much better detection of changes to tags. Prevent commit with no changes. check-in: bb020aed user: baruch tags: svn-import | |
|
2015-01-15
| ||
| 16:17 | Fix for new branch detection and handling check-in: 7673518b user: baruch tags: svn-import | |
| 10:00 | merge trunk check-in: 3cf9f211 user: jan.nijtmans tags: svn-import | |
Changes
Changes to src/import.c.
1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 .... 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 .... 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 |
if( branchId==0 ){
svn_free_rec(&rec);
continue;
}
if( (zTemp = svn_find_header(rec, "Text-delta")) ){
deltaFlag = strncmp(zTemp, "true", 4)==0;
}
if( zFile[0]==0 ){
bag_insert(&gsvn.newBranches, branchId);
}
if( strncmp(zAction, "delete", 6)==0
|| strncmp(zAction, "replace", 7)==0 )
{
//TODO delete root
db_bind_text(&delPath, ":path", zFile);
db_bind_int(&delPath, ":branch", branchId);
db_step(&delPath);
................................................................................
}
}
if( zKind==0 ){
fossil_fatal("Missing Node-kind");
}else if( strncmp(zKind, "dir", 3)==0 ){
if( zSrcPath && branchType!=SVN_TAG ){
if( srcRid>0 ){
if( zFile[0]==0 ){
db_bind_text(&cpyRoot, ":path", zFile);
db_bind_int(&cpyRoot, ":branch", branchId);
db_bind_int(&cpyRoot, ":rid", srcRid);
db_step(&cpyRoot);
db_reset(&cpyRoot);
}else{
db_bind_text(&cpyPath, ":path", zFile);
................................................................................
db_bind_text(&cpyPath, ":srcpath", zSrcFile);
db_bind_int(&cpyPath, ":rid", srcRid);
db_step(&cpyPath);
db_reset(&cpyPath);
}
}
}
}else{
int rid = 0;
if( zSrcPath ){
rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
" SELECT uuid FROM xfoci"
" WHERE checkinID=%d AND filename=%Q"
")",
|
< < < | > > > |
1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 .... 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 .... 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 |
if( branchId==0 ){
svn_free_rec(&rec);
continue;
}
if( (zTemp = svn_find_header(rec, "Text-delta")) ){
deltaFlag = strncmp(zTemp, "true", 4)==0;
}
if( strncmp(zAction, "delete", 6)==0
|| strncmp(zAction, "replace", 7)==0 )
{
//TODO delete root
db_bind_text(&delPath, ":path", zFile);
db_bind_int(&delPath, ":branch", branchId);
db_step(&delPath);
................................................................................
}
}
if( zKind==0 ){
fossil_fatal("Missing Node-kind");
}else if( strncmp(zKind, "dir", 3)==0 ){
if( zSrcPath && branchType!=SVN_TAG ){
if( srcRid>0 ){
if( zSrcFile[0]==0 ){
db_bind_text(&cpyRoot, ":path", zFile);
db_bind_int(&cpyRoot, ":branch", branchId);
db_bind_int(&cpyRoot, ":rid", srcRid);
db_step(&cpyRoot);
db_reset(&cpyRoot);
}else{
db_bind_text(&cpyPath, ":path", zFile);
................................................................................
db_bind_text(&cpyPath, ":srcpath", zSrcFile);
db_bind_int(&cpyPath, ":rid", srcRid);
db_step(&cpyPath);
db_reset(&cpyPath);
}
}
}
if( zFile[0]==0 ){
bag_insert(&gsvn.newBranches, branchId);
}
}else{
int rid = 0;
if( zSrcPath ){
rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
" SELECT uuid FROM xfoci"
" WHERE checkinID=%d AND filename=%Q"
")",
|