4 messages in com.perforce.perforce-user[p4] P4MERGE| From | Sent On | Attachments |
|---|---|---|
| Jeffrey Jensen | 11 Sep 2002 14:38 | |
| Jeffrey Jensen | 12 Sep 2002 06:55 | |
| Gabriel Prat Masramon | 13 Sep 2002 00:52 | |
| Timothy Writer | 16 Sep 2002 13:58 |
| Subject: | [p4] P4MERGE |
|---|---|
| From: | Jeffrey Jensen (JJEN...@agribank.com) |
| Date: | 09/12/2002 06:55:19 AM |
| List: | com.perforce.perforce-user |
Hi Robert,
Thanks for the reply.
No, that does not help! I have seen that info and other Perforce doc info. The problem is not the awareness of P4MERGE or MERGE, etc.
The problem is what to set P4MERGE to. A question I have, and is what I tried to ask to the list, is that the doc here:
http://www.perforce.com/perforce/products/merge.html
says Perforce Command-line1 (Perforce Software) Perforce's built-in "p4 resolve" command provides a merge tool for the console environment.
I interpret "p4 resolve command provides a merge tool" as I can set P4MERGE to something special and use a Perforce merge program. Perhaps that info only applies to Windows, as their examples show, and not to Unix. If so, that is a documentation vagueness and I will submit a request for change to support.
"Robert Cowham" <robert at vaccaperna.co.uk> 09/11/02 05:22PM >>>
Check out:
http://www.perforce.com/perforce/doc.021/manuals/cmdref/env.P4MERGE.html#104
0647
Does that help?
Robert
-----Original Message----- From: perforce-user-admin at perforce.com [mailto:perforce-user-admin at perforce.com]On Behalf Of Jeffrey Jensen Sent: 11 September 2002 22:39 To: perforce-user at perforce.com Subject: [p4] P4MERGE
Hi,
We have been doing successful merges with the P4WinMerge program. We have just started using the Unix command line client, and need to do merges from there.
During a resolve, trying the merge option gives the error that P4MERGE is not set. This is true, and we do not know what to set it to...
This Perforce page: http://www.perforce.com/perforce/products/merge.html
says Perforce Command-line1 (Perforce Software) Perforce's built-in "p4 resolve" command provides a merge tool for the console environment.
Can anyone tell me what to set P4MERGE to to get that to work?
Or is that a misleading statement and a non-Perforce tool is required for the merge?
_______________________________________________ perforce-user mailing list - perforce-user at perforce.com http://maillist.perforce.com/mailman/listinfo/perforce-user