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

'svn status -u' troubles after painful merge...

From: Clem Taylor <clem.taylor_at_gmail.com>
Date: 2005-11-22 00:49:08 CET

I've run into a bit of a problem with a merge from a vendor tree:

1) svn vendor tree with 2.6.13 linux kernel
2) update to 2.6.14 plus a huge pile of bunch of broken stuff
3) revert vendor tree back to true 2.6.14 (adds back a bunch of deleted files)
4) merge 2.6.14 code into project kernel directory
    This merge fails with a bunch of "Skipped missing target 'file'"
and "Skipped 'file'" errors.
    At this point the working view is badly broken, but with a number
manual merges I got
    things into a happy buildable state.
5) I'm ready to check things in and I try to do a 'status -u' and it fails with:
     svn: Working copy path '...' does not exist in repository.
     An info for this file shows that it is a new file that was copied
(replaced) as part of the merge.
     Trac shows that the file does exist in the repository and it
looks very similar to the file I'm trying
     checkin. If I do an 'svn status -u' on other directories, a
number of other files have the same error.

I haven't been able to recover from this. I tried blowing things away
and doing the merge again only to get back to the same problem. It
seems that my problem started with backing out changes to my vendor
tree which broke the ancestry. Any ideas how to recover from this?
Just doing an 'svn remove' of the broken file does not eliminate the
status error (because the file still has a has a history commit

Any ideas what to do to recover from this?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 22 00:51:27 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.