Lines Matching refs:renamed
1205 char* renamed = (char*) strrchr(renamedDir, '/');
1206 *renamed++ = '\0'; // splits rename into two strings
1209 sandboxCmd, renamedDir, renamed);
1210 fprintf(commandFile, "p4 resolve \"%s/%s/%s\"\n", sandboxCmd, renamedDir, renamed);
1213 renamedDir, renamed);
1217 fprintf(commandFile, "p4 open \"%s/%s/%s\"\n", sandboxCmd, renamedDir, renamed);
1219 sandboxCmd, renamedDir, renamed, oldCmd, workingDir, oldFile, newCmd, renamedDir, renamed);
1220 bool success = Merge(workingDir, oldFile, renamedDir, renamed, "/dev/null");
1222 fprintf(stderr, "*** Manual merge required: %s/%s\n", renamedDir, renamed);
1226 sandboxCmd, renamedDir, renamed, sandboxCmd, renamedDir, renamed);
1228 sandboxCmd, renamedDir, renamed, sandboxCmd, renamedDir, renamed);
1231 fprintf(commandFile, "git add \"%s/%s\"\n", renamedDir, renamed);
1233 bool oldNewDiff = CompareFiles(oldBase, workingDir, oldList, newBase, renamedDir, renamed);
1236 fprintf(oopsFile, "p4 open \"%s/%s/%s\"\n", sandboxCmd, renamedDir, renamed);
1238 newCmd, renamedDir, renamed, sandboxCmd, renamedDir, renamed);
1240 fprintf(oopsFile, "git add \"%s/%s\"\n", renamedDir, renamed);
