Cross Reference: /external/webkit/Tools/Scripts/resolve-ChangeLogs

Lines Matching refs:fileNewer

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;
444     if (mergeChangeLogs($fileMine, $fileOlder, $fileNewer)) {
445         if ($file ne $fileNewer) {
447             rename($fileNewer, $file) or die $!;
455         unlink($fileMine, $fileOlder, $fileNewer) if $isGit;

OpenGrok