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

  /external/webkit/Tools/Scripts/webkitperl/VCSUtils_unittest/
mergeChangeLogs.pl 106 my $fileMine = writeTempFile("file", ".rej", $fileMineContent);
107 rename($fileMine, $fileNewer . ".rej");
108 $fileMine = $fileNewer . ".rej";
115 my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
120 ok(readFile($fileMine) eq $fileMineContent, "$title: \$fileMine should be unchanged");
134 unlink($fileMine, $fileOlder, $fileNewer);
175 my $fileMine = writeTempFile("file", ".rej", $fileMineContent);
176 rename($fileMine, $fileNewer . ".rej");
177 $fileMine = $fileNewer . ".rej"
    [all...]
  /external/webkit/Tools/Scripts/
resolve-ChangeLogs 172 my $fileMine;
189 $fileMine = "${file}.mine" if -e "${file}.mine";
222 $fileMine = "${file}.REMOTE.$$";
223 $outputFile = $fileMine;
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 62 milliseconds