Chris,
This line in interesting:
<<<<<<< .mine
It means that svn encountered some conflicts trying to update your
source files. In this case it's probably because there was a bug fix
in the 1.0.x branch that it can't reconcile with the svn trunk. This
can also happen if you've made edits to source files that svn can't
merge with the latest versions.
I can walk you through doing an svn install if you'd like. Another
option is to upgrade using the zenoss 1.1 tarball which should be out
this week. Let me know if you'd like svn directions.
-jason
_______________________________________________
zenoss-users mailing list
[email protected]
http://lists.zenoss.org/mailman/listinfo/zenoss-users
