Fossil

Changes On Branch svn-import
Login

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

Changes In Branch svn-import Excluding Merge-Ins

This is equivalent to a diff from 7842b8ab to 24048ead

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:57
Add comment on usage to mingw makefile ... (check-in: 1b6f257c user: baruch tags: trunk)
09:34
Bring svn import up to date in an attempt to finish it ... (check-in: c75ca53e user: baruch tags: svn-import)
2015-08-22
12:42
merge trunk ... (check-in: b00e6019 user: michai tags: doc-bold-canonical)
2015-08-21
09:15
merge trunk ... (check-in: 0ab66b74 user: jan.nijtmans tags: cleanX)
04:33
Merge updates from trunk. ... (Closed-Leaf check-in: bf380d4b user: mistachkin tags: ckol-th1-dir-cmd)
2015-08-18
13:28
Update the built-in SQLite to version 3.8.11.1 ... (check-in: 7842b8ab user: jan.nijtmans tags: trunk)
2015-08-15
20:04
Add link to the Tcl docs. ... (check-in: 5c49850e user: mistachkin tags: trunk)

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);