Home | History | Annotate | Download | only in VCSUtils_unittest

Lines Matching refs:fileNewer

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);
176     rename($fileMine, $fileNewer . ".rej");
177     $fileMine = $fileNewer . ".rej";
181     rename($fileOlder, $fileNewer . ".orig");
182     $fileOlder = $fileNewer . ".orig";
184     my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
191     ok(readFile($fileNewer) eq $fileNewerContent, "$title: \$fileNewer should be unchanged");
193     unlink($fileMine, $fileOlder, $fileNewer);
239     my $fileNewer = writeTempFile("fileNewer", "", $fileNewerContent);
241     my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
259     ok(readFile($fileNewer) eq $expectedContent, "$title: \$fileNewer should be patched");
261     unlink($fileMine, $fileOlder, $fileNewer);
319     my $fileNewer = writeTempFile("fileNewer", "", $fileNewerContent);
321     my $exitStatus = mergeChangeLogs($fileMine, $fileOlder, $fileNewer);
329     # $fileNewer should still exist unchanged because the patch failed
330     ok(readFile($fileNewer) eq $fileNewerContent, "$title: \$fileNewer should be unchanged");
332     unlink($fileMine, $fileOlder, $fileNewer);