Fossil

Diff
Login

Differences From Artifact [855d2b5361]:

To Artifact [78f496b5c4]:


580
581
582
583
584
585
586
587

588
589
590
591
592

593
594
595
596
597

598
599
600
601
602
603
604
580
581
582
583
584
585
586

587
588
589
590


591
592
593
594
595
596
597
598
599
600
601
602
603
604







-
+



-
-
+





+








  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  if( dryRunFlag ){
    db_end_transaction(1);  /* With --dry-run, rollback changes */
  }else{
    char zPwd[2000];
    char *zPwd;
    ensure_empty_dirs_created(1);
    sqlite3_create_function(g.db, "rmdir", 1, SQLITE_UTF8, 0,
                            file_rmdir_sql_function, 0, 0);
    zPwd[0] = 0;
    file_getcwd(zPwd, sizeof(zPwd));
    zPwd = file_getcwd(0,0);
    db_multi_exec(
      "SELECT rmdir(%Q||name) FROM dir_to_delete"
      " WHERE (%Q||name)<>%Q ORDER BY name DESC",
      g.zLocalRoot, g.zLocalRoot, zPwd
    );
    fossil_free(zPwd);
    if( g.argc<=3 ){
      /* All files updated.  Shift the current checkout to the target. */
      db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid);
      checkout_set_all_exe(tid);
      manifest_to_disk(tid);
      db_set_checkout(tid);
    }else{