[p4] integrating when destination has been deleted

[Sam Roberts]

On Wed, Aug 30, 2006 at 03:54:48PM -0400, steve at vance.com wrote:
> I would argue that since deleted revisions are still revisions in the
> file's history, that Perforce could, without major changes, implement
> accept theirs/yours semantics around deleted and added revisions. It
> doesn't require knowledge of directories to accomplish and would complete
> the functionality around integration.

I think its more complicated than that. perforce doesn't know the
difference between a rename and a delete. If merging between two
branches that never move files, you don't need the branch spec, but
if files move (and the existence of deleted files suggests a
reorganization), then it's not enough to throw diffs from the donor
branch away and accept the target file doesn't exist in the target
branch, those diffs need to be applied to the renamed file. All file
renames have to be tracked by recording them in the branch spec(s).

An scm doesn't really need directory revisioning for that, but it would
need to know the difference between a rename, a copy, and a merge.

Sam