GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 4297e7b8)

(cherry picked from commit be939f5f)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit ecd43ee0)

QProcess will happily start things in CWD which is not what we want

GIT_SILENT

(cherry picked from commit 3e6c9914)

(cherry picked from commit b6d532e7)

(cherry picked from commit 3f29d146)

Oleg Solovyov authored Dec 02, 2021 and Albert Astals Cid committed Dec 07, 2021

We get an infinite recursion when we perform search with no files found.
See below:

void FileSearchTab::performSearch()
{
    if (m_searchFileListView->files().isEmpty()) { // <= assume true
        addFilesToSearch(doScanRecursive(QDir(Project::instance()->poDir()))); // <= arg is an empty list
	if (m_searchFileListView->files().isEmpty()) // <= unreachable, see below
	[...]
}

void FileSearchTab::addFilesToSearch(const QStringList& files)
{
    m_searchFileListView->addFiles(files); // <= files.isEmpty() == true
    performSearch(); // <= m_searchFileListView->files().isEmpty() == true
}

Steps to reproduce:
1) Project -> Create software translation project -> Save
2) RMB -> Search in files
3) Wait ~1 minute until crash

(cherry picked from commit 9b82f864)

We get an infinite recursion when we perform search with no files found.
See below:

void FileSearchTab::performSearch()
{
    if (m_searchFileListView->files().isEmpty()) { // <= assume true
        addFilesToSearch(doScanRecursive(QDir(Project::instance()->poDir()))); // <= arg is an empty list
	if (m_searchFileListView->files().isEmpty()) // <= unreachable, see below
	[...]
}

void FileSearchTab::addFilesToSearch(const QStringList& files)
{
    m_searchFileListView->addFiles(files); // <= files.isEmpty() == true
    performSearch(); // <= m_searchFileListView->files().isEmpty() == true
}

Steps to reproduce:
1) Project -> Create software translation project -> Save
2) RMB -> Search in files
3) Wait ~1 minute until crash

Task: https://phabricator.kde.org/T11613

(cherry picked from commit c80acdd9)

(cherry picked from commit e07a4843)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"