Re: [p4] Problem branching a moved file: "The system cannot find the file specified"
Sambwise <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'Sambwise'. FWIW, given a normal integrate command like you described earlier: Quote > p4 integrate -b BranchB and assuming a normally moved file, this is what should happen under the covers: BranchA\Dir1\File1.txt is mapped to BranchB\Dir1\File1.txt. Since BranchA\Dir1\File1.txt#head is a move/delete, this pair of files is skipped, with the expectation that somewhere else in the branch spec there will be a matching move/add that will remap here. (If you attempt to integrate this file on its own, you will get an error about needing to integrate the matching move/add.) BranchA\Dir2\File1.txt is mapped to BranchB\Dir2\File1.txt, which does not yet exist. Since BranchA\Dir2\File1.txt was moved from BranchA\Dir1\File1.txt, the mapping is consulted for BranchA\Dir1\File1.txt. BranchB\Dir1\File1.txt is found to have common ancestry with BranchA\Dir2\File1.txt, so the integrate is remapped to use BranchB\Dir1\File1.txt as the target, and to schedule a move resolve to the originally mapped path ( BranchB\Dir2\File1.txt). When the resolve is performed, BranchB\Dir1\File1.txt is moved to BranchB\Dir2\File1.txt, with the final result that both files are open (for move/delete and move/add respectively). Note that in that very first step, we skip the Dir1 source file because it's a move/delete -- that's why I suspect that either a) there was another deleted file submitted on top of that file or B) there was an initial attempt at integrating this file with one of the deprecated flags (which forces move/deletes to be treated as normal deletes, which really gums up the works). -- Please click here to see the post in its original format: http://forums.perforce.com/index.php?/topic/5604-problem-branching-a-moved-file-the-system-cannot-find-the-file-specified _______________________________________________ perforce-user mailing list - [email protected] http://maillist.perforce.com/mailman/listinfo/perforce-user