Fossil SCM
Fix for new branch detection and handling
Commit
7673518b9b84703a996670d6cc2ff53e6c793f59
Parent
3cf9f2112d1042e…
1 file changed
+4
-4
+4
-4
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -1220,13 +1220,10 @@ | ||
| 1220 | 1220 | continue; |
| 1221 | 1221 | } |
| 1222 | 1222 | if( (zTemp = svn_find_header(rec, "Text-delta")) ){ |
| 1223 | 1223 | deltaFlag = strncmp(zTemp, "true", 4)==0; |
| 1224 | 1224 | } |
| 1225 | - if( zFile[0]==0 ){ | |
| 1226 | - bag_insert(&gsvn.newBranches, branchId); | |
| 1227 | - } | |
| 1228 | 1225 | if( strncmp(zAction, "delete", 6)==0 |
| 1229 | 1226 | || strncmp(zAction, "replace", 7)==0 ) |
| 1230 | 1227 | { |
| 1231 | 1228 | //TODO delete root |
| 1232 | 1229 | db_bind_text(&delPath, ":path", zFile); |
| @@ -1278,11 +1275,11 @@ | ||
| 1278 | 1275 | if( zKind==0 ){ |
| 1279 | 1276 | fossil_fatal("Missing Node-kind"); |
| 1280 | 1277 | }else if( strncmp(zKind, "dir", 3)==0 ){ |
| 1281 | 1278 | if( zSrcPath && branchType!=SVN_TAG ){ |
| 1282 | 1279 | if( srcRid>0 ){ |
| 1283 | - if( zFile[0]==0 ){ | |
| 1280 | + if( zSrcFile[0]==0 ){ | |
| 1284 | 1281 | db_bind_text(&cpyRoot, ":path", zFile); |
| 1285 | 1282 | db_bind_int(&cpyRoot, ":branch", branchId); |
| 1286 | 1283 | db_bind_int(&cpyRoot, ":rid", srcRid); |
| 1287 | 1284 | db_step(&cpyRoot); |
| 1288 | 1285 | db_reset(&cpyRoot); |
| @@ -1294,10 +1291,13 @@ | ||
| 1294 | 1291 | db_step(&cpyPath); |
| 1295 | 1292 | db_reset(&cpyPath); |
| 1296 | 1293 | } |
| 1297 | 1294 | } |
| 1298 | 1295 | } |
| 1296 | + if( zFile[0]==0 ){ | |
| 1297 | + bag_insert(&gsvn.newBranches, branchId); | |
| 1298 | + } | |
| 1299 | 1299 | }else{ |
| 1300 | 1300 | int rid = 0; |
| 1301 | 1301 | if( zSrcPath ){ |
| 1302 | 1302 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=(" |
| 1303 | 1303 | " SELECT uuid FROM xfoci" |
| 1304 | 1304 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1220,13 +1220,10 @@ | |
| 1220 | continue; |
| 1221 | } |
| 1222 | if( (zTemp = svn_find_header(rec, "Text-delta")) ){ |
| 1223 | deltaFlag = strncmp(zTemp, "true", 4)==0; |
| 1224 | } |
| 1225 | if( zFile[0]==0 ){ |
| 1226 | bag_insert(&gsvn.newBranches, branchId); |
| 1227 | } |
| 1228 | if( strncmp(zAction, "delete", 6)==0 |
| 1229 | || strncmp(zAction, "replace", 7)==0 ) |
| 1230 | { |
| 1231 | //TODO delete root |
| 1232 | db_bind_text(&delPath, ":path", zFile); |
| @@ -1278,11 +1275,11 @@ | |
| 1278 | if( zKind==0 ){ |
| 1279 | fossil_fatal("Missing Node-kind"); |
| 1280 | }else if( strncmp(zKind, "dir", 3)==0 ){ |
| 1281 | if( zSrcPath && branchType!=SVN_TAG ){ |
| 1282 | if( srcRid>0 ){ |
| 1283 | if( zFile[0]==0 ){ |
| 1284 | db_bind_text(&cpyRoot, ":path", zFile); |
| 1285 | db_bind_int(&cpyRoot, ":branch", branchId); |
| 1286 | db_bind_int(&cpyRoot, ":rid", srcRid); |
| 1287 | db_step(&cpyRoot); |
| 1288 | db_reset(&cpyRoot); |
| @@ -1294,10 +1291,13 @@ | |
| 1294 | db_step(&cpyPath); |
| 1295 | db_reset(&cpyPath); |
| 1296 | } |
| 1297 | } |
| 1298 | } |
| 1299 | }else{ |
| 1300 | int rid = 0; |
| 1301 | if( zSrcPath ){ |
| 1302 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=(" |
| 1303 | " SELECT uuid FROM xfoci" |
| 1304 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1220,13 +1220,10 @@ | |
| 1220 | continue; |
| 1221 | } |
| 1222 | if( (zTemp = svn_find_header(rec, "Text-delta")) ){ |
| 1223 | deltaFlag = strncmp(zTemp, "true", 4)==0; |
| 1224 | } |
| 1225 | if( strncmp(zAction, "delete", 6)==0 |
| 1226 | || strncmp(zAction, "replace", 7)==0 ) |
| 1227 | { |
| 1228 | //TODO delete root |
| 1229 | db_bind_text(&delPath, ":path", zFile); |
| @@ -1278,11 +1275,11 @@ | |
| 1275 | if( zKind==0 ){ |
| 1276 | fossil_fatal("Missing Node-kind"); |
| 1277 | }else if( strncmp(zKind, "dir", 3)==0 ){ |
| 1278 | if( zSrcPath && branchType!=SVN_TAG ){ |
| 1279 | if( srcRid>0 ){ |
| 1280 | if( zSrcFile[0]==0 ){ |
| 1281 | db_bind_text(&cpyRoot, ":path", zFile); |
| 1282 | db_bind_int(&cpyRoot, ":branch", branchId); |
| 1283 | db_bind_int(&cpyRoot, ":rid", srcRid); |
| 1284 | db_step(&cpyRoot); |
| 1285 | db_reset(&cpyRoot); |
| @@ -1294,10 +1291,13 @@ | |
| 1291 | db_step(&cpyPath); |
| 1292 | db_reset(&cpyPath); |
| 1293 | } |
| 1294 | } |
| 1295 | } |
| 1296 | if( zFile[0]==0 ){ |
| 1297 | bag_insert(&gsvn.newBranches, branchId); |
| 1298 | } |
| 1299 | }else{ |
| 1300 | int rid = 0; |
| 1301 | if( zSrcPath ){ |
| 1302 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=(" |
| 1303 | " SELECT uuid FROM xfoci" |
| 1304 |