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

Re: Added files that are conflicted

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-02-28 20:24:59 CET

Russell Hind wrote:
> Added files can get conflicted if you merge changes but TSVN still just
> treats them as added and doesn't give you options to edit
> conflicts/resolve the files. But you do get an error when commited
> because the file is conflicted. Using 1.3.2 I did the following:
>
> 1. Checked out a branch
> 2. Merged a changeset to the new wc that added a file
> 3. Made a couple of changes to the added file
> 4. Merged another changeset which modified the file and left it in a
> conflicted state.
>
> Subversion seems to handle this situation, (although svn st just shows
> Added+ as TSVN status does) but TSVN doesn't.
>
> I had to resolve the conflict using the commandline before I could
> commit with TSVN again.

Fixed in revision 5869.

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 Tue Feb 28 20:29:10 2006

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