Check-in [c9ee3ff674]
Not logged in

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

Overview
Comment:Fix bug.
Timelines: family | ancestors | descendants | both | merge-integrate
Files: files | file ages | folders
SHA1:c9ee3ff6745310a7becc93e5f61dafd220acfc01
User & Date: jan.nijtmans 2013-07-22 07:52:03
Context
2013-07-22
09:23
rebase Leaf check-in: 7b7a4bd579 user: jan.nijtmans tags: merge-integrate
07:52
Fix bug. check-in: c9ee3ff674 user: jan.nijtmans tags: merge-integrate
07:42
A few more places where the "chnged" field values 4 and 5 have effect check-in: 530ef9557b user: jan.nijtmans tags: merge-integrate
Changes

Changes to src/merge.c.

484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
    int islinkm = db_column_int(&q, 3);
    /* Copy content from idm over into idv.  Overwrite idv. */
    fossil_print("UPDATE %s\n", zName);
    if( !dryRunFlag ){
      undo_save(zName);
      db_multi_exec(
        "UPDATE vfile SET mtime=0, mrid=%d, chnged=%d, islink=%d "
        " WHERE id=%d", ridm, islinkm, integrateFlag?4:2, idv
      );
      vfile_to_disk(0, idv, 0, 0);
    }
  }
  db_finalize(&q);

  /*







|







484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
    int islinkm = db_column_int(&q, 3);
    /* Copy content from idm over into idv.  Overwrite idv. */
    fossil_print("UPDATE %s\n", zName);
    if( !dryRunFlag ){
      undo_save(zName);
      db_multi_exec(
        "UPDATE vfile SET mtime=0, mrid=%d, chnged=%d, islink=%d "
        " WHERE id=%d", ridm, integrateFlag?4:2, islinkm, idv
      );
      vfile_to_disk(0, idv, 0, 0);
    }
  }
  db_finalize(&q);

  /*