Fossil

Check-in [6d1c038c]
Login

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

Overview
Comment:Backout check-in [7557c3e03f]. The code in that check-in is not necessary. (It was added only to try to catch errors.) Fix for ticket [9d9d42d9aab].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:6d1c038c6279339350205444df21b7fa1cf92ce2
User & Date: drh 2013-10-05 22:34:25
Context
2013-10-07
07:41
Better error message in case of "manifest file (12892) is malformed". It will now give an additional line: "line ???: wrong size UUID on P-card" (or whatever other parsing error happens), and using the "-n" option it will print out the complete manifest as well. This would have made it much easier to investigate Ron Aaron's commit problem (many thanks for reporting this!), without adding special debugging code to fossil. check-in: ec81aee9 user: jan.nijtmans tags: trunk
2013-10-05
22:34
Backout check-in [7557c3e03f]. The code in that check-in is not necessary. (It was added only to try to catch errors.) Fix for ticket [9d9d42d9aab]. check-in: 6d1c038c user: drh tags: trunk
2013-10-04
17:06
Fix a busted hyperlink in the server.wiki documentation page. check-in: 92bad3cd user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
  int nFBcard = 0;            /* Number of B-cards and F-cards */
  int i;                      /* Loop counter */
  const char *zColor;         /* Modified value of p->zColor */

  assert( pBaseline==0 || pBaseline->zBaseline==0 );
  assert( pBaseline==0 || zBaselineUuid!=0 );
  blob_zero(pOut);
  zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d "
                        "AND EXISTS (SELECT 1 FROM mlink WHERE mid=%d)",
                        vid, vid)
      /*
      ** The subselect there ensures that the given vid refers to a
      ** MANIFEST in this repo. It catches an error which would else
      ** show up downstream (during verify-at-commit, if we're lucky)
      ** if the checkout version RID somehow gets out of sync with the
      ** current copy of the repo.
      */;
  if(vid>0 && !zParentUuid){
    fossil_fatal("Could not find manifest for RID %d. "
                 "Possible checkout/repo mismatch.", vid);
  }
  else if( pBaseline ){
    blob_appendf(pOut, "B %s\n", zBaselineUuid);
    manifest_file_rewind(pBaseline);
    pFile = manifest_file_next(pBaseline, 0);
    nFBcard++;
  }else{
    pFile = 0;
  }







|
<
<
<
<
<
<
<
<
<
<
<
<
<
|







985
986
987
988
989
990
991
992













993
994
995
996
997
998
999
1000
  int nFBcard = 0;            /* Number of B-cards and F-cards */
  int i;                      /* Loop counter */
  const char *zColor;         /* Modified value of p->zColor */

  assert( pBaseline==0 || pBaseline->zBaseline==0 );
  assert( pBaseline==0 || zBaselineUuid!=0 );
  blob_zero(pOut);
  zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);













  if( pBaseline ){
    blob_appendf(pOut, "B %s\n", zBaselineUuid);
    manifest_file_rewind(pBaseline);
    pFile = manifest_file_next(pBaseline, 0);
    nFBcard++;
  }else{
    pFile = 0;
  }