On Fri, May 27, 2011 at 4:42 PM, Reto Bachmann-Gmuer < [email protected]> wrote:
> On Fri, May 27, 2011 at 3:22 PM, Reto Bachmann-Gmuer > >> >> btw: the command needed to revert CLEREZZA-515 in trunk is: >> >> svn merge -r 1125855:1125850 >> https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/ >> >> svn commit -m "CLEREZZA-515: reverting changes as requested on list" >> >> Sorry, the above reverts to much as there are other versions in between > (including the revert I did when you requested me to revert an issue). > > Now tried: > > > reto@reto-HPE-540ch:~/projects/apache/clerezza/trunk/parent$ svn merge -r > 1125855:1125854 > https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/ > --- Reverse-merging r1125855 into '.': > U > platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala > This was the wrong one I think, it should be: svn merge -r 1125854:1125853 https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/ but I'm still getting an error: [WARNING] /home/reto/projects/apache/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala:203: error: type mismatch; [WARNING] found : javax.security.auth.Subject [WARNING] required: java.lang.String [WARNING] return userManager.getUserGraphNode(subject) [WARNING] ^ [WARNING] one error found It seems that CLEREZZA-516 has an undeclared dependency on CLEREZZA-515. after doing svn merge -r 1125850:1125849 https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent and svn merge -r 1125848:1125847 https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/ It compiles again. Reto
