Fossil

Check-in [4d6ae5c0]
Login

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

Overview
Comment:fix Abandoning warning
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | improve_commit_warning
Files: files | file ages | folders
SHA1: 4d6ae5c0072ea8a429ed95f961a870bbc5be814f
User & Date: jan.nijtmans 2012-11-07 10:14:00
Context
2012-11-07
12:10
merge trunk

Fix continuation-byte check for UTF-8 chars > 2 bytes.

check-in: 3920fa67 user: jan.nijtmans tags: improve_commit_warning
10:14
fix Abandoning warning check-in: 4d6ae5c0 user: jan.nijtmans tags: improve_commit_warning
09:47
styling check-in: c8eaeb1b user: jan.nijtmans tags: improve_commit_warning
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
         "%s appears to be text, but contains %s.  commit anyhow (y/N)? ",
         blob_str(&fname), zWarning);
    prompt_user(zMsg, &ans);
    fossil_free(zMsg);
    cReply = blob_str(&ans)[0];
    if( cReply!='y' && cReply!='Y' ){
      fossil_fatal("Abandoning commit due to %s in %s",
                   blob_str(&fname), zWarning);
    }
    blob_reset(&ans);
    eType +=4 ;
  }
  if( eType==0 || eType==-1 || fUnicode ){
    const char *zWarning;
    Blob ans;







|







924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
         "%s appears to be text, but contains %s.  commit anyhow (y/N)? ",
         blob_str(&fname), zWarning);
    prompt_user(zMsg, &ans);
    fossil_free(zMsg);
    cReply = blob_str(&ans)[0];
    if( cReply!='y' && cReply!='Y' ){
      fossil_fatal("Abandoning commit due to %s in %s",
                   zWarning, blob_str(&fname));
    }
    blob_reset(&ans);
    eType +=4 ;
  }
  if( eType==0 || eType==-1 || fUnicode ){
    const char *zWarning;
    Blob ans;