[p4] I cut down the tree while everyone stood on the branches.

David Faison dfaison at photon.com
Thu Jun 15 08:06:58 PDT 2006


The delete operation (as opposed to "obliterate") only puts an entry at
the tip of the archive, marking it as deleted. 

This is why your history is really still there. This also means users
can simply check their code back in on top of the delete (they will
however, have to perform an 'add' operation to do so). 

Then you will have to reintegrate their changes from the old location to
the new one - using basically the same command (p4 integrate) as was
issued under the hood when you did your 'rename'.

Read the help on the "p4 integrate" command - you case is somewhat
special and will require the switch to ignore source files that have
been deleted then re-added (which I believe is -Di).

David Faison
Photon Research Associates



-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Darryl G.
Wright
Sent: Thursday, June 15, 2006 8:47 AM
To: perforce-user at perforce.com
Subject: [p4] I cut down the tree while everyone stood on the branches.

Thanks for your answers yesterday regarding my rename issue. I
successfully 
renamed the entire folder which resulted in a integration followed by a 
delete of the old folder. As it turns out, several users still had files

checked out in the old folder under the old name. Are they totally
fubar'ed 
now? Is there any way they can still check their changes back in? It
sounds 
crazy that it would let me delete a folder while people still had files 
checked out. But crazier still would be if it didn't allow them to check

them back in.

Thanks.

Darryl

-- 
Darryl G. Wright
Technical Lead
HB Studios

http://www.hb-studios.com
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user



More information about the perforce-user mailing list