Searched refs:renamedDir (Results 1 – 1 of 1) sorted by relevance
| /external/webkit/Tools/android/webkitmerge/ |
| D | webkitmerge.cpp | 1200 const char* renamedDir = workingDir; in CompareDirs() local
1204 renamedDir = newName.c_str(); in CompareDirs()
1205 char* renamed = (char*) strrchr(renamedDir, '/'); in CompareDirs()
1209 sandboxCmd, renamedDir, renamed); in CompareDirs()
1210 … fprintf(commandFile, "p4 resolve \"%s/%s/%s\"\n", sandboxCmd, renamedDir, renamed); in CompareDirs()
1213 renamedDir, renamed); in CompareDirs()
1217 … fprintf(commandFile, "p4 open \"%s/%s/%s\"\n", sandboxCmd, renamedDir, renamed); 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()
1222 fprintf(stderr, "*** Manual merge required: %s/%s\n", renamedDir, renamed); in CompareDirs()
[all …]
|