Lines Matching refs:file

139     for my $file (@changeLogFiles) {
141             fixOneMergedChangeLog($file);
143             resolveChangeLog($file);
171     my ($file) = @_;
176     if (-e $file && -e "$file.orig" && -e "$file.rej") {
177         return ("$file.rej", "$file.orig", $file);
181         open STAT, "-|", $SVN, "status", $file or die $!;
185             print STDERR "WARNING: ${file} is not in a conflicted state.\n" if $printWarnings;
189         $fileMine = "${file}.mine" if -e "${file}.mine";
192         open INFO, "-|", $SVN, "info", $file or die $!;
200         $fileNewer = "${file}.r${currentRevision}" if -e "${file}.r${currentRevision}";
202         my @matchingFiles = grep { $_ ne $fileNewer } glob("${file}.r[0-9][0-9]*");
204             print STDERR "WARNING: Too many conflict files exist for ${file}!\n" if $printWarnings;
211         open GIT, "-|", $GIT, "ls-files", "--unmerged", $file or die $!;
216                 $fileOlder = "${file}.BASE.$$";
219                 $fileNewer = "${file}.LOCAL.$$";
222                 $fileMine = "${file}.REMOTE.$$";
227             system("$GIT cat-file blob :${stage}:${gitPrefix}${file} > $outputFile");
236         print STDERR "WARNING: ${file} does not need merging.\n" if $printWarnings;
238         print STDERR "WARNING: ${file} is missing some conflict files.\n" if $printWarnings;
248     my $file = File::Spec->catfile($_[0], "ChangeLog");
249     return $file if -d $_[0] and -e $file;
271             my $file;
274                 $file = $2;
277                 $file = $2;
280                 $file = findChangeLog(normalizePath($file));
281                 push @results, $file if $file;
287                 my $file = findChangeLog(normalizePath($2));
288                 push @results, $file if $file;
326     my $file = shift;
332         open GIT, "-|", $GIT, "diff", ($ENV{GIT_COMMIT} || "HEAD") . "^", $file or die $!;
338     system($GIT, "checkout", $ENV{MAPPED_PREVIOUS_COMMIT} || "HEAD^", $file);
368         open FILE, "<", $file or die $!;
375         open(PATCH, "| patch -p1 $file > " . File::Spec->devnull()) or die $!;
380         system($GIT, "add", $file);
383         showStatus($file, 1);
386         system($GIT, "checkout", $ENV{GIT_COMMIT} || "HEAD", $file);
388 …print STDERR "WARNING: Last change to ${file} could not be fixed and re-merged.\n" if $printWarnin…
424         my $file = findChangeLog(canonicalRelativePath(File::Spec->catfile($baseDir, $ARGV[$i])));
425         if (defined $file) {
427             push @results, $file;
438     my ($file) = @_;
440     my ($fileMine, $fileOlder, $fileNewer) = conflictFiles($file);
445         if ($file ne $fileNewer) {
446             unlink($file);
447             rename($fileNewer, $file) or die $!;
450         resolveConflict($file);
451         showStatus($file, 1);
453         showStatus($file);
454         print STDERR "WARNING: ${file} could not be merged using fuzz level 3.\n" if $printWarnings;
461     my ($file) = @_;
464         system($SVN, "resolved", $file);
467         system($GIT, "add", $file);
476     my ($file, $isConflictResolved) = @_;
479         system($SVN, "status", $file);
483         system($GIT, "diff", @args, $file);