[SVN-2022] Stop doing conflict-producing operations on already conflicted files

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: all
• Fix Version/s: 1.8.0
• Component/s: libsvn_wc
• Assignee: Subversion Importer
• Reporter: Subversion Importer
• Created: 25/Aug/04 02:01
• Updated: 27/Oct/18 16:30
• Resolved: 29/Dec/12 23:21

Description

If a file has both merge conflicts and update conflicts:

> svn stat
?      ptproj/www/index.html.merge-right.r68
?      ptproj/www/index.html.mine
?      ptproj/www/index.html.r63
?      ptproj/www/index.html.r64
?      ptproj/www/index.html.working
?      ptproj/www/index.html.merge-left.r56
C      ptproj/www/index.html

then "svn resolved ptproj/www/index.html" only cleans up the merge-related "r-files", not the update-
related ones:

> svn resolved
Resolved conflicted state of 'ptproj/www/index.html'
> svn stat
?      ptproj/www/index.html.mine
?      ptproj/www/index.html.r63
?      ptproj/www/index.html.r64
M      ptproj/www/index.html

Original issue reported by jackrepenning