Fossil

Check-in [8e7edc60]
Login

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

Overview
Comment:Restore fossil_fatal panic message in case of possible checkout/repo mismatch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:8e7edc60fa0ec8c9060a36a966a683b506b3d868
User & Date: jan.nijtmans 2013-10-25 11:57:52
Context
2013-10-26
09:06
Allow comment_print() to handle lines >400 characters. Add parameter "width" to print_timeline() function. check-in: b2455507 user: jan.nijtmans tags: trunk
2013-10-25
12:42
Merge trunk. Add the "-W|--width WIDTH" option to "fossil timeline". Default is 80. check-in: 3710f2ac user: jan.nijtmans tags: timeline_cmd_dash_n_fix
11:57
Restore fossil_fatal panic message in case of possible checkout/repo mismatch. check-in: 8e7edc60 user: jan.nijtmans tags: trunk
07:41
Make "fossil commit" work on a repository which doesn't have any commits yet: An initial commit will be created then. check-in: ebe92f5c user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
  assert( pBaseline==0 || zBaselineUuid!=0 );
  blob_zero(pOut);
  if( vid ){
    zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d AND "
      "EXISTS(SELECT 1 FROM event WHERE event.type='ci' and event.objid=%d)",
      vid, vid);
    if( !zParentUuid ){
      fossil_fatal("Could not find valid manifest for RID %d. "
                   "Possible checkout/repo mismatch.", vid);
    }
  }
  if( pBaseline ){
    blob_appendf(pOut, "B %s\n", zBaselineUuid);
    manifest_file_rewind(pBaseline);
    pFile = manifest_file_next(pBaseline, 0);







|







993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
  assert( pBaseline==0 || zBaselineUuid!=0 );
  blob_zero(pOut);
  if( vid ){
    zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d AND "
      "EXISTS(SELECT 1 FROM event WHERE event.type='ci' and event.objid=%d)",
      vid, vid);
    if( !zParentUuid ){
      fossil_fatal("Could not find a valid check-in for RID %d. "
                   "Possible checkout/repo mismatch.", vid);
    }
  }
  if( pBaseline ){
    blob_appendf(pOut, "B %s\n", zBaselineUuid);
    manifest_file_rewind(pBaseline);
    pFile = manifest_file_next(pBaseline, 0);