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

[TSVN] Added & conflicted in "Check for modifications"

From: Jan Normann Nielsen <lists_at_dubbekarl.dk>
Date: 2005-08-19 12:29:22 CEST


If I have added a file to SVN control and then perform a merge that
results in conflicts in the added file, the file is still shown as added
in "Check for modifications". Shouldn't it be shown as having conflicts
(this is more important than me knowing that it is added) or possibly
both added and with conflicts? I have no way of knowing that the file
has conflicts if it wasn't for the ".merge-left" and and ".merge-right"
files shown as unversioned files in the bottom of the file list in the

Best wishes,
Jan Nielsen

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 19 12:31:19 2005

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.