[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn merge 'breaks' working copy...

From: <kfogel_at_collab.net>
Date: 2005-11-28 18:14:08 CET

Clem Taylor <clem.taylor@gmail.com> writes:
> I think I've triggered a bug with 'svn merge'.
> I have a vendor tree that contained a 2.6.13 linux kernel. I updated
> this tree to 2.6.14 plus some heavily broken stuff. So, I backed out
> this change so my vendor tree now has a clean 2.6.14 kernel. Next, I
> attempt to merge the vendor tree with my development tree and I get a
> large number of merge failures in the form of "Skipped missing target
> 'file'" and "Skipped 'file'" errors. This seemed to be the result of
> the 2.6.14+ tree deleting a number of files and having to revert those
> files (broken ancestry). After far too many manual merges, I now have
> a happy working tree. However, I do a 'svn status -u' and it fails
> with: "svn: Working copy path '...' does not exist in repository.". An
> info for the failed file shows that the file in question is a new flie
> that was copied (replaced) as part of the merge. This file existed in
> the 2.6.13 tree was removed by the 2.6.14+ update and then replaced
> when I reverted back to 2.6.13. If I do a status -u in other
> sub-directories I see the error in other places.
> So now I'm trying to recover from this without any luck. I checked out
> a fresh working copy and managed to trigger the same problem again. I
> tried doing a 'svn remove' of the broken file and that does not
> eliminate the status error (because the file still has a history
> commit pending).
> Any ideas how to recover from this? The client is running 1.2.3 and
> the server is running 1.1.4.

I can't tell if you have found a bug here or not yet. Would it be
possible to get a transcript? (Verbs "updated this tree" and "backed
out this change" are okay in conversation, but for a reproduction
recipe we need more precision -- what exact commands did you use?)


www.collab.net  <>  CollabNet  |  Distributed Development On Demand
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 28 20:33:23 2005

This is an archived mail posted to the Subversion Dev mailing list.