Fossil

Check-in [7febc318]
Login

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

Overview
Comment:Merge fix from svn-import branch relative to svndump format version 3 handling.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 7febc318835527adf02be863719c1132c3fc4b45
User & Date: mgagnon 2015-08-29 15:24:16
Original Comment: Merge fix from svn-import branch relative handling of svndump format version 3.
Context
2015-09-03
23:15
Merged from trunk with a few tiny edits to make new functionality work on Windows check-in: 8f33e49d user: sdr tags: winsymlink
2015-08-29
23:04
Fedora 21 -> 22 check-in: 1c708ccc user: jan.nijtmans tags: trunk
15:24
Merge fix from svn-import branch relative to svndump format version 3 handling. check-in: 7febc318 user: mgagnon tags: trunk
2015-08-27
14:24
Update change log. check-in: d43847c9 user: mistachkin 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
Changes
Hide Diffs Unified Diffs 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);