Fossil

Check-in [c95d7a9c]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fossil import --incremental should set the appropriate ancestor for the first commit in each branch being added
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | steveb-fixes
Files: files | file ages | folders
SHA1:c95d7a9c3d323ee0c57266c97b516b07918daa59
User & Date: steveb 2011-11-14 00:13:20
Context
2011-11-14
00:13
fossil import --incremental should set the appropriate ancestor for the first commit in each branch being added Leaf check-in: c95d7a9c user: steveb tags: steveb-fixes
2011-11-05
03:45
Fix some more compiler warnings seen with MSVC. check-in: 24e298ed user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/import.c.

248
249
250
251
252
253
254








255
256
257
258
259
260
261
      blob_append(&record, " x\n", 3);
    }else if( gg.aFile[i].isLink ){
      blob_append(&record, " l\n", 3);
      gg.hasLinks = 1;
    }else{
      blob_append(&record, "\n", 1);
    }








  }
  if( gg.zFrom ){
    blob_appendf(&record, "P %s", gg.zFrom);
    for(i=0; i<gg.nMerge; i++){
      blob_appendf(&record, " %s", gg.azMerge[i]);
    }
    blob_append(&record, "\n", 1);







>
>
>
>
>
>
>
>







248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
      blob_append(&record, " x\n", 3);
    }else if( gg.aFile[i].isLink ){
      blob_append(&record, " l\n", 3);
      gg.hasLinks = 1;
    }else{
      blob_append(&record, "\n", 1);
    }
  }
  if( !gg.zFrom && gg.zBranch){
    Blob name;
    blob_init(&name, gg.zBranch, -1);
    if( name_to_uuid(&name, 1, "*") == 0){
      gg.zFrom = strdup(blob_buffer(&name));
    }
    blob_reset(&name);
  }
  if( gg.zFrom ){
    blob_appendf(&record, "P %s", gg.zFrom);
    for(i=0; i<gg.nMerge; i++){
      blob_appendf(&record, " %s", gg.azMerge[i]);
    }
    blob_append(&record, "\n", 1);