Fossil

Differences From Artifact [80b376cecb]:

• File src/update.c — part of check-in [e66a12ec4b] at 2014-02-23 02:14:41 on branch trunk — Refactor revert command SQL slightly. (user: joel size: 26806)

To Artifact [c08d957556]:

• File src/update.c — part of check-in [bd0b09e50b] at 2014-02-23 05:15:41 on branch trunk — Fix reverting the combination of a renamed file and an added file that uses the renamed file's original filename. (This previously failed on a UNIQUE constraint.) (user: joel size: 26817) [more...]

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

        fossil_print("UNMANAGE: %s\n", zFile);
      }else{
        undo_save(zFile);
        file_delete(zFull);
        fossil_print("DELETE: %s\n", zFile);
      }
      db_multi_exec(
        "UPDATE vfile"
        "   SET pathname=origname, origname=NULL"
        " WHERE pathname=%Q AND origname!=pathname;"
        "DELETE FROM vfile WHERE pathname=%Q",
        zFile, zFile
      );
    }else{
      sqlite3_int64 mtime;

|

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

        fossil_print("UNMANAGE: %s\n", zFile);
      }else{
        undo_save(zFile);
        file_delete(zFull);
        fossil_print("DELETE: %s\n", zFile);
      }
      db_multi_exec(
        "UPDATE OR REPLACE vfile"
        "   SET pathname=origname, origname=NULL"
        " WHERE pathname=%Q AND origname!=pathname;"
        "DELETE FROM vfile WHERE pathname=%Q",
        zFile, zFile
      );
    }else{
      sqlite3_int64 mtime;