15 messages in com.perforce.perforce-user[p4] Branching...
FromSent OnAttachments
Kimberly McClintock19 Nov 2001 09:54 
Jones, Bruce19 Nov 2001 10:34 
Kimberly McClintock19 Nov 2001 10:54 
Kjell Martin19 Nov 2001 10:54 
Jeff A. Bowles19 Nov 2001 12:07 
Stephen Vance19 Nov 2001 13:21 
Kimberly McClintock19 Nov 2001 14:08 
Peter Jaeckel19 Nov 2001 14:09 
Jones, Bruce19 Nov 2001 14:21 
Peter Jaeckel19 Nov 2001 14:35 
Stephen Vance19 Nov 2001 14:39 
Mike Castle19 Nov 2001 14:44 
Kjell Martin19 Nov 2001 14:52 
Stephen Vance19 Nov 2001 14:56 
Jeff A. Bowles19 Nov 2001 15:04 
Subject:[p4] Branching...
From:Peter Jaeckel (Pete@impress.com)
Date:11/19/2001 02:09:59 PM
List:com.perforce.perforce-user

Hm, why not just doing an integrate and a delete of the old tree? Due to bad experiences I am personally a very strongly against touching an applications underlying data structures.

-----Original Message----- From: Jones, Bruce [mailto:brjones at enterasys.com] Sent: Montag, 19. November 2001 19:35 To: 'Kimberly McClintock'; Perforce-User (E-mail) Subject: RE: [p4] Branching...

Some people are against checkpoint surgery, but I have used it successfully several times.

<Use at your own risk disclaimers here> We have used this method to move things around in the depot because of the same situation you mention. The way we did it is like this:

Take a checkpoint.

Create a sed script that replaces every instance of //depot/<filename> with //depot/<new subdir>/<filename>

Run sed on the checkpoint.

Create the directory /depot/<new subdir> in the Perforce root area

Move the all affected files from /depot to /depot/<new subdir>

Restore from the sed altered checkpoint.

The reason I like this is because this changes all references to the file, in changlists, branch specs, labels, whatever. Wherever there is a reference to the old location it gets changed to the new location, invisibly. It looks like things have always been in the new location. The only area that may be a problem is Makefiles or such that use the old paths.

Note we tested this on copies of the depot and checkpoints before doing it for real.

2nd Note, we did this before Perforce had the option to follow file history across branches. That may make integration a better option now. I still like surgery in some situations though.

Bruce

-----Original Message----- From: Kimberly McClintock [ mailto:kmcclintock at aegiscorp.com <mailto:kmcclintock at aegiscorp.com> ] Sent: Monday, November 19, 2001 10:55 AM To: Perforce-User (E-mail) Subject: [p4] Branching...

Hi all...

Question...

We have been using Perforce for about a year now & initially had a rule against branching so we started with our product in Depot, and added an additional Depot in the Spring when we began working on a new version of our product.

Now we are at the same juncture again, beginning a new version of our product. We would like, at this point, to start branching. I have some questions.

The first level directories below "Depot" contain product files. So, based on your examples, it looks like what we need is something like this: Depot/ProductName/ProductFiles and what we've got is: Depot/ProductFiles.

Can we add a level in there? The ProductName level? How will it affect the file histories? How will it affect QA jobs still outstanding?

Kimberly

_______________________________________________ Kimberly McClintock Aegis Analytical Corporation 1376 Miners Drive, Suite 106 Tel: 303-926-0317 x115 E-mail: kmcclintock at aegiscorp.com Web: http://www.aegiscorp.com <http://www.aegiscorp.com>

Manufacturing Informatics(R) for Process Improvement