[p4] Propagating deleted files even if the file never existed inthe target location

[Peter Buckley]

I'm not sure if what you're looking for is supported by the tool (or any tool). 

To handle cases like this I've used a workaround of multi-level parentage. 

So where branch_a and branch_b are both children of main, any integrations between the two go through main first. Obviously this won't work if you're using main for active development. We had "holding" branches as the parents in these cases, that were only used to accomplish what you're trying to do. 

@1 Create file "mainline/foo"
@2 Integrate "mainline/..." to "branch_a/..." [creates branch_a/foo]
@3 Delete file "mainline/foo"
@4 Integrate "mainline/..." to "branch_b/..." [doesn't touch branch_b/foo] (why not??? You could have solved your problem here without this complex workaround.)
@5 Integrate "branch_a/..." to "mainline/..."
@6 Integrate "mainline/..." to "branch_b/..." [Thus propagating the changes from branch_a, and deleting branch_b/foo]

Thanks,
Peter

-----Original Message-----
From: Weeble <clockworksaint+p4 at gmail.com>

Date: Wed, 13 May 2009 14:38:54 
To: <perforce-user at perforce.com>
Subject: [p4] Propagating deleted files even if the file never existed in
	the target location


(Apologies if this is a repost, I think I sent it with the wrong "From:"
header and it seems to have disappeared into a black hole.)

I've seen this pop up a few times when we've had some awkward
integrations across branches. In this scenario:

@1 Create file "mainline/foo"
@2 Integrate "mainline/..." to "branch_a/..." [creates branch_a/foo]
@3 Delete file "mainline/foo"
@4 Integrate "mainline/..." to "branch_b/..." [doesn't touch branch_b/foo]
@5 Integrate "branch_a/..." to "branch_b/..." [creates branch_b/foo]

....we have the file "foo" in branch_b even though we previously
integrated from a version of mainline that included the deletion. The
file won't be deleted until the *next* integration from mainline.

Is there any general way to do step 4 in a way that means that step 5
will not attempt to introduce the file? In this case it seems like we
could first branch from mainline/foo at 2 to branch_b/foo, to introduce
the file, then integrate again from mainline/foo to branch_b/foo to
delete the file. However, that gets pretty messy to do if many files
have been deleted, possibly over several changelists. Is there any way
to say "propagate file deletions even if the file never existed in the
target location"?
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user