diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-12-25 19:38:07 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-12-30 12:54:45 +0100 |
| commit | 65b7874341c8c41c9e798cdbc80791ca5abcbb39 (patch) | |
| tree | fd685118f836ab1cfe63fdd526ca4fba1e91f2df /src/plugins/mercurial/commiteditor.cpp | |
| parent | 30d548ea3a9c8886519374665a64a0ebda4c6c9a (diff) | |
| download | qt-creator-65b7874341c8c41c9e798cdbc80791ca5abcbb39.tar.gz | |
Git: Prevent checking unmerged files in submit editor
Change-Id: Ic226638a522ca92f61b8b6736a325c1cc747ff62
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/mercurial/commiteditor.cpp')
| -rw-r--r-- | src/plugins/mercurial/commiteditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp index 7e89be55f0..677bf8b4e7 100644 --- a/src/plugins/mercurial/commiteditor.cpp +++ b/src/plugins/mercurial/commiteditor.cpp @@ -69,7 +69,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra if (item.flags == QLatin1String("Untracked")) shouldTrack.append(item.file); else - fileModel->addFile(item.file, item.flags, false); + fileModel->addFile(item.file, item.flags, VcsBase::Unchecked); } VcsBaseSubmitEditor::filterUntrackedFilesOfProject(repositoryRoot.absoluteFilePath(), @@ -78,7 +78,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra foreach (const QString &track, shouldTrack) { foreach (const VcsBaseClient::StatusItem &item, repoStatus) { if (item.file == track) - fileModel->addFile(item.file, item.flags, false); + fileModel->addFile(item.file, item.flags, VcsBase::Unchecked); } } |