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

Re: Tree conflicts - problem handling when local directory is deleted

From: Mark Phippard <mphippard_at_collab.net>
Date: Thu, 22 Jan 2009 11:46:46 -0500

On Thu, Jan 22, 2009 at 11:43 AM, Julian Foad
<julianfoad_at_btopenworld.com> wrote:
>> Clearly the current situation is worse
>> though. You cannot commit, because you are out of date, and if you do
>> update again after resolving the tree conflict all it does is create
>> it again.
> Note that the work-around is (should be) to mark as resolved, revert the
> schedule-delete, update, then re-schedule the delete:
> svn resolved wc2/A/B/E
> svn revert -R wc2/A/B/E
> svn up wc2
> svn delete wc2/A/B/E
> Seems to work for me.
> I'm not saying that's good, just possible.

Yes, this is a case where our copy+delete move behavior probably helps
a little. I was thinking you'd have to revert the whole thing, but
you are right, you only need to revert the delete half. It'd
certainly be better if we could just handle this.

Mark Phippard
Received on 2009-01-22 17:47:00 CET

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