203 bool Merge(const char* oldDir, const char* oldFile, const char* newDir, const char* newFile,   in Merge()  argument
209 …        sandboxBase, oldDir, oldFile, oldBase, oldDir, oldFile, newBase, newDir, newFile, outFile);  in Merge()
1148         const char* oldFile = oldFileStr.c_str();  in CompareDirs()  local
1159                         workingDir, oldFile);  in CompareDirs()
1186                     rename.append(oldFile);  in CompareDirs()
1188                         string newName = Find(oldFile);  in CompareDirs()
1208 …  fprintf(commandFile, "p4 integrate \"%s/%s/%s\" \"%s/%s/%s\"\n", sandboxCmd, workingDir, oldFile,  in CompareDirs()
1212 …                          fprintf(commandFile, "git mv \"%s/%s\" \"%s/%s\"\n", workingDir, oldFile,  in CompareDirs()
1219 …        sandboxCmd, renamedDir, renamed, oldCmd, workingDir, oldFile, newCmd, renamedDir, renamed);  in CompareDirs()
1220 …                       bool success = Merge(workingDir, oldFile, renamedDir, renamed, "/dev/null");  in CompareDirs()
1245 …                        fprintf(stderr, "*** Modified file deleted: %s/%s\n", workingDir, oldFile);  in CompareDirs()
1253                         sandboxCmd, workingDir, oldFile, sandboxCmd, workingDir, oldFile);  in CompareDirs()
1255                         sandboxCmd, workingDir, oldFile, sandboxCmd, workingDir, oldFile);  in CompareDirs()
1257 …                 fprintf(commandFile, "p4 delete \"%s/%s/%s\"\n", sandboxCmd, workingDir, oldFile);  in CompareDirs()
1259                     fprintf(commandFile, "git rm \"%s/%s\"\n", workingDir, oldFile);  in CompareDirs()
1261                     fprintf(commandFile, "rm \"%s/%s/%s\"\n", sandboxCmd, workingDir, oldFile);  in CompareDirs()
1268 …             fprintf(commandFile, "p4 delete \"%s/%s/%s/...\"\n", sandboxCmd, workingDir, oldFile);  in CompareDirs()
1270                     fprintf(commandFile, "git rm \"%s/%s/...\"\n", workingDir, oldFile);  in CompareDirs()
1272                     fprintf(commandFile, "rm \"%s/%s/%s/...\"\n", sandboxCmd, workingDir, oldFile);  in CompareDirs()
1274                     fprintf(stderr, "*** Directory deleted: %s/%s\n", workingDir, oldFile);  in CompareDirs()
1368 …, "*** %s/%s differs in the execute bit (may cause problems for perforce)\n", workingDir, oldFile);  in CompareDirs()
1374                     fprintf(commandFile, "p4 edit \"%s/%s/%s\"\n", sandboxCmd, workingDir, oldFile);  in CompareDirs()
1375                 bool oldSandboxDiff = CompareFiles(oldBase, sandboxBase, workingDir, oldFile);  in CompareDirs()
1378 …        sandboxCmd, workingDir, oldFile, oldCmd, workingDir, oldFile, newCmd, workingDir, oldFile);  in CompareDirs()
1379                     bool success = Merge(workingDir, oldFile);  in CompareDirs()
1381 						fprintf(stderr, "*** Manual merge required: %s/%s\n", workingDir, oldFile);  in CompareDirs()
1384 							sandboxCmd, workingDir, oldFile, sandboxCmd, workingDir, oldFile);  in CompareDirs()
1386 							sandboxCmd, workingDir, oldFile, sandboxCmd, workingDir, oldFile);  in CompareDirs()
1388 …        } else fprintf(commandFile, "cp \"%s/%s/%s\" \"%s/%s/%s\"\n", newCmd, workingDir, oldFile ,  in CompareDirs()
1389                     sandboxCmd, workingDir, oldFile);  in CompareDirs()
1391                     fprintf(commandFile, "git add \"%s/%s\"\n", workingDir, oldFile);  in CompareDirs()