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

  /external/webkit/Tools/Scripts/webkitperl/VCSUtils_unittest/
mergeChangeLogs.pl 111 my $fileOlder = writeTempFile("file", ".orig", $fileOlderContent);
112 rename($fileOlder, $fileNewer . ".orig");
113 $fileOlder = $fileNewer . ".orig";
115 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
121 ok(readFile($fileOlder) eq $fileOlderContent, "$title: \$fileOlder should be unchanged");
134 unlink($fileMine, $fileOlder, $fileNewer);
180 my $fileOlder = writeTempFile("file", ".orig", $fileOlderContent);
181 rename($fileOlder, $fileNewer . ".orig");
182 $fileOlder = $fileNewer . ".orig"
    [all...]
  /external/webkit/Tools/Scripts/
resolve-ChangeLogs 173 my $fileOlder;
206 $fileOlder = shift @matchingFiles;
216 $fileOlder = "${file}.BASE.$$";
217 $outputFile = $fileOlder;
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))
    [all...]
VCSUtils.pm     [all...]

Completed in 782 milliseconds