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!
