feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Use entries combobox for log

Browse Source 
Tests included

Change-Id: Ibe2f6ece207128f8467b0cbca9dc38f2bcd5ced6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-28 22:02:35 +02:00
committed by Orgad Shaneh
parent d0f1193041
commit 7cb80f0e16
23 changed files with 208 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/subversion/subversionplugin.cpp
View File

@@ -1427,6 +1427,28 @@ void SubversionPlugin::testDiffFileResolving()
SubversionEditor editor(editorParameters + 3, 0);
editor.testDiffFileResolving();
}
void SubversionPlugin::testLogResolving()
{
QByteArray data(
"------------------------------------------------------------------------\n"
"r1439551 | philip | 2013-01-28 20:19:55 +0200 (Mon, 28 Jan 2013) | 4 lines\n"
"\n"
"* subversion/tests/cmdline/update_tests.py\n"
" (update_moved_dir_file_move): Resolve conflict, adjust expectations,\n"
" remove XFail.\n"
"\n"
"------------------------------------------------------------------------\n"
"r1439540 | philip | 2013-01-28 20:06:36 +0200 (Mon, 28 Jan 2013) | 4 lines\n"
"\n"
"* subversion/tests/cmdline/update_tests.py\n"
" (update_moved_dir_edited_leaf_del): Do non-recursive resolution, adjust\n"
" expectations, remove XFail.\n"
"\n"
);
SubversionEditor editor(editorParameters + 1, 0);
editor.testLogResolving(data, "r1439551", "r1439540");
}
#endif
} // Internal