Fossil

Differences From Artifact [dfdf0a3e3e]:

• File src/import.c — part of check-in [2ade560ea0] at 2016-05-14 04:32:22 on branch andygoth-svn-import — Avoid NULL dereference when importing incremental Subversion dumps. This may not be the correct solution, but at least it's not outright crashing anymore. (user: andygoth size: 58505)

To Artifact [520d8a5227]:

• File src/import.c — part of check-in [ed7905b64d] at 2016-05-14 13:10:10 on branch andygoth-svn-import — Ignore Subversion property changes when importing. Property changes were previously interpreted as changing a file to be empty. (user: andygoth size: 58524)

1475
1476
1477
1478
1479
1480
1481
1482

1483
1484
1485
1486
1487
1488
1489

1475
1476
1477
1478
1479
1480
1481

1482
1483
1484
1485
1486
1487
1488
1489

-
+

        }
      }else
      if( strncmp(zAction, "change", 6)==0 ){
        int rid = 0;
        if( zKind==0 ){
          fossil_fatal("Missing Node-kind");
        }
        if( strncmp(zKind, "dir", 3)!=0 ){
        if( rec.contentFlag && 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);