|
From: | Chris Shepherd |
Subject: | Help cant recover old files |
Date: | Thu, 22 Feb 2001 17:00:16 -0600 |
I have been working on online housing for the
campus I work at. I just incorporated php sessions. I have a couple of
directories one of which is an administrative directory for all web admin
interfaces. Anyways after I made all of my changes I updated. Everything went
fine. I then was converting old echos to prints I then updated again using cvs
update -R -m"changed echos to prints" when I got the recent version back I
noticed I had errors up the a**. From what I can tell all of my cvs changes
have been placed into the file here is a snipet of my code:
<<<<<<< admin.php
include "top.php"; print("Admin Page<br><hr>\n"); print("<table width=\"90%\">\n"); print(" <tr>\n"); print(" <td><b>Information</b></td>\n"); print(" <td><b>Reports</b></td>\n"); print(" <td><b>Functions</b></td>\n"); print(" </tr>\n"); print(" <tr>\n"); ======= require_once("../lib/common.inc.php"); session_start();
get_session_vars($term,$level,$id,$username,$group,$email); check_admin_level($username); print_admin_header(); print("Admin
Page<br><hr>\n");
print("<table width=\"90%\">\n"); print(" <tr>\n"); print(" <td><b>Information</b></td>\n"); print(" <td><b>Reports</b></td>\n"); print(" <td><b>Functions</b></td>\n"); print(" </tr>\n"); print(" <tr>\n"); >>>>>>> 1.2 It placed into it all of the changes that had happened. I am not sure what I did to cause this but what I would like to do is go back to the last version and update it into the new version. But there are two problems 1) How do I make the old version the new one
without it saying that there are changes that need to be commited before I can
upload it (while still keeping my sticky tags of all my changes)
2) There are about 50 files in this directory all
with different versions. Both cvs commits where done on the same day it is just
a matter a couple of hours that splits them.
Any help would be appreciated
Thanks
Chris
|
[Prev in Thread] | Current Thread | [Next in Thread] |