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

Re: dir_conflicts.prej

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-03-04 04:11:46 CET

On Mar 2, 2005, at 11:01 AM, Reid Lyons wrote:

> How do you resolve directory conflicts? I don't see anything in the
> documentation discussing this.
>

When you update, and there's a conflict regarding tree-structure, the
update errors. You need to fix things and resume the update.

One of three things can happen:

1. The update might be trying to add a file or directory that's already
exists in the working copy. This causes the update to fail with an
"obstructed update" error.

2. The update might be trying to delete a file or directory that
contains local edits. This will fail, since svn refuses to destroy
unversioned data.

3. The update might be trying to edit something that you've deleted,
which will fail with a 'not found' error.

In each of these cases, you need to massage your working copy into some
form that will allow the update to continue when you re-run 'svn up'.

So I guess the short answer is: tree-based conflicts are resolved
interactively, one at a time, through a series of trial-and-error 'svn
up' retries.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 4 04:14:18 2005

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