Fossil SCM

Don't copy all files on a tag

baruch 2015-01-11 13:32 svn-import
Commit fb90d6c657c9db1efe4b6dc9e0ed880dad49f579
1 file changed +1 -4
+1 -4
--- src/import.c
+++ src/import.c
@@ -1276,11 +1276,11 @@
12761276
}
12771277
}
12781278
if( zKind==0 ){
12791279
fossil_fatal("Missing Node-kind");
12801280
}else if( strncmp(zKind, "dir", 3)==0 ){
1281
- if( zSrcPath ){
1281
+ if( zSrcPath && branchType!=SVN_TAG ){
12821282
if( srcRid>0 ){
12831283
if( zFile[0]==0 ){
12841284
db_bind_text(&cpyRoot, ":path", zFile);
12851285
db_bind_int(&cpyRoot, ":branch", branchId);
12861286
db_bind_int(&cpyRoot, ":rid", srcRid);
@@ -1292,13 +1292,10 @@
12921292
db_bind_text(&cpyPath, ":srcpath", zSrcFile);
12931293
db_bind_int(&cpyPath, ":rid", srcRid);
12941294
db_step(&cpyPath);
12951295
db_reset(&cpyPath);
12961296
}
1297
- db_bind_int(&addRev, ":branch", branchId);
1298
- db_step(&addRev);
1299
- db_reset(&addRev);
13001297
}
13011298
}
13021299
}else{
13031300
int rid = 0;
13041301
if( zSrcPath ){
13051302
--- src/import.c
+++ src/import.c
@@ -1276,11 +1276,11 @@
1276 }
1277 }
1278 if( zKind==0 ){
1279 fossil_fatal("Missing Node-kind");
1280 }else if( strncmp(zKind, "dir", 3)==0 ){
1281 if( zSrcPath ){
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);
@@ -1292,13 +1292,10 @@
1292 db_bind_text(&cpyPath, ":srcpath", zSrcFile);
1293 db_bind_int(&cpyPath, ":rid", srcRid);
1294 db_step(&cpyPath);
1295 db_reset(&cpyPath);
1296 }
1297 db_bind_int(&addRev, ":branch", branchId);
1298 db_step(&addRev);
1299 db_reset(&addRev);
1300 }
1301 }
1302 }else{
1303 int rid = 0;
1304 if( zSrcPath ){
1305
--- src/import.c
+++ src/import.c
@@ -1276,11 +1276,11 @@
1276 }
1277 }
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);
@@ -1292,13 +1292,10 @@
1292 db_bind_text(&cpyPath, ":srcpath", zSrcFile);
1293 db_bind_int(&cpyPath, ":rid", srcRid);
1294 db_step(&cpyPath);
1295 db_reset(&cpyPath);
1296 }
 
 
 
1297 }
1298 }
1299 }else{
1300 int rid = 0;
1301 if( zSrcPath ){
1302

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button