[p4] Resolving changes to a deleted file?
Matthew.Janulewicz at cardinal.com
Wed Mar 23 12:08:37 PST 2005
My two cents.
If I'm understanding this correctly, you can just do the merge with
'enable baseless merges' turned on, then 'accept mine'. It'll basically
re-create the deleted file with your new one from the other branch.
Note that it creates a break in the history of that file, where it was
deleted then resurrected through an integration. It looks awkward and
non-intuitive when you need to continue integrating to/from that line.
A better solution might be to "un-delete" the file first, as outlined in
this tech note:
Then merge the file from the other branch into it. To me, this seems
cleaner, the history on the file doesn't look out of whack, and Perforce
will not hiccup (baseless merge) later on if you branch some more to/from
it. As an added bonus, there is an obvious point in the history of the
file where it was deleted and resurrected along the same branch.
On Wed, 23 Mar 2005 17:37:10 -0000, Robin Charlton <RCharlton at kelseus.com>
> I want to integrate changes between 2 files on different branches but
> the destination file no longer exists (as it has been renamed).
> It seems to me in this instance there are 2 options:
> 1) recreate the file
> 2) discard the change
>> From p4win only option 1 seems to be possible. However I want to
>> resolve the situation by discarding the change. (I can manually
>> recreate the change if necessary).
> How do I do this?
> Robin Charlton
> rcharlton at kelseus.com
More information about the perforce-user