> Did you rename the old version SVTEvioReader to SvtEvioReader and forgot? Does the file that you have locally match what is in the trunk?
I did not do anything to these files. I was working from what was in SVN trunk. I think something you did with these files made it look like there was an untracked local copy on multiple people's working copy of the trunk. I did a diff of the local copies of SvtEvioReader.java and SVTEvioReader.java and there was no difference. So I deleted SVTEvioReader.java, and along with a few svn commands to fix up my local copy so that it didn't see conflicts, that seemed to resolve the problem.
If I understand correctly the restructuring you did of these classes, the TestRunSvtEvioReader class is intended to replace the old SVTEvioReader, and SvtEvioReader is the new class for future runs. So there is really no need to keep around SVTEvioReader.java if it is not being used, and it is not used in the code right now from what I can tell. There's also no need to "sandbox" it because it is still present in prior revisions before it was deleted, should we ever need to recover it.
It seemed to me that everything is fine now because both your tests of Test Run and Engineering Run event building using the readers passed successfully when I ran the build.
Or is something messed up in your working copy now?
On Feb 12, 2015, at 1:31 PM, Omar Moreno <[log in to unmask]> wrote:
This is the version of SVTEvioReader as of yesterday:
As you can see, it's completely different. The SVN message you got seems to imply that you already had an untracked local copy of SvtEvioReader. Did you rename the old version SVTEvioReader to SvtEvioReader and forgot? Does the file that you have locally match what is in the trunk?
On Thu, Feb 12, 2015 at 1:08 PM, Omar Moreno <[log in to unmask]> wrote:
i just did a diff on the two files I have locally and they are completely different. I haven't updated in a couple of days though. Let me check the commit logs and try to decipher what happened.
Use REPLY-ALL to reply to list
To unsubscribe from the HPS-SOFTWARE list, click the following link: