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

  /external/webkit/Tools/Scripts/webkitperl/VCSUtils_unittest/
mergeChangeLogs.pl 87 my $fileNewer = writeTempFile("file", "", $fileNewerContent);
107 rename($fileMine, $fileNewer . ".rej");
108 $fileMine = $fileNewer . ".rej";
112 rename($fileOlder, $fileNewer . ".orig");
113 $fileOlder = $fileNewer . ".orig";
115 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
132 ok(readFile($fileNewer) eq $expectedContent, "$title: \$fileNewer should be updated to include patch");
134 unlink($fileMine, $fileOlder, $fileNewer);
156 my $fileNewer = writeTempFile("file", "", $fileNewerContent)
    [all...]
  /external/webkit/Tools/Scripts/
resolve-ChangeLogs 174 my $fileNewer;
200 $fileNewer = "${file}.r${currentRevision}" if -e "${file}.r${currentRevision}";
202 my @matchingFiles = grep { $_ ne $fileNewer } glob("${file}.r[0-9][0-9]*");
219 $fileNewer = "${file}.LOCAL.$$";
220 $outputFile = $fileNewer;
235 if (!$fileMine && !$fileOlder && !$fileNewer) {
237 } elsif (!$fileMine || !$fileOlder || !$fileNewer) {
241 return ($fileMine, $fileOlder, $fileNewer);
440 my ($fileMine, $fileOlder, $fileNewer) = conflictFiles($file);
442 return unless $fileMine && $fileOlder && $fileNewer;
    [all...]
VCSUtils.pm     [all...]

Completed in 51 milliseconds