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

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

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-08-19 12:52:21 CEST

Jan Normann Nielsen wrote:

> 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
> dialog.

You should check with the Subversion mailing list about that. Just try
the CL client first - I'm sure it shows the status as 'added' too.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
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:52:47 2005

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