Fossil

Check-in [ae424dc1]
Login

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

Overview
Comment:Correct incorrect commit in [36e7558a11598] (with incorrectly committed code)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | mistake
Files: files | file ages | folders
SHA1: ae424dc16a2958f14ba2c3edf3c25e5aa0b950ad
User & Date: andybradford 2016-11-06 16:38:37
Original Comment: Correct incorrect commit in [36e7558a11598]
Context
2016-11-06
16:38
Correct incorrect commit in [36e7558a11598] (with incorrectly committed code) Closed-Leaf check-in: ae424dc1 user: andybradford tags: mistake
16:10
Move macro definition to config.h which is included everywhere to fix build failure reported on mailing list with "configure --json --with-tcl --with-th1-docs". check-in: 36e7558a user: andybradford tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/config.h.

228
229
230
231
232
233
234
235
236
237
238
239
#else
# define NORETURN
#endif

/*
** Number of elements in an array
*/
#ifndef fossil_sizeof
# define count(X) (sizeof(X)/sizeof(X[0]))
#endif

#endif /* _RC_COMPILE_ */







<
|
<


228
229
230
231
232
233
234

235

236
237
#else
# define NORETURN
#endif

/*
** Number of elements in an array
*/

#define count(X) (sizeof(X)/sizeof(X[0]))


#endif /* _RC_COMPILE_ */

Changes to src/merge.c.

779
780
781
782
783
784
785


786
787
788
789
790
791
792
793
794
795
796
797
798
799
    "SELECT idm, fnm FROM fv"
    " WHERE idp=0 AND idv=0 AND idm>0"
  );
  while( db_step(&q)==SQLITE_ROW ){
    int idm = db_column_int(&q, 0);
    const char *zName;
    char *zFullName;


    db_multi_exec(
      "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)"
      "  SELECT %d,%d,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d",
      vid, integrateFlag?5:3, idm
    );
    zName = db_column_text(&q, 1);
    zFullName = mprintf("%s%s", g.zLocalRoot, zName);
    if( file_wd_isfile_or_link(zFullName)
        && !db_exists("SELECT 1 FROM fv WHERE fn=%Q", zName) ){
      fossil_print("ADDED %s (overwrites an unmanaged file)\n", zName);
      nOverwrite++;
    }else{
      fossil_print("ADDED %s\n", zName);
    }







>
>





<
<







779
780
781
782
783
784
785
786
787
788
789
790
791
792


793
794
795
796
797
798
799
    "SELECT idm, fnm FROM fv"
    " WHERE idp=0 AND idv=0 AND idm>0"
  );
  while( db_step(&q)==SQLITE_ROW ){
    int idm = db_column_int(&q, 0);
    const char *zName;
    char *zFullName;
    zName = db_column_text(&q, 1);
    zFullName = mprintf("%s%s", g.zLocalRoot, zName);
    db_multi_exec(
      "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)"
      "  SELECT %d,%d,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d",
      vid, integrateFlag?5:3, idm
    );


    if( file_wd_isfile_or_link(zFullName)
        && !db_exists("SELECT 1 FROM fv WHERE fn=%Q", zName) ){
      fossil_print("ADDED %s (overwrites an unmanaged file)\n", zName);
      nOverwrite++;
    }else{
      fossil_print("ADDED %s\n", zName);
    }