Fossil

Diff
Login

Differences From Artifact [dd5541313e]:

To Artifact [f192f326c9]:


783
784
785
786
787
788
789
790
791
792





793
794
795
796
797
798
799
783
784
785
786
787
788
789



790
791
792
793
794
795
796
797
798
799
800
801







-
-
-
+
+
+
+
+







  Stmt move;
  if( db_table_exists(db_name("temp"), "fmove") ){
    db_prepare(&move, "SELECT x, y FROM fmove ORDER BY x;");
    while( db_step(&move)==SQLITE_ROW ){
      const char *zOldName = db_column_text(&move, 0);
      const char *zNewName = db_column_text(&move, 1);
      if( !dryRunFlag ){
        if( file_isdir(zOldName)==1 ){
          if( file_isdir(zNewName)==0 ){
            file_rename(zOldName, zNewName);
        int isOldDir = file_isdir(zOldName);
        if( isOldDir==1 ){
          int isNewDir = file_isdir(zNewName);
          if( isNewDir==0 ){
            file_rename(zOldName, zNewName, isOldDir, isNewDir);
          }
        }else{
          if( file_wd_islink(zOldName) ){
            symlink_copy(zOldName, zNewName);
          }else{
            file_copy(zOldName, zNewName);
          }