7 messages in com.perforce.perforce-userHow to handle such a merge best?| From | Sent On | Attachments |
|---|---|---|
| Robe...@SCRAP.de | 28 May 1998 10:27 | |
| Robe...@SCRAP.de | 29 May 1998 03:23 | |
| Nave...@vinayak.engr.sgi.com | 29 May 1998 10:11 | |
| Robe...@SCRAP.de | 29 May 1998 10:19 | |
| Davi...@home.chat.net | 29 May 1998 13:51 | |
| Robe...@SCRAP.de | 29 May 1998 22:55 | |
| Robe...@SCRAP.de | 30 May 1998 03:38 |
| Subject: | How to handle such a merge best? |
|---|---|
| From: | Robe...@SCRAP.de (=?is...@SCRAP.de) |
| Date: | 05/29/1998 03:23:51 AM |
| List: | com.perforce.perforce-user |
-----Original Message----- From: Jeff Bowles [SMTP:jeff_bowles at hotmail.com] Sent: Friday, May 29, 1998 9:06 AM To: Robert.M.Muench at SCRAP.de Subject: Re: How to handle such a merge best?
Make p4 do all the work for you. With a little planning, it will be very helpful.
[Robert M. Muench] If possible of course ;-))
Let's assume you have the ORIGINAL version 1.0 of the software checked in, and you've since made loads of changes that are checked in as later revisions of the software. (If this isn't the case, it might be best see what parts of this model might still be used.)
[Robert M. Muench] Hm... I just saw a glitch on our used model but maybe it can be fixed. I used the original sources (which are not checked in), made all the changes and restructuring to the files, and checked this changed stuff in as our main-source-line. I still have the original sources I made the changes from. So would it be possible to still check them in, integrate the changes I have made so far? BTW: How is file-renaming handled? Do I have to map each file to the renamed file or can I use wildcards like *.cc *.cpp?
Make a branch based on revision #1 of each of the original files. Copy your new version 2.0 of the distributed software to this branch, editing/submitting it to the depot.
[Robert M. Muench] Just to be sure I understand everything right. Making the branch will copy the files from the depot to my client. There I open every file for editing, copy the new files I have to the correct places with the correct names, add all missing files, find all deleted files (how?). Than I submit all this.
So now you have:
ORIGINAL (1.0) -------------> localmods | | V NEW-STUFF (2.0)
If you want to integrate the 2.0 changes in, you'd just run a "p4 integrate -b <<nameofbranch>> -r" and select which things you wanted...
[Robert M. Muench] After the steps I mentioned above, I just have to use the integate command. How do I have to setup my client for all this, especially to reflect the filename changes we made? Thanks for the help so far.
Robert M. Muench SCRAP EDV-Anlagen GmbH, Karlsruhe, Germany ==> ask for PGP public-key <==
When do you want to reboot today?