Greetings
have large project of 2600 files, 582 folders (including .svn markers etc)
following these steps we get error message "Obstructed Update" "Revison
320 doesn't match existing revision 319"
We do the following
Checkout from the repository
http://server/repos/project/path/branches/offshore/projname into a
clean empty directory "c:\workspace\projname"
Switch wc to http://server/repos/project/path/branches/dev_gh/projname
this seems to properly indicate 6 adds, 56 deletes and 68 updates
copied a file in another project to bump revision number, or a checkin
by another developer on another unrelated project
Merge from http://server/repos/project/path/branches/dev_gh/projname HEAD to
http://server/repos/project/path/branches/offshore/projname HEAD
This causes the error and interrupts the merge leaving hundreds of files
deleted
We have tried the same but using the revision number from the switch in
the merge command.
I am attaching svn status output and snippet from apache error_log
I hope you can help us resolve this issue.
we are using http dav interface with Apache/2.0.54 (Unix) DAV/2
SVN/1.3.0 on RHAS linux
This happens with the subclipse plugin and with tortoise 1.3.1 I will test with command line.
pre-lock and pre-unlock hook scripts are activated
thanks
jeb dot beasley at penske dot com
sorry, I may have posted to dev@subversion in error
After failed merge
C:\websphere_proj\delegatedadmin>svn status
L .
R + .classpath
D L JavaSource
D JavaSource\com_penske_delegatedadmin_actions.dnx
D L JavaSource\conf
D JavaSource\conf\delegatedadmin.properties
D JavaSource\conf\ApplicationResources.properties
D JavaSource\conf\deladminlinks.properties
D JavaSource\conf\log4j.properties
D L JavaSource\com
D L JavaSource\com\penske
D L JavaSource\com\penske\dao
D L JavaSource\com\penske\delegatedadmin
D L JavaSource\com\penske\delegatedadmin\actions
D JavaSource\com\penske\delegatedadmin\actions\EditViewOrgGroupAction.java
D JavaSource\com\penske\delegatedadmin\actions\AddCustCompAction.java
D JavaSource\com\penske\delegatedadmin\actions\AdminReportsAction.java
D JavaSource\com\penske\delegatedadmin\actions\ModifyCustomerUserAction.jav
a
D JavaSource\com\penske\delegatedadmin\actions\TemplateDescAction.java
D JavaSource\com\penske\delegatedadmin\actions\UploadAgreementAction.java
D JavaSource\com\penske\delegatedadmin\actions\DelAdminAction.java
D JavaSource\com\penske\delegatedadmin\actions\DALogOffAction.java
D JavaSource\com\penske\delegatedadmin\actions\AddCustomerUserAdminAction.j
ava
D JavaSource\com\penske\delegatedadmin\actions\AddCustomerNewUserAction.jav
a
D JavaSource\com\penske\delegatedadmin\actions\AppAccessRightsAction.java
D JavaSource\com\penske\delegatedadmin\actions\DormantAccReportsAction.java
D JavaSource\com\penske\delegatedadmin\actions\ModifyAppAccessRightsAction.
java
D JavaSource\com\penske\delegatedadmin\actions\ModDelTemplateAction.java
D JavaSource\com\penske\delegatedadmin\actions\ViewUsersSystemAction.java
D JavaSource\com\penske\delegatedadmin\actions\FindCustomerAction.java
D JavaSource\com\penske\delegatedadmin\actions\CDIComparisionAction.java
D JavaSource\com\penske\delegatedadmin\actions\FindApplicationAction.java
D JavaSource\com\penske\delegatedadmin\actions\ModifyCustCompAction.java
D JavaSource\com\penske\delegatedadmin\actions\PasswordResetAction.java
D JavaSource\com\penske\delegatedadmin\actions\CustomerUserDetailsAction.ja
va
D JavaSource\com\penske\delegatedadmin\actions\ChangeHistoryAction.java
D JavaSource\com\penske\delegatedadmin\actions\ModifyApplicationAction.java
D JavaSource\com\penske\delegatedadmin\actions\AddApplicationAction.java
D JavaSource\com\penske\delegatedadmin\actions\UsersByAppReportsAction.java
D JavaSource\com\penske\delegatedadmin\actions\BulkloadUserRightsAction.jav
a
D JavaSource\com\penske\delegatedadmin\actions\CompCustNumAction.java
D JavaSource\com\penske\delegatedadmin\actions\TempAppAssocSrchAction.java
D JavaSource\com\penske\delegatedadmin\actions\FindEmployeeAction.java
D JavaSource\com\penske\delegatedadmin\actions\EditViewOrgNonGroupAction.ja
va
D JavaSource\com\penske\delegatedadmin\actions\AssocAppsTempAction.java
D JavaSource\com\penske\delegatedadmin\actions\EmployeeUserDetailsAction.ja
va
D JavaSource\com\penske\delegatedadmin\actions\AddTemplateAction.java
D JavaSource\com\penske\delegatedadmin\actions\DelTempCustUserAction.java
D JavaSource\com\penske\delegatedadmin\actions\AddCustNumToCompAction.java
D JavaSource\com\penske\delegatedadmin\actions\FindCustCompAction.java
D L JavaSource\com\penske\delegatedadmin\app
D JavaSource\com\penske\delegatedadmin\app\DelAdminSession.java
D JavaSource\com\penske\delegatedadmin\app\DelAdminActionError.java
D JavaSource\com\penske\delegatedadmin\app\DelAdminActionErrors.java
D JavaSource\com\penske\delegatedadmin\app\InitializationServlet.java
D L JavaSource\com\penske\delegatedadmin\webservices
D JavaSource\com\penske\delegatedadmin\webservices\SOAPHandler.java
D JavaSource\com\penske\delegatedadmin\webservices\SoapPageContext.java
D JavaSource\com\penske\delegatedadmin\webservices\MyX509TrustManager.java
D JavaSource\com\penske\delegatedadmin\webservices\Cookie.java
D JavaSource\com\penske\delegatedadmin\webservices\Serializer.java
D JavaSource\com\penske\delegatedadmin\webservices\SOAPPageException.java
D JavaSource\com\penske\delegatedadmin\webservices\vssver.scc
D JavaSource\com\penske\delegatedadmin\webservices\XMLUtils.java
D JavaSource\com\penske\delegatedadmin\webservices\SOAPHttpConnection.java
D JavaSource\com\penske\delegatedadmin\webservices\ByteUtils.java
D JavaSource\com\penske\delegatedadmin\webservices\CookieStore.java
D JavaSource\com\penske\delegatedadmin\webservices\StringUtils.java
D JavaSource\com\penske\delegatedadmin\webservices\SecureURLConnection.java
D JavaSource\com\penske\delegatedadmin\webservices\B2BClientBean.java
D JavaSource\com\penske\delegatedadmin\webservices\XMLErrorReporter.java
D L JavaSource\com\penske\delegatedadmin\dao
D L JavaSource\com\penske\delegatedadmin\dao\context
D JavaSource\com\penske\delegatedadmin\dao\context\PersistenceContextFactor
y.java
D JavaSource\com\penske\delegatedadmin\dao\context\ResourceTypeEnum.java
D L JavaSource\com\penske\delegatedadmin\dao\transfer
D JavaSource\com\penske\delegatedadmin\dao\transfer\OracleList.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\SearchTemplate.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\ViewUsersSystem.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\FindCustomer.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\CDIComparision.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\DAMenuList.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\ChangeHistory.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\AddCustNum.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\Applications.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\FilterType.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\FilterItems.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\DelTempCustUser.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\CDIComparisionSearch.ja
va
D JavaSource\com\penske\delegatedadmin\dao\transfer\Choice.java
D JavaSource\com\penske\delegatedadmin\dao\transfer\CustNum.java
D L JavaSource\com\penske\delegatedadmin\dao\factory
D JavaSource\com\penske\delegatedadmin\dao\factory\IFindCustomerDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\ISearchEmpCustDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\ICompanyDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\IChangeHistoryDAO.java
D L JavaSource\com\penske\delegatedadmin\dao\factory\as400
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\TemplateDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\AS400Daofactory.ja
va
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\AddCustomerNewUser
DAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\UserDetailsDAO.jav
a
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\FilterDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\ApplicationsDAO.ja
va
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\CustNumberDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\DelTempCustUserDAO
.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\ModifyAppAccessRig
htsDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\ReportsDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\NavigationDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\ViewUsersSystemDAO
.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\FindCustomerDAO.ja
va
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\CDIComparisionDAO.
java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\SearchEmpCustDAO.j
ava
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\CompanyDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\ChangeHistoryDAO.j
ava
D JavaSource\com\penske\delegatedadmin\dao\factory\as400\AddCustomerDAO.jav
a
D JavaSource\com\penske\delegatedadmin\dao\factory\IAddCustomerDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\ITemplateDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\AbstractDaoFactory.java
D JavaSource\com\penske\delegatedadmin\dao\factory\IAddCustomerNewUserDAO.j
ava
D JavaSource\com\penske\delegatedadmin\dao\factory\IUserDetailsDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\IFilterDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\IApplicationsDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\IDelTempCustUserDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\ICDIComparisonDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\IModifyAppAccessRightsDA
O.java
D JavaSource\com\penske\delegatedadmin\dao\factory\IReportsDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\ICustNumDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\INavigationDAO.java
D JavaSource\com\penske\delegatedadmin\dao\factory\IViewUsersSystemDAO.java
D L JavaSource\com\penske\delegatedadmin\servlet
D JavaSource\com\penske\delegatedadmin\servlet\DAMenuData.java
D JavaSource\com\penske\delegatedadmin\servlet\ApplicationEntry.java
D L JavaSource\com\penske\delegatedadmin\taglibs
D JavaSource\com\penske\delegatedadmin\taglibs\vssver.scc
D JavaSource\com\penske\delegatedadmin\taglibs\DelAdminBody.java
D L JavaSource\com\penske\delegatedadmin\forms
D JavaSource\com\penske\delegatedadmin\forms\UploadAgreementForm.java
D JavaSource\com\penske\delegatedadmin\forms\AddCustomerUserAdminForm.java
D JavaSource\com\penske\delegatedadmin\forms\AddCustomerNewUserForm.java
D JavaSource\com\penske\delegatedadmin\forms\AppAccessRightsForm.java
D JavaSource\com\penske\delegatedadmin\forms\DormantAccReportsForm.java
D JavaSource\com\penske\delegatedadmin\forms\ModifyAppAccessRightsForm.java
D JavaSource\com\penske\delegatedadmin\forms\ModDelTemplateForm.java
D JavaSource\com\penske\delegatedadmin\forms\ViewUsersSystemForm.java
D JavaSource\com\penske\delegatedadmin\forms\FindCustomerForm.java
D JavaSource\com\penske\delegatedadmin\forms\CDIComparisionForm.java
D JavaSource\com\penske\delegatedadmin\forms\FindApplicationForm.java
D JavaSource\com\penske\delegatedadmin\forms\ModifyCustCompForm.java
D JavaSource\com\penske\delegatedadmin\forms\PasswordResetForm.java
D JavaSource\com\penske\delegatedadmin\forms\CustomerUserDetailsForm.java
D JavaSource\com\penske\delegatedadmin\forms\ChangeHistoryForm.java
D JavaSource\com\penske\delegatedadmin\forms\ModifyApplicationForm.java
D JavaSource\com\penske\delegatedadmin\forms\AddApplicationForm.java
D JavaSource\com\penske\delegatedadmin\forms\UsersByAppReportsForm.java
D JavaSource\com\penske\delegatedadmin\forms\BulkloadUserRightsForm.java
D JavaSource\com\penske\delegatedadmin\forms\CompCustNumForm.java
D JavaSource\com\penske\delegatedadmin\forms\TempAppAssocSrchForm.java
D JavaSource\com\penske\delegatedadmin\forms\FindEmployeeForm.java
D JavaSource\com\penske\delegatedadmin\forms\EditViewOrgNonGroupForm.java
D JavaSource\com\penske\delegatedadmin\forms\AssocAppsTempForm.java
D JavaSource\com\penske\delegatedadmin\forms\EmployeeUserDetailsForm.java
D JavaSource\com\penske\delegatedadmin\forms\AddTemplateForm.java
D JavaSource\com\penske\delegatedadmin\forms\DelTempCustUserForm.java
D JavaSource\com\penske\delegatedadmin\forms\AddCustNumToCompForm.java
D JavaSource\com\penske\delegatedadmin\forms\PaginationForm.java
D JavaSource\com\penske\delegatedadmin\forms\FindCustCompForm.java
D JavaSource\com\penske\delegatedadmin\forms\EditViewOrgGroupForm.java
D JavaSource\com\penske\delegatedadmin\forms\AddCustCompForm.java
D JavaSource\com\penske\delegatedadmin\forms\AdminReportsForm.java
D JavaSource\com\penske\delegatedadmin\forms\ModifyCustomerUserForm.java
D JavaSource\com\penske\delegatedadmin\forms\TemplateDescForm.java
D L JavaSource\com\penske\delegatedadmin\filters
D JavaSource\com\penske\delegatedadmin\filters\SessionValidationFilter.java
D JavaSource\com\penske\delegatedadmin\filters\DummySecurityFilter.java
D L JavaSource\com\penske\delegatedadmin\business
D JavaSource\com\penske\delegatedadmin\business\FindUserBO.java
D JavaSource\com\penske\delegatedadmin\business\FindEmployeeBO.java
D JavaSource\com\penske\delegatedadmin\business\AddCustomerNewUserBO.java
D JavaSource\com\penske\delegatedadmin\business\UserDetailsBO.java
D JavaSource\com\penske\delegatedadmin\business\ApplicationsBO.java
D JavaSource\com\penske\delegatedadmin\business\CustNumberBO.java
D JavaSource\com\penske\delegatedadmin\business\DelTempCustUserBO.java
D JavaSource\com\penske\delegatedadmin\business\AbstractBusinessBase.java
D JavaSource\com\penske\delegatedadmin\business\ModifyAppAccessRightsBO.jav
a
D JavaSource\com\penske\delegatedadmin\business\ReportsBO.java
D JavaSource\com\penske\delegatedadmin\business\NavigationBO.java
D JavaSource\com\penske\delegatedadmin\business\ViewUsersSystemBO.java
D JavaSource\com\penske\delegatedadmin\business\FindCustomerBO.java
D JavaSource\com\penske\delegatedadmin\business\CDIComparisionBO.java
D JavaSource\com\penske\delegatedadmin\business\CompanyBO.java
D JavaSource\com\penske\delegatedadmin\business\ChangeHistoryBO.java
D JavaSource\com\penske\delegatedadmin\business\ModifyCustomerUserBO.java
D JavaSource\com\penske\delegatedadmin\business\AddCustomerUserBO.java
D JavaSource\com\penske\delegatedadmin\business\TemplateBO.java
D JavaSource\com\penske\delegatedadmin\business\BulkloadUserRightsBO.java
D L JavaSource\com\penske\delegatedadmin\entity
D JavaSource\com\penske\delegatedadmin\entity\AddCustomerUserBean.java
D JavaSource\com\penske\delegatedadmin\entity\TemplateBean.java
D JavaSource\com\penske\delegatedadmin\entity\AddApplicationBean.java
D JavaSource\com\penske\delegatedadmin\entity\TempAppAssocSrchBean.java
D JavaSource\com\penske\delegatedadmin\entity\FindEmployeeBean.java
D JavaSource\com\penske\delegatedadmin\entity\SearchCriteriaRowBean.java
D JavaSource\com\penske\delegatedadmin\entity\AssocAppsTempBean.java
D JavaSource\com\penske\delegatedadmin\entity\MenuTraceBean.java
D JavaSource\com\penske\delegatedadmin\entity\CompanySearchRowBean.java
D JavaSource\com\penske\delegatedadmin\entity\PaginationResults.java
D JavaSource\com\penske\delegatedadmin\entity\ApplicationSearchRow.java
D JavaSource\com\penske\delegatedadmin\entity\ResultSearchRowBean.java
D JavaSource\com\penske\delegatedadmin\entity\UserSearchRowBean.java
D JavaSource\com\penske\delegatedadmin\entity\CustomerUserBean.java
D JavaSource\com\penske\delegatedadmin\entity\ChangeHistoryResults.java
D JavaSource\com\penske\delegatedadmin\entity\FindApplicationBean.java
D JavaSource\com\penske\delegatedadmin\entity\AppListRowBean.java
D JavaSource\com\penske\delegatedadmin\entity\CompanyBean.java
D JavaSource\com\penske\delegatedadmin\entity\ChangeHistoryResultBean.java
D JavaSource\com\penske\delegatedadmin\entity\ChangeHistoryBean.java
D L JavaSource\com\penske\delegatedadmin\util
D JavaSource\com\penske\delegatedadmin\util\DAConstants.java
D JavaSource\com\penske\delegatedadmin\util\DAUtil.java
D JavaSource\com\penske\delegatedadmin\util\DBUtil.java
D JavaSource\com\penske\delegatedadmin\util\DelAdminException.java
L SourceBakup
L SourceBakup\com
L SourceBakup\com\penske
L SourceBakup\com\penske\apps
L SourceBakup\com\penske\apps\delegatedadmin
L SourceBakup\com\penske\apps\delegatedadmin\webservices
L SourceBakup\com\penske\delegatedadmin
L SourceBakup\com\penske\delegatedadmin\actions
L SourceBakup\com\penske\delegatedadmin\app
L SourceBakup\com\penske\delegatedadmin\dao
L SourceBakup\com\penske\delegatedadmin\dao\context
L SourceBakup\com\penske\delegatedadmin\dao\transfer
L SourceBakup\com\penske\delegatedadmin\dao\factory
L SourceBakup\com\penske\delegatedadmin\dao\factory\as400
L SourceBakup\com\penske\delegatedadmin\servlet
L SourceBakup\com\penske\delegatedadmin\db
L SourceBakup\com\penske\delegatedadmin\forms
L SourceBakup\com\penske\delegatedadmin\filters
L SourceBakup\com\penske\delegatedadmin\business
L SourceBakup\com\penske\delegatedadmin\entity
L SourceBakup\com\penske\delegatedadmin\util
D .j2ee
D .compatibility
L WebContent
L WebContent\META-INF
L WebContent\theme
L WebContent\html
L WebContent\images
L WebContent\WEB-INF
L WebContent\WEB-INF\log
L WebContent\WEB-INF\lib
L WebContent\js
L WebContent\jsp
C:\websphere_proj\delegatedadmin>
Error log about previous time of testing obstructed problem
[Thu May 04 15:39:47 2006] [error] [client 3.144.56.48] Provider encountered an error while streaming a REPORT response. [500, #0]
[Thu May 04 15:39:47 2006] [error] [client 3.144.56.48] A failure occurred while driving the update report editor [500, #190004]
[Thu May 04 15:56:26 2006] [error] [client 3.144.56.48] A failure occurred while driving the update report editor [404, #160013]
[Thu May 04 15:56:26 2006] [error] [client 3.144.56.48] Working copy path '.classpath' does not exist in repository [404, #160013]
[Thu May 04 15:57:33 2006] [error] [client 3.144.56.48] A failure occurred while driving the update report editor [404, #160013]
[Thu May 04 15:57:33 2006] [error] [client 3.144.56.48] Working copy path '.classpath' does not exist in repository [404, #160013]
[Thu May 04 15:59:28 2006] [error] [client 3.144.56.48] A failure occurred while driving the update report editor [404, #160013]
[Thu May 04 15:59:28 2006] [error] [client 3.144.56.48] Working copy path '.classpath' does not exist in repository [404, #160013]
[Thu May 04 16:21:10 2006] [error] [client 3.144.56.48] A failure occurred while driving the update report editor [404, #160013]
[Thu May 04 16:21:10 2006] [error] [client 3.144.56.48] Working copy path '.classpath' does not exist in repository [404, #160013]
[Thu May 04 16:21:51 2006] [error] [client 3.144.56.48] A failure occurred while driving the update report editor [404, #160013]
[Thu May 04 16:21:51 2006] [error] [client 3.144.56.48] Working copy path '.classpath' does not exist in repository [404, #160013]
[Fri May 05 09:53:02 2006] [error] [client 3.144.56.48] A failure occurred while driving the update report editor [404, #160013]
[Fri May 05 09:53:02 2006] [error] [client 3.144.56.48] Working copy path '.classpath' does not exist in repository [404, #160013]
[Fri May 05 09:53:49 2006] [error] [client 3.144.56.48] A failure occurred while driving the update report editor [404, #160013]
[Fri May 05 09:53:49 2006] [error] [client 3.144.56.48] Working copy path '.classpath' does not exist in repository [404, #160013]
[Fri May 05 09:54:20 2006] [error] [client 3.144.56.48] Could not DELETE /svn/webprojects/!svn/wrk/a16be379-1923-a343-b3b3-b3b78ff40bea/admin/delegatedadmin/branches/dev_gh/delegatedadmin/.classpath. [409, #0]
[Fri May 05 09:54:20 2006] [error] [client 3.144.56.48] Can't DELETE out-of-date resource [409, #170004]
[Fri May 05 09:54:20 2006] [error] [client 3.144.56.48] Item '/admin/delegatedadmin/branches/dev_gh/delegatedadmin/.classpath' is out of date [409, #170004]
[Fri May 05 09:56:26 2006] [error] [client 3.144.56.48] A failure occurred while driving the update report editor [404, #160013]
[Fri May 05 09:56:26 2006] [error] [client 3.144.56.48] Working copy path '.classpath' does not exist in repository [404, #160013]
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 9 19:23:38 2006