 |
 |
This is the version of SVTEvioReader as of yesterday: http://java.freehep.org/svn/repos/hps/show/java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java?revision=%7b2015-02-11%7d 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. > I did a diff on the two files and they were exactly the same, so the old > one must have gotten clobbered somehow. > > But wasn’t the intention here that you preserved the Test Run code here > > evio/src/main/java/org/hps/evio/TestRunSvtEvioReader.java > > So I don’t think we need the old SVTEvioReader.java file at all now, > unless I’m not understanding what you did. > > On Feb 12, 2015, at 12:32 PM, Omar Moreno <[log in to unmask]> wrote: > > SVTEvioReader was not added inadvertently, that was the original SVT > Evio reader used for the test run. That said, can you un-delete the file > and rename it or put it in the sandbox? I never made sure if everything > in the file was ported over to the new reader so it shouldn't have been > deleted. > > On Thu, Feb 12, 2015 at 12:22 PM, McCormick, Jeremy I. < > [log in to unmask]> wrote: > >> Hi, >> >> I found there was a strange problem in my copy of the HPS Java trunk >> today. >> >> There was a conflict reported about this file. >> >> src/main/java/org/hps/evio/SvtEvioReader.java >> >> I think the problem was that there was also inadvertently added a file >> called “SVTEvioReader.java” which on some platforms/configurations is >> considered the same file. Or there was a rename that didn’t work properly. >> (Not sure.) >> >> So even after fully updating I was getting some messages like >> >> [564 $] svn status >> D C src/main/java/org/hps/evio/SvtEvioReader.java >> > local unversioned, incoming add upon update >> Summary of conflicts: >> Tree conflicts: 1 >> >> To resolve this I did >> >> svn resolve accept --working >> src/main/java/org/hps/evio/SvtEvioReader.java >> >> after which the conflict was resolved but it still seemed to want to >> mark it as deleted anyways >> >> [567 $] svn status >> D src/main/java/org/hps/evio/SvtEvioReader.java >> >> so then I did >> >> [568 $] svn revert src/main/java/org/hps/evio/SvtEvioReader.java >> Reverted 'src/main/java/org/hps/evio/SvtEvioReader.java' >> >> And all seems to be well now. >> >> If you have any trouble with this let me know. >> >> —Jeremy >> >> ------------------------------ >> >> Use REPLY-ALL to reply to list >> >> To unsubscribe from the HPS-SOFTWARE list, click the following link: >> https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=HPS-SOFTWARE&A=1 >> > > > ######################################################################## Use REPLY-ALL to reply to list To unsubscribe from the HPS-SOFTWARE list, click the following link: https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=HPS-SOFTWARE&A=1