Fossil SCM
Ignore Subversion property changes when importing. Property changes were previously interpreted as changing a file to be empty.
Commit
ed7905b64da56ae4b3652b2b2b51157bc98cc93e
Parent
2ade560ea02f20f…
1 file changed
+1
-1
+1
-1
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -1477,11 +1477,11 @@ | ||
| 1477 | 1477 | if( strncmp(zAction, "change", 6)==0 ){ |
| 1478 | 1478 | int rid = 0; |
| 1479 | 1479 | if( zKind==0 ){ |
| 1480 | 1480 | fossil_fatal("Missing Node-kind"); |
| 1481 | 1481 | } |
| 1482 | - if( strncmp(zKind, "dir", 3)!=0 ){ | |
| 1482 | + if( rec.contentFlag && strncmp(zKind, "dir", 3)!=0 ){ | |
| 1483 | 1483 | if( deltaFlag ){ |
| 1484 | 1484 | Blob deltaSrc; |
| 1485 | 1485 | Blob target; |
| 1486 | 1486 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=(" |
| 1487 | 1487 | " SELECT tuuid FROM xfiles" |
| 1488 | 1488 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1477,11 +1477,11 @@ | |
| 1477 | if( strncmp(zAction, "change", 6)==0 ){ |
| 1478 | int rid = 0; |
| 1479 | if( zKind==0 ){ |
| 1480 | fossil_fatal("Missing Node-kind"); |
| 1481 | } |
| 1482 | if( strncmp(zKind, "dir", 3)!=0 ){ |
| 1483 | if( deltaFlag ){ |
| 1484 | Blob deltaSrc; |
| 1485 | Blob target; |
| 1486 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=(" |
| 1487 | " SELECT tuuid FROM xfiles" |
| 1488 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1477,11 +1477,11 @@ | |
| 1477 | if( strncmp(zAction, "change", 6)==0 ){ |
| 1478 | int rid = 0; |
| 1479 | if( zKind==0 ){ |
| 1480 | fossil_fatal("Missing Node-kind"); |
| 1481 | } |
| 1482 | if( rec.contentFlag && strncmp(zKind, "dir", 3)!=0 ){ |
| 1483 | if( deltaFlag ){ |
| 1484 | Blob deltaSrc; |
| 1485 | Blob target; |
| 1486 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=(" |
| 1487 | " SELECT tuuid FROM xfiles" |
| 1488 |