HomeSort by relevance Sort by last modified time
    Searched refs:mergeChangeLogs (Results 1 - 3 of 3) sorted by null

  /external/webkit/Tools/Scripts/webkitperl/VCSUtils_unittest/
mergeChangeLogs.pl 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
    [all...]
  /external/webkit/Tools/Scripts/
resolve-ChangeLogs 132 if (mergeChangeLogs($ours, $base, $theirs)) {
444 if (mergeChangeLogs($fileMine, $fileOlder, $fileNewer)) {
VCSUtils.pm 69 &mergeChangeLogs
    [all...]

Completed in 772 milliseconds