Fossil

Diff
Login

Diff

Differences From Artifact [b98893b9b7]:

To Artifact [273e852352]:


942
943
944
945
946
947
948
949
950
951

952



953
954
955
956
957
958
959
942
943
944
945
946
947
948

949
950
951

952
953
954
955
956
957
958
959
960
961







-


+
-
+
+
+







                              " WHERE trev<%d AND tbranch=%d", gsvn.rev, branchId);
        onBranch = 1;
      }
      if( parentRid>0 ){
        const char *zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", parentRid);
        blob_appendf(&manifest, "P %s\n", zParentUuid);
        if( onBranch==0 ){
          const char *zParentBranch = db_text(0, "SELECT tbranch FROM xbranches WHERE tid=(SELECT tbranch FROM xrevisions WHERE trid=%d)", parentRid);
          blob_appendf(&manifest, "T *branch * %F\n", zBranch);
          blob_appendf(&manifest, "T *sym-%F *\n", zBranch);
        }
          blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
        blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
        if( onBranch==0 ){
          const char *zParentBranch = db_text(0, "SELECT tbranch FROM xbranches WHERE tid=(SELECT tbranch FROM xrevisions WHERE trid=%d)", parentRid);
          blob_appendf(&manifest, "T -sym-%s *\n", zParentBranch);
        }
      }else{
        blob_appendf(&manifest, "T *branch * %F\n", zBranch);
        blob_appendf(&manifest, "T *sym-%F *\n", zBranch);
        blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
      }
1248
1249
1250
1251
1252
1253
1254
1255

1256
1257
1258
1259
1260
1261
1262
1250
1251
1252
1253
1254
1255
1256

1257
1258
1259
1260
1261
1262
1263
1264







-
+







          int rid = 0;
          if( zSrcPath ){
            int srcRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions"
                            " WHERE trev<=%d AND tbranch=%d",
                         srcRev, srcBranch);
            rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
                            " SELECT uuid FROM xfoci"
                            "  WHERE chekinID=%d AND filename=%Q"
                            "  WHERE checkinID=%d AND filename=%Q"
                            ")",
                         srcRid, zSrcFile);
          }
          if( deltaFlag ){
            Blob deltaSrc;
            Blob target;
            if( rid!=0 ){