26 messages in com.perforce.perforce-user[p4] Moving a file/etc.| From | Sent On | Attachments |
|---|---|---|
| Tim Sohacki | 01 Nov 2001 07:55 | |
| Kjell Martin | 01 Nov 2001 08:18 | |
| Arnt Gulbrandsen | 01 Nov 2001 08:34 | |
| Karl Philipp | 01 Nov 2001 08:59 | |
| Blum, Robert | 01 Nov 2001 09:40 | |
| Robert Lin | 01 Nov 2001 09:44 | |
| Robert Prentice | 01 Nov 2001 10:42 | |
| Karl Philipp | 01 Nov 2001 10:45 | |
| Blum, Robert | 01 Nov 2001 10:47 | |
| Steve Bennett | 01 Nov 2001 10:49 | |
| Todd Short | 01 Nov 2001 11:20 | |
| Jeff A. Bowles | 01 Nov 2001 12:25 | |
| Todd Short | 01 Nov 2001 12:32 | |
| Arnt Gulbrandsen | 01 Nov 2001 14:14 | |
| Greg Whitfield | 02 Nov 2001 00:58 | |
| Stephen Vance | 03 Nov 2001 11:28 | |
| sandy currier | 04 Nov 2001 01:53 | |
| Stephen Vance | 04 Nov 2001 08:07 | |
| Robert Prentice | 05 Nov 2001 09:31 | |
| Blum, Robert | 05 Nov 2001 10:57 | |
| san...@releng.com | 05 Nov 2001 11:34 | |
| Arnt Gulbrandsen | 05 Nov 2001 11:36 | |
| Rick Macdonald | 05 Nov 2001 11:49 | |
| Stephen Vance | 05 Nov 2001 19:27 | |
| Chuck Karish | 06 Nov 2001 08:35 | |
| Steve Bennett | 06 Nov 2001 11:16 |
| Subject: | [p4] Moving a file/etc. |
|---|---|
| From: | Todd Short (tsh...@cisco.com) |
| Date: | 11/01/2001 12:32:27 PM |
| List: | com.perforce.perforce-user |
I did just that.
I integraed a file to a new name. I then opened it for edit again, and then submitted it. Here is the filelog -i:
Branch then edit: E:\test-root\phoenix\software\main\auth>p4 filelog -i authapi2.c //depot/phoenix/software/main/auth/authapi2.c ... #1 change 36 add on 2001/11/01 by root at root (text) 'Fixes: NoCSC Port: None text ' ... ... branch from //depot/phoenix/software/main/auth/authapi.c#1 //depot/phoenix/software/main/auth/authapi.c ... #1 change 1 add on 2001/02/08 by perforce at tshort-laptop (text) 'New Feature: EVERYTHING ' ... ... add into //depot/phoenix/software/main/auth/authapi2.c#1
Just branch: E:\test-root\phoenix\software\main\auth>p4 filelog -i authapi3.c //depot/phoenix/software/main/auth/authapi3.c ... #1 change 37 branch on 2001/11/01 by root at root (text) 'Fixes: NoCSC Port: No ne text ' ... ... branch from //depot/phoenix/software/main/auth/authapi.c#1 //depot/phoenix/software/main/auth/authapi.c ... #1 change 1 add on 2001/02/08 by perforce at tshort-laptop (text) 'New Feature: EVERYTHING ' ... ... add into //depot/phoenix/software/main/auth/authapi2.c#1 ... ... branch into //depot/phoenix/software/main/auth/authapi3.c#1
Note that the action is 'add' rather than 'branch'. They both have the "branch from" line in the history. The original file has the "<add|branch> into" line in its history, so you know where the file went. This was done using 2001.1.
-- -Todd Short // tshort at cisco.com // "One if by land, two if by sea, three if by the Internet."
-----Original Message----- From: perforce-user-admin at perforce.com [mailto:perforce-user-admin at perforce.com]On Behalf Of Blum, Robert Sent: Thursday, November 01, 2001 1:47 PM To: 'Karl Philipp'; Mailinglist Perforce User Subject: RE: [p4] Moving a file/etc.
Maybe I'm not using it correctly, but AFAIK integrate and edit in the same changelist breaks history. Anybody out there care to enlighten on the subject?
Bye, Robert
_______________________________________________ perforce-user mailing list - perforce-user at perforce.com http://maillist.perforce.com/mailman/listinfo/perforce-user