OK, I have come across this again and it is getting rather annoying as
every time I attempt to do a merge I now get this error.
Here are steps that seem to be able to reproduce this issue:
1.) Check out the trunk, head revision
2.) Attempt to merge in changes from a branch. Receive the following error:
Obstructed update
svn: Revision 4864 doesn't match existing revision 4863 in
'C:\project\path\to\some\directory'
3.) Revert the changes from the half-baked "merge".
4.) Click "synchronize" to confirm I had indeed cleared all changes from
the result of the broken merge. Receive the following:
Filesystem has no item
svn: REPORT request failed on '/svn/!svn/vcc/default'
svn: Working copy path 'path/to/some/File.java' does not exist in repository
As discussed before the only way around this is to completely delete my
project and re-checkout.
There now seem to be two issues here:
1.) Why doesn't the merge want to work?
2.) Why does the "filesystem has no item" error happen?
Obviously this could all be user error.
An important detail is that there is are files that exist in the branch
that do not exist in the trunk and vice versa. For example work was done
in the branch that added some files that did not need to get added to
the trunk. Also work was done in the trunk (refactoring) which moved
files, not reflected in the branch.
Is this a limitation of svn? Shouldn't it be able to resolve these
changes gracefully without completely borking my working copy? :-(
Cheers,
-Zach
Zach Bailey wrote:
> Indeed the command line client says the same thing and I agree that
> somehow my working copy is in a weird state. Looks like I will have to
> just re-import my project.
>
> Thanks,
> -Zach
>
> Mark Phippard wrote:
>> Zach Bailey <zach.bailey@hannonhill.com> wrote on 09/15/2006 02:28:28 PM:
>>
>>> Is it possible this could be a bug? I do not have any command-line
>>> svn utilities that I can use, I do everything via Subclipse. I have
>>> not encountered this error before but it seems it would be fairly
>>> easy to reproduce given the steps I have enumerated.
>>>
>>> I have tried running a team->clean to no avail. Right now I am faced
>>> with deleting my project and re-importing it. Is there any other path
>>> I can try?
>>
>> I'd download the command line binaries, add it to your PATH and try that.
>>
>> It could be a bug, but it has to be more complicated then what you
>> described. Like I said, I suspect it might be something you did with
>> the initial switch. The console shows what we ran, after that it is
>> in the hands of the Subversion library. I know the scenario you
>> describe works, so I suspect it is that your WC is in a weird state of
>> some sort.
>>
>> Mark
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
>> For additional commands, e-mail: users-help@subclipse.tigris.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
> For additional commands, e-mail: users-help@subclipse.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Mon Sep 18 20:54:52 2006