Fossil SCM
fossil import --incremental should set the appropriate ancestor for the first commit in each branch being added
Commit
c95d7a9c3d323ee0c57266c97b516b07918daa59
Parent
24e298edd02f9b8…
1 file changed
+8
+8
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -250,10 +250,18 @@ | ||
| 250 | 250 | blob_append(&record, " l\n", 3); |
| 251 | 251 | gg.hasLinks = 1; |
| 252 | 252 | }else{ |
| 253 | 253 | blob_append(&record, "\n", 1); |
| 254 | 254 | } |
| 255 | + } | |
| 256 | + if( !gg.zFrom && gg.zBranch){ | |
| 257 | + Blob name; | |
| 258 | + blob_init(&name, gg.zBranch, -1); | |
| 259 | + if( name_to_uuid(&name, 1, "*") == 0){ | |
| 260 | + gg.zFrom = strdup(blob_buffer(&name)); | |
| 261 | + } | |
| 262 | + blob_reset(&name); | |
| 255 | 263 | } |
| 256 | 264 | if( gg.zFrom ){ |
| 257 | 265 | blob_appendf(&record, "P %s", gg.zFrom); |
| 258 | 266 | for(i=0; i<gg.nMerge; i++){ |
| 259 | 267 | blob_appendf(&record, " %s", gg.azMerge[i]); |
| 260 | 268 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -250,10 +250,18 @@ | |
| 250 | blob_append(&record, " l\n", 3); |
| 251 | gg.hasLinks = 1; |
| 252 | }else{ |
| 253 | blob_append(&record, "\n", 1); |
| 254 | } |
| 255 | } |
| 256 | if( gg.zFrom ){ |
| 257 | blob_appendf(&record, "P %s", gg.zFrom); |
| 258 | for(i=0; i<gg.nMerge; i++){ |
| 259 | blob_appendf(&record, " %s", gg.azMerge[i]); |
| 260 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -250,10 +250,18 @@ | |
| 250 | blob_append(&record, " l\n", 3); |
| 251 | gg.hasLinks = 1; |
| 252 | }else{ |
| 253 | blob_append(&record, "\n", 1); |
| 254 | } |
| 255 | } |
| 256 | if( !gg.zFrom && gg.zBranch){ |
| 257 | Blob name; |
| 258 | blob_init(&name, gg.zBranch, -1); |
| 259 | if( name_to_uuid(&name, 1, "*") == 0){ |
| 260 | gg.zFrom = strdup(blob_buffer(&name)); |
| 261 | } |
| 262 | blob_reset(&name); |
| 263 | } |
| 264 | if( gg.zFrom ){ |
| 265 | blob_appendf(&record, "P %s", gg.zFrom); |
| 266 | for(i=0; i<gg.nMerge; i++){ |
| 267 | blob_appendf(&record, " %s", gg.azMerge[i]); |
| 268 |