Fossil: Check-in [2b6fc1dd2c]

Fossil SCM

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a typo and tagging issue
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | svn-import
Files: files | file ages | folders
SHA1:2b6fc1dd2c43d0627a7f1b92f187016bbe9a205f
User & Date: baruch 2015-01-06 20:17:00
Context
2015-01-07
14:07
Fixes for detecting branch creation check-in: 855f233b69 user: baruch tags: svn-import
2015-01-06
20:17
Fix a typo and tagging issue check-in: 2b6fc1dd2c user: baruch tags: svn-import
11:45
Seems to work again on a simple test case. Not finished or well tested check-in: ea876c3f17 user: baruch tags: svn-import
Changes

Changes to src/import.c.

942
943
944
945
946
947
948
949
950
951

952


953
954
955
956
957
958
959
....
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
                              " 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-%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);
      }
................................................................................
          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"
                            ")",
                         srcRid, zSrcFile);
          }
          if( deltaFlag ){
            Blob deltaSrc;
            Blob target;
            if( rid!=0 ){







<


>
|
>
>







 







|







942
943
944
945
946
947
948

949
950
951
952
953
954
955
956
957
958
959
960
961
....
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
                              " 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 ){

          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);
        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);
      }
................................................................................
          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 checkinID=%d AND filename=%Q"
                            ")",
                         srcRid, zSrcFile);
          }
          if( deltaFlag ){
            Blob deltaSrc;
            Blob target;
            if( rid!=0 ){