6 messages in com.perforce.perforce-userCan depots be merged?| From | Sent On | Attachments |
|---|---|---|
| Robe...@scrap.de | 31 Dec 1998 02:49 | |
| Nick...@nvidia.com | 31 Dec 1998 09:20 | |
| Robe...@scrap.de | 02 Jan 1999 02:37 | |
| Davi...@home.chat.net | 02 Jan 1999 09:15 | |
| Jona...@floorboard.com | 02 Jan 1999 09:31 | |
| Robe...@scrap.de | 03 Jan 1999 23:25 |
| Subject: | Can depots be merged? |
|---|---|
| From: | Jona...@floorboard.com (Jona...@floorboard.com) |
| Date: | 01/02/1999 09:31:27 AM |
| List: | com.perforce.perforce-user |
David Jeske wrote:
On Sat, Jan 02, 1999 at 11:38:18AM +0100, Robert M. Münch wrote:
Hi, but this works only of no filenames overlap. But I have the 'old' base in depot A, creating a new depot B, checking in the base I have on my workstation, alter it, and now I want to merge back the stuff I changed from depot B to depot A. Of course I have the same filenames in both depots. Any idea?
Why are you using a second depot to do this instead of a branch in the original depot?
Sounds like you should just do the same thing you did before. Pull out the latest version of your private stuff from depot B, and check it in to depot A. You are going to lose your change history, but if you wanted to keep it, you probably should have done this work on a branch in the original depot.
What David suggests is best, of course, but too late now. It shouldn't be impossible to write a perl script that reads the metadata in your private depot and prepares another script that will check in the exact same changes to the original depot.
--- Jon Biggar Floorboard Software jon at floorboard.com jon at biggar.org