问题描述
update-rHEADC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/MainFrame.javaRAlayerrequestfailedsvn:PROPFINDrequestfailedon'/svn/tc/PayPlatform/src/com/tongchengsoft/pay/view'svn:PROPFINDof'/svn/tc/PayPlatform/src/com/tongchengsoft/pay/view':couldnotconnecttoserver(http://lyquanqiu.vicp.cc:8003)commit-m""C:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAconflictintheworkingcopyobstructsthecurrentoperationsvn:Commitfailed(detailsfollow):svn:Abortingcommit:'C:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewLoginFrame.java'remainsinconflictupdate-rHEADC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/imagesAtrevision172.add-NC:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewimagesbackground.jpgUnmergeableschedulingrequestedonanentrysvn:Can'tadd'C:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewimagesbackground.jpg'toaparentdirectoryscheduledfordeletioncommit-m""C:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAconflictintheworkingcopyobstructsthecurrentoperationsvn:Commitfailed(detailsfollow):svn:Abortingcommit:'C:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewLoginFrame.java'remainsinconflictcommit-m""C:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAconflictintheworkingcopyobstructsthecurrentoperationsvn:Commitfailed(detailsfollow):svn:Abortingcommit:'C:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewLoginFrame.java'remainsinconflictadd-NC:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewimagesbackground.jpgUnmergeableschedulingrequestedonanentrysvn:Can'tadd'C:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewimagesbackground.jpg'toaparentdirectoryscheduledfordeletiondelete--forceC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/imagesDC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/images/0490.jpgDC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/imagesdelete--forceC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/imagesDC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/images/0490.jpgDC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/imagesupdate-rHEADC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAtrevision172.update-rHEADC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAtrevision172.update-rHEADC:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAtrevision172.commit-m""C:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAconflictintheworkingcopyobstructsthecurrentoperationsvn:Commitfailed(detailsfollow):svn:Abortingcommit:'C:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewLoginFrame.java'remainsinconflictcommit-m""C:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAconflictintheworkingcopyobstructsthecurrentoperationsvn:Commitfailed(detailsfollow):svn:Abortingcommit:'C:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewLoginFrame.java'remainsinconflictcommit-m""C:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAconflictintheworkingcopyobstructsthecurrentoperationsvn:Commitfailed(detailsfollow):svn:Abortingcommit:'C:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewLoginFrame.java'remainsinconflictcommit-m""C:/eclipse/JBuilder/PayPlatform/src/com/tongchengsoft/pay/view/LoginFrame.javaAconflictintheworkingcopyobstructsthecurrentoperationsvn:Commitfailed(detailsfollow):svn:Abortingcommit:'C:eclipseJBuilderPayPlatformsrccomtongchengsoftpayviewLoginFrame.java'remainsinconflict