Fossil

Differences From Artifact [cf0a530aef]:

• File src/update.c — part of check-in [44ded27f7c] at 2014-09-23 00:56:09 on branch winsymlink — Merge updates from trunk. (user: mistachkin size: 27969) [more...]

To Artifact [ccad46cdae]:

• File src/update.c — part of check-in [9c5bbd6a01] at 2014-09-25 19:21:45 on branch winsymlink — Summary: a number of changes to improve windows symlink handling. Detail: fixed file_contains_merge_marker failure on windows symlinks; fixed inadequate S_ISLNK macro for windows; backed out change made to revert query ("OR islink" removed); added special processing to vfile_check_signature for windows symlink type changes; fixed a few flaws in the windows specific posix-compatibility routines to improve symlink handling. (user: sdr size: 27959)

763
764
765
766
767
768
769
770
771
772
773
774
775
776
777

    vid = db_lget_int("checkout", 0);
    vfile_check_signature(vid, 0);
    db_multi_exec(
      "DELETE FROM vmerge;"
      "INSERT OR IGNORE INTO torevert "
      " SELECT pathname"
      "   FROM vfile "
      "  WHERE chnged OR deleted OR rid=0 OR pathname!=origname OR islink;"
    );
  }
  db_multi_exec(
    "INSERT OR IGNORE INTO torevert"
    " SELECT origname"
    "   FROM vfile"
    "  WHERE origname!=pathname AND pathname IN (SELECT name FROM torevert);"

|

763
764
765
766
767
768
769
770
771
772
773
774
775
776
777

    vid = db_lget_int("checkout", 0);
    vfile_check_signature(vid, 0);
    db_multi_exec(
      "DELETE FROM vmerge;"
      "INSERT OR IGNORE INTO torevert "
      " SELECT pathname"
      "   FROM vfile "
      "  WHERE chnged OR deleted OR rid=0 OR pathname!=origname;"
    );
  }
  db_multi_exec(
    "INSERT OR IGNORE INTO torevert"
    " SELECT origname"
    "   FROM vfile"
    "  WHERE origname!=pathname AND pathname IN (SELECT name FROM torevert);"