SVN: Show conflicted files in submit editor

So far, they didn't show up in the submit editor,
so they could be forgotten during a commit.

Unlike Git, these files don't prohibit the commit,
but at least are shown in the list of modified files
and can be diffed.

Change-Id: Ia5cac7befb870321d2048622c1fac022d979c745
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Andre Hartmann
2016-05-20 19:20:49 +02:00
committed by André Hartmann
parent 5d3823ac47
commit a5b7ba58f0
4 changed files with 16 additions and 13 deletions

View File

@@ -57,6 +57,11 @@ struct SubversionResponse
QString message;
};
const char FileAddedC[] = "A";
const char FileConflictedC[] = "C";
const char FileDeletedC[] = "D";
const char FileModifiedC[] = "M";
class SubversionPlugin : public VcsBase::VcsBasePlugin
{
Q_OBJECT