Forum OpenACS Q&A: Re: CVS conundrums with 5.2

Collapse
6: Re: CVS conundrums with 5.2 (response to 1)
Posted by Alex Kroman on 10/18/05 12:41 AM
It's strange that you get the date which you updated the files. When I do a cvs update I the timestamp is the date which the programmer committed his changes.

If you less the organizations.info file I'm sure you'll see one file containing a bunch of references to .5d3 and the other to .6d1.

Do you have local changes to the organizations package which might be causing conflicts when you run the update command?

I'm not an expert with CVS so I'm not sure why you wouldn't be getting the most recent version if you have checked out the 5.2 branch.

Collapse
7: Re: Re: CVS conundrums with 5.2 (response to 6)
Posted by Sam Nicholson on 10/18/05 11:29 PM
No local changes that I'm aware of.  But the one that is up to date is a slightly older install.  It's interesting to look at the two files.  The older install, jefferson, looks normal, but the newer one, clara, looks like some odd cruft got added in during the merge.

And as the patch on jefferson is not one that cvs likes, cvs refetches rather than updates the file...  Yep, that's it, the update patch looks like it wasn't in just the right state.  So I've got a manual merge indication from clara in the organizations.info file, viz:

<<<<<<< organizations.info
        <release-date>2004-06-25</release-date>
        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
        <description format="text/plain">Provides the datamodel for an
      implementation of the HR-XML organizations spec, but no API for
      manipulating the data.  Also note that the Oracle code is out of sync
      with the Postgres code. The source code has comments in it indicating
      what needs to be updated to make things work correctly [Jade Rubick].
=======
        <release-date>2005-10-14</release-date>
        <vendor url="http://www.bread.com/">Integrated Bakery Resources</vendor>
        <description format="text/plain">Provides the datamodel for an
      implementation of the HR-XML organizations spec, but no API for
      manipulating the data.  Also note that the Oracle code is out of sync
      with the Postgres code. The source code has comments in it indicating
      what needs to be updated to make things work correctly [Jade Rubick].
<blockquote>>>>>>> 1.7.2.2
</blockquote>

I've got to manually update the file, and then figure out what's wrong with my cvs, as I didn't get a warning.

Thanks!
Cheers!