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

Unnecessary warning after successful auto-resolve

From: Pavel Lyalyakin <pavel.lyalyakin_at_visualsvn.com>
Date: Fri, 16 Aug 2013 18:35:46 +0400

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
]]

-- 
With best regards,
Pavel Lyalyakin
VisualSVN Team
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3062809
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-08-16 16:48:00 CEST

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.