Zach Bailey <zach.bailey@hannonhill.com> wrote on 09/18/2006 02:55:04 PM:
> 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? :-(
I will start at the end. Yes svn handles this. The files will be
reported as skipped, or at worst it will try to add them depending on what
you merged.
As to your problem I think you need to figure out where the problem is
created. These things you are reporting seem to be after effects.
Doing Team -> Update on the top-level of your project can often have
wondrous effects on these commands as it gets your WC completely up to one
revision.
We also recently added support for the --ignore-ancestry option on merge.
That might potentially help the merge. You can try running the command we
logged in the console from the command line, except adding that extra parm
to see if makes a difference. I cannot point you to a good explanation of
what that parm means or does.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Mon Sep 18 21:00:57 2006