Fossil

Check-in [2a15d87e]
Login

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

Overview
Comment:fix "possible unresolved merge conflict" warning message to show the pathname relative to the wd in stead of the root
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2a15d87edbd7948467ee03912088802951c96845
User & Date: jan.nijtmans 2012-10-29 14:35:41
Context
2012-10-29
14:45
Allow unicode files for Wiki-rendering on Windows.

Trying to commit a file with an UTF-16 BOM will now give a warning, just as a file containing crlf

The --args command line option now accept UTF-16 files as well

check-in: 70b4f105 user: jan.nijtmans tags: trunk
14:35
fix "possible unresolved merge conflict" warning message to show the pathname relative to the wd in stead of the root check-in: 2a15d87e user: jan.nijtmans tags: trunk
2012-10-28
23:01
Simplify the looks_like_binary() macro. Remove literal tab character, adjust styling and comments in looks_like_text(). check-in: c8e72df0 user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

1221
1222
1223
1224
1225
1226
1227


1228

1229
1230


1231
1232
1233
1234
1235
1236
1237
      /* Instead of file content, put link destination path */
      blob_read_link(&content, zFullname);
    }else{
      blob_read_from_file(&content, zFullname);
    }
    if( !crnlOk ) cr_warning(&content, zFullname);
    if( chnged==1 && contains_merge_marker(&content) ){


      nConflict++;

      fossil_print("possible unresolved merge conflict in %s\n",
                   zFullname+strlen(g.zLocalRoot));


    }
    nrid = content_put(&content);
    blob_reset(&content);
    if( rid>0 ){
      content_deltify(rid, nrid, 0);
    }
    db_multi_exec("UPDATE vfile SET mrid=%d, rid=%d WHERE id=%d", nrid,nrid,id);







>
>

>

<
>
>







1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232

1233
1234
1235
1236
1237
1238
1239
1240
1241
      /* Instead of file content, put link destination path */
      blob_read_link(&content, zFullname);
    }else{
      blob_read_from_file(&content, zFullname);
    }
    if( !crnlOk ) cr_warning(&content, zFullname);
    if( chnged==1 && contains_merge_marker(&content) ){
      Blob fname; /* Relative pathname of the file */

      nConflict++;
      file_relative_name(zFullname, &fname, 0);
      fossil_print("possible unresolved merge conflict in %s\n",

                   blob_str(&fname));
      blob_reset(&fname);
    }
    nrid = content_put(&content);
    blob_reset(&content);
    if( rid>0 ){
      content_deltify(rid, nrid, 0);
    }
    db_multi_exec("UPDATE vfile SET mrid=%d, rid=%d WHERE id=%d", nrid,nrid,id);