Fossil

Differences From Artifact [0400cd429b]:

• File src/update.c — part of check-in [21acce3c35] at 2011-09-02 13:51:16 on branch trunk — Add additional trace output with the --debug option on "fossil merge" and especially on filename change tracking. (user: drh size: 23387)

To Artifact [90bd6288b7]:

• File src/update.c — part of check-in [0b93b0f958] at 2011-09-02 16:19:17 on branch trunk — Do a better job of merging branches that contain lots of file renames. (user: drh size: 23390) [more...]

221
222
223
224
225
226
227
228
229
230
231
232
233
234
235

    "   FROM vfile WHERE vid=%d",
    vid
  );

  /* Compute file name changes on V->T.  Record name changes in files that
  ** have changed locally.
  */
  find_filename_changes(vid, tid, &nChng, &aChng, debugFlag ? "V->T": 0);
  if( nChng ){
    for(i=0; i<nChng; i++){
      db_multi_exec(
        "UPDATE fv"
        "   SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
        " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
        aChng[i*2+1], aChng[i*2]

|

221
222
223
224
225
226
227
228
229
230
231
232
233
234
235

    "   FROM vfile WHERE vid=%d",
    vid
  );

  /* Compute file name changes on V->T.  Record name changes in files that
  ** have changed locally.
  */
  find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
  if( nChng ){
    for(i=0; i<nChng; i++){
      db_multi_exec(
        "UPDATE fv"
        "   SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
        " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
        aChng[i*2+1], aChng[i*2]