[p4] Accept Merge failure - Richard Ramos - com.perforce.perforce-user

2 messages in com.perforce.perforce-user[p4] Accept Merge failure

From	Sent On	Attachments
Richard Ramos	10 Sep 2003 14:38
Richard Ramos	10 Sep 2003 15:22

Subject:	[p4] Accept Merge failure
From:	Richard Ramos (rra...@elitecorpusa.com)
Date:	09/10/2003 03:22:09 PM
List:	com.perforce.perforce-user

I think I figured out what to do. Perforce let me re-resolve so I can change the results if I want to and I can also accept my local copy. All available within the resolve dialog box.

I would guess that what happened was that the server doesn't like to see multiple clients from the same machine.

Rich

-----Original Message----- From: perf...@perforce.com [mailto:perforce-user-admin at perforce.com] On Behalf Of Richard Ramos Sent: Wednesday, September 10, 2003 5:39 PM To: perforce-user at perforce.com Subject: [p4] Accept Merge failure

I'm integrating new 3rd party code from the 3rd party branch onto my development branch. I did the integ command and I was completing the resolve/merge which had lot's of conflicts. While I was resolving (I'm using the windows GUI) I wanted to go back into perforce to look at some revision history but the p4 window is busy. I launched a new window and when it asked to open the old window I answered NO and a new perforce session openned up. Very cool so far.

When I finished merging I pressed the "Accept merged file" button and I got a TCP error which left the file's icon with the exclamation point on it. According to the online help: A yellow exclamation point indicates that your client workspace contains an older revision of the file (not the head revision).

I think, however that the file on my client contains the merged output that I want. So I have the following questions: 1) what happened? 2) Do I have to backup the good file and trick perforce into thinking I succeeded in a resolve?

Thanks.

Richard Ramos Elite Communications Inc. voice: 732-817-1600 x14 fax: 732-817-1601