[p4] Integrating deleted files
Leonard, William C
bill.leonard at intergraph.com
Mon Oct 6 06:29:35 PDT 2008
Thanks for the reply, but this only helps in integrating from Release1.0
to Release2.1. When integrating from Release1.1 to Release2.1, Perforce
does NOTHING with file A. So even if they made the change you are
suggesting, that doesn't help this situation. I believe the problem
arises because the file has never existed in Release1.1. There is no
deleted revision to propagate. Removing the mapping of this file from
the branch spec doesn't help either, because I WANT the file integrated.
I want to propagate the deletion to Release2.1. But it doesn't happen.
From: Stephen Vance [mailto:steve at vance.com]
Sent: Thursday, October 02, 2008 5:38 PM
To: Leonard, William C
Cc: perforce-user at perforce.com
Subject: Re: [p4] Integrating deleted files
Hi, Bill --
There are two things you can do.
The first and official thing is to modify your branch specs whenever you
delete a file to exclude that file from the mapping. Laura's book goes
into a lot of detail on the mechanics of this and several variations in
the sections on structural changes. You can use triggers to flag when
If you agree with many of us that this is an ugly hack with low
maintainability, contact support and insist that your voice is added to
the requests for "resolvable deletes" that have been submitted from many
customers. With what I know of the schema, this shouldn't be difficult.
They have already figured out the hard part in figuring out whether they
should be propagated, and the mechanism is present in the schema to
record the result. I don't understand why we don't have "accept
yours/accept theirs" ability with integrated deletes.
Leonard, William C wrote:
> I wonder if the community has some suggestions on how to handle the
> following scenario.
> You have a Main branch, from which you branch a Release1.0 and
> Release2.0 branches. Release2.0 is an evolutionary branch, with lots
> changes. Release1.0 is a maintenance branch for support and minor
> enhancements while you wait for customers to upgrade to 2.0. The Main
> branch contains all the changes from both of these branches.
> Now, Release2.1 is branched from Release2.0 to support your 2.0
> customers with some fixes and enhancements.
> Meanwhile, file A is deleted in the Release1.0 branch. (Yes, I know
> that's to be avoided, but it does happen occasionally. In one
> it caused a build problem.) Then, Release1.1 is branched from
> Release1.0 to support the 1.0 customers with fixes and enhancements.
> the situation now is that Release1.0 has a deleted revision of file A;
> Release1.1 doesn't have file A at all; Release2.1 has file A still
> active (not deleted).
> Now we integrate the changes from Release1.1 to Release2.1 to pick up
> the fixes/enhancements in 1.1. But file A is not deleted in
> because Release1.1 has no record at all of that file. (At least,
> what I surmise happened.)
> We only discovered this situation sort of by accident, but it turns
> to have happened several times now that we know to look for it. Any
> advice on how this should be handled so that it doesn't happen in the
> future? It's pretty hard to detect after the fact, so I'd rather
> prevent it to begin with if possible.
> William Leonard
> Executive Manager
> Security, Government & Infrastructure (SG&I) Division
> Intergraph Corporation
> P.O. Box 6695, Huntsville, AL 35824-0695 USA
> P 1.256.730.8167 F 1.256.730.1717
> bill.leonard at intergraph.com <mailto:firstname.lastname at intergraph.com>
> perforce-user mailing list - perforce-user at perforce.com
More information about the perforce-user