Fossil

Check-in [24048ead]
Login

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

Overview
Comment:fix bug in finding previous version of changed file
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | svn-import
Files: files | file ages | folders
SHA1: 24048eadf92474527b1eff4fce54c3c7ce2e9231
User & Date: baruch 2015-08-26 14:06:07.820
Context
2015-08-29
15:24
Merge fix from svn-import branch relative to svndump format version 3 handling. ... (check-in: 7febc318 user: mgagnon tags: trunk)
2015-08-26
14:06
fix bug in finding previous version of changed file ... (Closed-Leaf check-in: 24048ead user: baruch tags: svn-import)
09:34
Bring svn import up to date in an attempt to finish it ... (check-in: c75ca53e user: baruch tags: svn-import)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/import.c.
︙︙
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431

          fossil_fatal("Missing Node-kind");
        }
        if( strncmp(zKind, "dir", 3)!=0 ){
          if( deltaFlag ){
            Blob deltaSrc;
            Blob target;
            rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
                            " SELECT uuid FROM xfiles"
                            "  WHERE tpath=%Q AND tbranch=%d"
                            ")", zFile, branchId);
            content_get(rid, &deltaSrc);
            svn_apply_svndiff(&rec.content, &deltaSrc, &target);
            rid = content_put(&target);
          }else{
            rid = content_put(&rec.content);








|








1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431

          fossil_fatal("Missing Node-kind");
        }
        if( strncmp(zKind, "dir", 3)!=0 ){
          if( deltaFlag ){
            Blob deltaSrc;
            Blob target;
            rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
                            " SELECT tuuid FROM xfiles"
                            "  WHERE tpath=%Q AND tbranch=%d"
                            ")", zFile, branchId);
            content_get(rid, &deltaSrc);
            svn_apply_svndiff(&rec.content, &deltaSrc, &target);
            rid = content_put(&target);
          }else{
            rid = content_put(&rec.content);
︙︙