You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jeb <je...@penske.com> on 2006/05/09 12:12:41 UTC
obstructed merges, loss of files
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
Re: obstructed merges, loss of files
Posted by Jeb <je...@penske.com>.
Garrett Rooney wrote:
> On 5/9/06, Jeb <je...@penske.com> wrote:
>
>> 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
>
>
> Can you please show us the actual commands you ran and the error
> output you got in response? Just describing them like this makes it
> extremely difficult to tell what's actually going on.
>
> Ideally, if you could provide us with a script that starts from a
> totally empty repository and reproduces the situation you're seeing
> that would be great.
>
> -garrett
The scenario above was played out in both subclipse and tortoise
Using subclipse on 5/4/2006
subclipse| team | checkout as project to an empty directory from
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/offshore/delegatedadmin
subclipse| team | switch to
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/dev_gh/delegatedadmin
subclipse| team | merge from
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/dev_gh/delegatedadmin
HEAD checkbox checked to subclipse| team | switch to
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/offshore/delegatedadmin
HEAD checkbox checked
error from merge
merge
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/dev_gh/delegatedadmin@HEAD
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/offshore/delegatedadmin@HEAD
C:/Penske/Penske Workspace/delegatedadmin
D C:/Penske/Penske Workspace/delegatedadmin/.j2ee
D C:/Penske/Penske Workspace/delegatedadmin/.compatibility
D C:/Penske/Penske Workspace/delegatedadmin/.classpath
A C:/Penske/Penske Workspace/delegatedadmin/.classpath
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com_penske_delegatedadmin_actions.dnx
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/conf/delegatedadmin.properties
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/conf/ApplicationResources.properties
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/conf/deladminlinks.properties
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/conf/log4j.properties
D C:/Penske/Penske Workspace/delegatedadmin/JavaSource/conf
D C:/Penske/Penske Workspace/delegatedadmin/JavaSource/com/penske/dao
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/EditViewOrgGroupAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/AddCustCompAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/AdminReportsAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/ModifyCustomerUserAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/TemplateDescAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/UploadAgreementAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/DelAdminAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/DALogOffAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/AddCustomerUserAdminAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/AddCustomerNewUserAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/AppAccessRightsAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/DormantAccReportsAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/ModifyAppAccessRightsAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/ModDelTemplateAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/ViewUsersSystemAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/FindCustomerAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/CDIComparisionAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/FindApplicationAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/PasswordResetAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/ModifyCustCompAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/CustomerUserDetailsAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/ChangeHistoryAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/ModifyApplicationAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/UsersByAppReportsAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/AddApplicationAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/CompCustNumAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/BulkloadUserRightsAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/TempAppAssocSrchAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/EditViewOrgNonGroupAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/FindEmployeeAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/AssocAppsTempAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/EmployeeUserDetailsAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/AddTemplateAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/DelTempCustUserAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/AddCustNumToCompAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions/FindCustCompAction.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/actions
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/app/DelAdminSession.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/app/DelAdminActionError.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/app/DelAdminActionErrors.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/app/InitializationServlet.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/app
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/SOAPHandler.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/SoapPageContext.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/MyX509TrustManager.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/Serializer.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/Cookie.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/SOAPPageException.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/vssver.scc
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/XMLUtils.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/SOAPHttpConnection.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/ByteUtils.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/CookieStore.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/StringUtils.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/SecureURLConnection.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/B2BClientBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices/XMLErrorReporter.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/webservices
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/context/PersistenceContextFactory.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/context/ResourceTypeEnum.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/context
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/ViewUsersSystem.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/SearchTemplate.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/OracleList.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/FindCustomer.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/CDIComparision.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/DAMenuList.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/AddCustNum.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/ChangeHistory.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/Applications.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/FilterItems.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/FilterType.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/DelTempCustUser.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/CDIComparisionSearch.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/Choice.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer/CustNum.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/transfer
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IFindCustomerDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/ICompanyDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/ISearchEmpCustDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IChangeHistoryDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IAddCustomerDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/TemplateDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/AS400Daofactory.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/AddCustomerNewUserDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/UserDetailsDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/FilterDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/ApplicationsDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/CustNumberDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/DelTempCustUserDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/ModifyAppAccessRightsDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/ReportsDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/NavigationDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/ViewUsersSystemDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/FindCustomerDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/CDIComparisionDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/SearchEmpCustDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/CompanyDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/ChangeHistoryDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400/AddCustomerDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/as400
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/ITemplateDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/AbstractDaoFactory.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IAddCustomerNewUserDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IUserDetailsDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IFilterDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IApplicationsDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IDelTempCustUserDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/ICDIComparisonDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IModifyAppAccessRightsDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IReportsDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/ICustNumDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/INavigationDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory/IViewUsersSystemDAO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao/factory
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/dao
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/servlet/DAMenuData.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/servlet/ApplicationEntry.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/servlet
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/taglibs/vssver.scc
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/taglibs/DelAdminBody.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/taglibs
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/UploadAgreementForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/AddCustomerUserAdminForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/AddCustomerNewUserForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/AppAccessRightsForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/DormantAccReportsForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/ModifyAppAccessRightsForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/ModDelTemplateForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/ViewUsersSystemForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/FindCustomerForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/CDIComparisionForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/FindApplicationForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/ModifyCustCompForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/PasswordResetForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/CustomerUserDetailsForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/ChangeHistoryForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/ModifyApplicationForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/UsersByAppReportsForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/AddApplicationForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/CompCustNumForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/BulkloadUserRightsForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/TempAppAssocSrchForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/EditViewOrgNonGroupForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/FindEmployeeForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/AssocAppsTempForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/AddTemplateForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/EmployeeUserDetailsForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/DelTempCustUserForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/PaginationForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/AddCustNumToCompForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/FindCustCompForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/EditViewOrgGroupForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/AddCustCompForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/AdminReportsForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/ModifyCustomerUserForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms/TemplateDescForm.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/forms
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/filters/SessionValidationFilter.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/filters/DummySecurityFilter.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/filters
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/FindUserBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/FindEmployeeBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/AddCustomerNewUserBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/UserDetailsBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/ApplicationsBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/CustNumberBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/DelTempCustUserBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/AbstractBusinessBase.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/ModifyAppAccessRightsBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/ReportsBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/NavigationBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/ViewUsersSystemBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/FindCustomerBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/CDIComparisionBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/CompanyBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/ChangeHistoryBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/ModifyCustomerUserBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/AddCustomerUserBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/TemplateBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business/BulkloadUserRightsBO.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/business
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/AddCustomerUserBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/TemplateBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/AddApplicationBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/TempAppAssocSrchBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/SearchCriteriaRowBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/FindEmployeeBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/AssocAppsTempBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/MenuTraceBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/CompanySearchRowBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/PaginationResults.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/ApplicationSearchRow.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/UserSearchRowBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/ResultSearchRowBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/CustomerUserBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/ChangeHistoryResults.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/FindApplicationBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/AppListRowBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/CompanyBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/ChangeHistoryResultBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity/ChangeHistoryBean.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/entity
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/util/DAConstants.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/util/DAUtil.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/util/DBUtil.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/util/DelAdminException.java
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin/util
D C:/Penske/Penske
Workspace/delegatedadmin/JavaSource/com/penske/delegatedadmin
D C:/Penske/Penske Workspace/delegatedadmin/JavaSource/com/penske
D C:/Penske/Penske Workspace/delegatedadmin/JavaSource/com
D C:/Penske/Penske Workspace/delegatedadmin/JavaSource
Obstructed update
svn: Revision 320 doesn't match existing revision 319 in
'C:\Penske\Penske Workspace\delegatedadmin\JavaSource'
Follwing a similar process with the command line
cd C:\msdev\projects\delegatedadmin2
svn co
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/offshore/delegatedadmin
c:\msdev\projects\delegatedadmin2 >> checkout.log
(exec time 2:10)
svn switch
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/dev_gh/delegatedadmin
>> switch.log
(exec time 2:25)
svn merge
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/dev_gh/delegatedadmin
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/offshore/delegatedadmin
>> merge.log
error presented in command window
svn: URL
'http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/of
fshore/delegatedadmin/JavaSource' doesn't match existing URL
'http://svn.penske.
com/svn/webprojects/admin/delegatedadmin/branches/dev_gh/delegatedadmin/JavaSour
ce' in 'JavaSource'
I tried narrowing into the JavaSource folder, then the error moves to
the conf folder
svn merge
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/dev_gh/delegatedadmin/JavaSource
http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/offshore/delegatedadmin/JavaSource
<>error:
svn: URL
'http://svn.penske.com/svn/webprojects/admin/delegatedadmin/branches/of
fshore/delegatedadmin/JavaSource/conf' doesn't match existing URL
'http://svn.penske.
com/svn/webprojects/admin/delegatedadmin/branches/dev_gh/delegatedadmin/JavaSour
ce/conf' in 'conf'
using svn command line client 1.3.0 on winxp
Apache/2.0.54 (Unix) DAV/2 SVN/1.3.0 on RHAS Linux server
I will continue to try to isolate this to smaller set of files.
Thanks for your assistance and patience
Jeb
Re: obstructed merges, loss of files
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 5/9/06, Jeb <je...@penske.com> wrote:
> 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
Can you please show us the actual commands you ran and the error
output you got in response? Just describing them like this makes it
extremely difficult to tell what's actually going on.
Ideally, if you could provide us with a script that starts from a
totally empty repository and reproduces the situation you're seeing
that would be great.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org