Fossil

Diff
Login

Differences From Artifact [eb5c093f17]:

To Artifact [521413063f]:


117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
    tid = db_int(0, "SELECT rid FROM leaves, event"
                    " WHERE event.objid=leaves.rid"
                    " ORDER BY event.mtime DESC"); 
  }

  db_begin_transaction();
  vfile_check_signature(vid, 1);
  undo_begin();
  load_vfile_from_rid(tid);

  /*
  ** The record.fn field is used to match files against each other.  The
  ** FV table contains one row for each each unique filename in
  ** in the current checkout, the pivot, and the version being merged.
  */







|







117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
    tid = db_int(0, "SELECT rid FROM leaves, event"
                    " WHERE event.objid=leaves.rid"
                    " ORDER BY event.mtime DESC"); 
  }

  db_begin_transaction();
  vfile_check_signature(vid, 1);
  if( !nochangeFlag ) undo_begin();
  load_vfile_from_rid(tid);

  /*
  ** The record.fn field is used to match files against each other.  The
  ** FV table contains one row for each each unique filename in
  ** in the current checkout, the pivot, and the version being merged.
  */
286
287
288
289
290
291
292

293
294
295
296
297
298
299
      manifest_to_disk(tid);
      db_lset_int("checkout", tid);
    }else{
      /* A subset of files have been checked out.  Keep the current
      ** checkout unchanged. */
      db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
    }

    db_end_transaction(0);
  }
}


/*
** Get the contents of a file within a given revision.







>







286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
      manifest_to_disk(tid);
      db_lset_int("checkout", tid);
    }else{
      /* A subset of files have been checked out.  Keep the current
      ** checkout unchanged. */
      db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
    }
    undo_finish();
    db_end_transaction(0);
  }
}


/*
** Get the contents of a file within a given revision.
392
393
394
395
396
397
398

399
400
      blob_write_to_file(&record, zFile);
      printf("%s reverted\n", zFile);
    }
    blob_reset(&record);
    blob_reset(&fname);
    free(zFile);
  }

  db_end_transaction(0);
}







>


393
394
395
396
397
398
399
400
401
402
      blob_write_to_file(&record, zFile);
      printf("%s reverted\n", zFile);
    }
    blob_reset(&record);
    blob_reset(&fname);
    free(zFile);
  }
  undo_finish();
  db_end_transaction(0);
}