Fossil SCM

fix bug in finding previous version of changed file

baruch 2015-08-26 14:06 svn-import
Commit 24048eadf92474527b1eff4fce54c3c7ce2e9231
1 file changed +1 -1
+1 -1
--- src/import.c
+++ src/import.c
@@ -1419,11 +1419,11 @@
14191419
if( strncmp(zKind, "dir", 3)!=0 ){
14201420
if( deltaFlag ){
14211421
Blob deltaSrc;
14221422
Blob target;
14231423
rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
1424
- " SELECT uuid FROM xfiles"
1424
+ " SELECT tuuid FROM xfiles"
14251425
" WHERE tpath=%Q AND tbranch=%d"
14261426
")", zFile, branchId);
14271427
content_get(rid, &deltaSrc);
14281428
svn_apply_svndiff(&rec.content, &deltaSrc, &target);
14291429
rid = content_put(&target);
14301430
--- src/import.c
+++ src/import.c
@@ -1419,11 +1419,11 @@
1419 if( strncmp(zKind, "dir", 3)!=0 ){
1420 if( deltaFlag ){
1421 Blob deltaSrc;
1422 Blob target;
1423 rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
1424 " SELECT uuid FROM xfiles"
1425 " WHERE tpath=%Q AND tbranch=%d"
1426 ")", zFile, branchId);
1427 content_get(rid, &deltaSrc);
1428 svn_apply_svndiff(&rec.content, &deltaSrc, &target);
1429 rid = content_put(&target);
1430
--- src/import.c
+++ src/import.c
@@ -1419,11 +1419,11 @@
1419 if( strncmp(zKind, "dir", 3)!=0 ){
1420 if( deltaFlag ){
1421 Blob deltaSrc;
1422 Blob target;
1423 rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
1424 " SELECT tuuid FROM xfiles"
1425 " WHERE tpath=%Q AND tbranch=%d"
1426 ")", zFile, branchId);
1427 content_get(rid, &deltaSrc);
1428 svn_apply_svndiff(&rec.content, &deltaSrc, &target);
1429 rid = content_put(&target);
1430

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button