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

[TSVN] Properties conflict on a folder

From: Gugger, Tino <Tino.Gugger_at_keymile.com>
Date: 2004-08-16 16:55:38 CEST

Hi everyone,
 
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...
 
Question 1: What am I supposed to do with 'dir_conflicts.prej'? I just
used it for information on the conflict...
Question 2: How can I tell TSVN that the property conflict is solved
after having done so?
 
Regards,
Tino
 
I'm using Windows XP SP1 and
TortoiseSVN 1.1.0, Build 1526, UNICODE
Subversion 1.1.0, -dev
apr 0.9.5
apr-iconv 0.9.5
apr-utils 0.9.5
berkeley db 4.2.52
neon 0.24.7
OpenSSL 0.9.7d 17 Mar 2004
zlib 1.2.1
Received on Mon Aug 16 18:04:50 2004

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

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