[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [Subclipse-users] NPEs

From: Leigh Warren <leighfwarren_at_gmail.com>
Date: Fri, 11 Nov 2011 05:38:08 -0800 (PST)

I have the same issue, the result of my svn status is as follows:

bash-4.1$ svn status
M src/main/java/com/wave2media/adportal/controller/AdportalController.java
M src/main/resources/w2pp.properties.example
M src/main/webapp/WEB-INF/jsp/wcAdmin.jsp
M src/main/webapp/WEB-INF/spring/adportal-servlet-properties.xml
M src/main/webapp/WEB-INF/spring/adportal-servlet-services.xml
? .settings/org.eclipse.wst.jsdt.ui.superType.name
? .settings/org.eclipse.wst.jsdt.ui.superType.container
D C .settings/org.eclipse.wst.common.project.facet.core.xml
> local unversioned, incoming add upon update
D C .settings/org.eclipse.wst.common.component
> local unversioned, incoming add upon update
Summary of conflicts:
  Tree conflicts: 2


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2011-11-11 14:40:27 CET

This is an archived mail posted to the Subclipse Users mailing list.