Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch steveb-fixes Excluding Merge-Ins
This is equivalent to a diff from 24e298edd0 to c95d7a9c3d
|
2011-11-14
| ||
| 03:02 | Update the built-in SQLite to version 3.7.9 plus the 8-byte alignment fix in branch-3.7.9. check-in: 0c8d1ca9cd user: drh tags: trunk | |
| 00:13 | fossil import --incremental should set the appropriate ancestor for the first commit in each branch being added Leaf check-in: c95d7a9c3d user: steveb tags: steveb-fixes | |
|
2011-11-13
| ||
| 09:11 | Merge with trunk check-in: c30eaa8862 user: ashish tags: ashish-ipv6 | |
|
2011-11-05
| ||
| 22:50 | Add fixes to classic makefile to support MinGW mostly automatically. check-in: 590cee0ec9 user: mistachkin tags: auto-mingw-makefile | |
| 03:45 | Fix some more compiler warnings seen with MSVC. check-in: 24e298edd0 user: mistachkin tags: trunk | |
| 03:22 | Be sure to escape any backslashes when emitting #line preprocessor directives in the translate.c tool, cherrypick from [e36ad719cf]. check-in: c2bed5b3db user: mistachkin tags: trunk | |
Changes to src/import.c.
248 248 blob_append(&record, " x\n", 3); 249 249 }else if( gg.aFile[i].isLink ){ 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 } 261 269 blob_append(&record, "\n", 1);