Fossil SCM
Fix a typo and tagging issue
Commit
2b6fc1dd2c43d0627a7f1b92f187016bbe9a205f
Parent
ea876c3f17ed018…
1 file changed
+5
-3
+5
-3
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -944,14 +944,16 @@ | ||
| 944 | 944 | } |
| 945 | 945 | if( parentRid>0 ){ |
| 946 | 946 | const char *zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", parentRid); |
| 947 | 947 | blob_appendf(&manifest, "P %s\n", zParentUuid); |
| 948 | 948 | if( onBranch==0 ){ |
| 949 | - const char *zParentBranch = db_text(0, "SELECT tbranch FROM xbranches WHERE tid=(SELECT tbranch FROM xrevisions WHERE trid=%d)", parentRid); | |
| 950 | 949 | blob_appendf(&manifest, "T *branch * %F\n", zBranch); |
| 951 | 950 | blob_appendf(&manifest, "T *sym-%F *\n", zBranch); |
| 952 | - blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev); | |
| 951 | + } | |
| 952 | + blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev); | |
| 953 | + if( onBranch==0 ){ | |
| 954 | + const char *zParentBranch = db_text(0, "SELECT tbranch FROM xbranches WHERE tid=(SELECT tbranch FROM xrevisions WHERE trid=%d)", parentRid); | |
| 953 | 955 | blob_appendf(&manifest, "T -sym-%s *\n", zParentBranch); |
| 954 | 956 | } |
| 955 | 957 | }else{ |
| 956 | 958 | blob_appendf(&manifest, "T *branch * %F\n", zBranch); |
| 957 | 959 | blob_appendf(&manifest, "T *sym-%F *\n", zBranch); |
| @@ -1250,11 +1252,11 @@ | ||
| 1250 | 1252 | int srcRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions" |
| 1251 | 1253 | " WHERE trev<=%d AND tbranch=%d", |
| 1252 | 1254 | srcRev, srcBranch); |
| 1253 | 1255 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=(" |
| 1254 | 1256 | " SELECT uuid FROM xfoci" |
| 1255 | - " WHERE chekinID=%d AND filename=%Q" | |
| 1257 | + " WHERE checkinID=%d AND filename=%Q" | |
| 1256 | 1258 | ")", |
| 1257 | 1259 | srcRid, zSrcFile); |
| 1258 | 1260 | } |
| 1259 | 1261 | if( deltaFlag ){ |
| 1260 | 1262 | Blob deltaSrc; |
| 1261 | 1263 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -944,14 +944,16 @@ | |
| 944 | } |
| 945 | if( parentRid>0 ){ |
| 946 | const char *zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", parentRid); |
| 947 | blob_appendf(&manifest, "P %s\n", zParentUuid); |
| 948 | if( onBranch==0 ){ |
| 949 | const char *zParentBranch = db_text(0, "SELECT tbranch FROM xbranches WHERE tid=(SELECT tbranch FROM xrevisions WHERE trid=%d)", parentRid); |
| 950 | blob_appendf(&manifest, "T *branch * %F\n", zBranch); |
| 951 | blob_appendf(&manifest, "T *sym-%F *\n", zBranch); |
| 952 | blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev); |
| 953 | blob_appendf(&manifest, "T -sym-%s *\n", zParentBranch); |
| 954 | } |
| 955 | }else{ |
| 956 | blob_appendf(&manifest, "T *branch * %F\n", zBranch); |
| 957 | blob_appendf(&manifest, "T *sym-%F *\n", zBranch); |
| @@ -1250,11 +1252,11 @@ | |
| 1250 | int srcRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions" |
| 1251 | " WHERE trev<=%d AND tbranch=%d", |
| 1252 | srcRev, srcBranch); |
| 1253 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=(" |
| 1254 | " SELECT uuid FROM xfoci" |
| 1255 | " WHERE chekinID=%d AND filename=%Q" |
| 1256 | ")", |
| 1257 | srcRid, zSrcFile); |
| 1258 | } |
| 1259 | if( deltaFlag ){ |
| 1260 | Blob deltaSrc; |
| 1261 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -944,14 +944,16 @@ | |
| 944 | } |
| 945 | if( parentRid>0 ){ |
| 946 | const char *zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", parentRid); |
| 947 | blob_appendf(&manifest, "P %s\n", zParentUuid); |
| 948 | if( onBranch==0 ){ |
| 949 | blob_appendf(&manifest, "T *branch * %F\n", zBranch); |
| 950 | blob_appendf(&manifest, "T *sym-%F *\n", zBranch); |
| 951 | } |
| 952 | blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev); |
| 953 | if( onBranch==0 ){ |
| 954 | const char *zParentBranch = db_text(0, "SELECT tbranch FROM xbranches WHERE tid=(SELECT tbranch FROM xrevisions WHERE trid=%d)", parentRid); |
| 955 | blob_appendf(&manifest, "T -sym-%s *\n", zParentBranch); |
| 956 | } |
| 957 | }else{ |
| 958 | blob_appendf(&manifest, "T *branch * %F\n", zBranch); |
| 959 | blob_appendf(&manifest, "T *sym-%F *\n", zBranch); |
| @@ -1250,11 +1252,11 @@ | |
| 1252 | int srcRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions" |
| 1253 | " WHERE trev<=%d AND tbranch=%d", |
| 1254 | srcRev, srcBranch); |
| 1255 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=(" |
| 1256 | " SELECT uuid FROM xfoci" |
| 1257 | " WHERE checkinID=%d AND filename=%Q" |
| 1258 | ")", |
| 1259 | srcRid, zSrcFile); |
| 1260 | } |
| 1261 | if( deltaFlag ){ |
| 1262 | Blob deltaSrc; |
| 1263 |