Re: Unnecessary warning after successful auto-resolve

On 16.08.2013 16:35, Pavel Lyalyakin wrote:
> Hello,
>
> I've noticed that a tree-conflict that has been already auto-resolved
> still shouts in red "Warning! One or more files are in a conflicted
> state." in output.
>
> I'm using TortoiseSVN 1.8.1.
>
> 1. Add file1.txt to a working copy and commit (r1),
> 2. Edit file1.txt and commit,
> 3. Update to r1,
> 4. Rename file1.txt to file2.txt with TortoiseSVN,
> 5. Update.
>
> Getting this warning however I assume that it's completely unnecessary
> since the tree conflict has been successfully auto-resolved:
>
> [[
> Command: Update
> Updating: C:\..\Solution1
> Tree conflict (Resolved): C:\..\Solution1\file1.txt
> Completed: At revision: 3
> Warning!: One or more files are in a conflicted state.
> Updated: C:\..\Solution1\file2.txt
> Completed: At revision: 3
> Resolved: C:\..\Solution1\file1.txt
> ]]
>
> `svn st -v` output after auto-resolve:
>
> [[
> 3 3 Pavel.Lyalyakin .
> D 3 3 Pavel.Lyalyakin file1.txt
> > moved to file2.txt
> A + - 3 Pavel.Lyalyakin file2.txt
> > moved from file1.txt
> ]]
>

Filed as issue #537:
http://code.google.com/p/tortoisesvn/issues/detail?id=537

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3062814
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].