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 7842b8ab31 to 24048eadf9

2015-08-29
15:24
Merge fix from svn-import branch relative to svndump format version 3 handling. ... (check-in: 7febc31883 user: mgagnon tags: trunk)
2015-08-26
14:06
fix bug in finding previous version of changed file ... (Closed-Leaf check-in: 24048eadf9 user: baruch tags: svn-import)
09:57
Add comment on usage to mingw makefile ... (check-in: 1b6f257c3d user: baruch tags: trunk)
09:34
Bring svn import up to date in an attempt to finish it ... (check-in: c75ca53eee user: baruch tags: svn-import)
2015-08-22
12:42
merge trunk ... (check-in: b00e60194e user: michai tags: doc-bold-canonical)
2015-08-21
09:15
merge trunk ... (check-in: 0ab66b742c user: jan.nijtmans tags: cleanX)
04:33
Merge updates from trunk. ... (Closed-Leaf check-in: bf380d4b5b 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: 7842b8ab31 user: jan.nijtmans tags: trunk)
2015-08-15
20:04
Add link to the Tcl docs. ... (check-in: 5c49850e26 user: mistachkin tags: trunk)

Changes to src/import.c.

  1417   1417             fossil_fatal("Missing Node-kind");
  1418   1418           }
  1419   1419           if( strncmp(zKind, "dir", 3)!=0 ){
  1420   1420             if( deltaFlag ){
  1421   1421               Blob deltaSrc;
  1422   1422               Blob target;
  1423   1423               rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
  1424         -                            " SELECT uuid FROM xfiles"
         1424  +                            " SELECT tuuid FROM xfiles"
  1425   1425                               "  WHERE tpath=%Q AND tbranch=%d"
  1426   1426                               ")", zFile, branchId);
  1427   1427               content_get(rid, &deltaSrc);
  1428   1428               svn_apply_svndiff(&rec.content, &deltaSrc, &target);
  1429   1429               rid = content_put(&target);
  1430   1430             }else{
  1431   1431               rid = content_put(&rec.content);