Re: [TSVN] Properties conflict on a folder

Gugger, Tino wrote:

> We use the svn:externals property on a folder. I changed that property
> locally while it also changed on the repository. Updating my WC reported
> a conflict on that folder, creating the file 'dir_conflicts.prej' with
> correct contents (as it seems to me). I solved the conflict manually but
> couldn't commit the changes as TSVN didn't show the "conflict solved"
> menu entries. It's been a deadlock as update does not work either...

The *.prej file contains the _p_roperties _rej_ects. That means the
properties as they were set on the server but are different than your
local modified properties.

> Question 1: What am I supposed to do with 'dir_conflicts.prej'? I just
> used it for information on the conflict...

Just delete the prej file.

> Question 2: How can I tell TSVN that the property conflict is solved
> after having done so?

Deleting the prej file also marks the conflict as resolved. So once that
file is deleted, you can proceed as always.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Aug 16 18:34:42 2004