We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 4226b95 commit 2655e1dCopy full SHA for 2655e1d
src/repository.cpp
@@ -1161,7 +1161,7 @@ int FastImportRepository::Transaction::commit()
1161
mark_t i = !!parentmark; // if parentmark != 0, there's at least one parent
1162
1163
if(log.contains("This commit was manufactured by cvs2svn") && merges.count() > 1) {
1164
- qSort(merges);
+ std::sort(merges.begin(), merges.end());
1165
repository->fastImport.write("merge :" + QByteArray::number(merges.last()) + "\n");
1166
merges.pop_back();
1167
qWarning() << "WARN: Discarding all but the highest merge point as a workaround for cvs2svn created branch/tag"
0 commit comments