Lines Matching refs:mergeChangeLogs
25 # Unit tests of VCSUtils::mergeChangeLogs().
72 my $title = "mergeChangeLogs: traditional rejected patch success";
115 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
117 # mergeChangeLogs() should return 1 since the patch succeeded.
141 my $title = "mergeChangeLogs: traditional rejected patch failure";
184 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
186 # mergeChangeLogs() should return 0 since the patch failed.
200 my $title = "mergeChangeLogs: patch succeeds";
241 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
243 # mergeChangeLogs() should return 1 since the patch succeeded.
268 my $title = "mergeChangeLogs: patch fails";
321 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
323 # mergeChangeLogs() should return a non-zero exit status since the patch failed.