3 messages in com.perforce.perforce-userAW: Visual Merge and UNIX MERGES| From | Sent On | Attachments |
|---|---|---|
| Jeff...@mercury.xionics.com | 14 Oct 1997 07:30 | |
| Rich...@netapp.com | 14 Oct 1997 07:55 | |
| Brad...@email.mot.comBrad_Appleton-GBDA001 | 14 Oct 1997 09:35 |
| Subject: | AW: Visual Merge and UNIX MERGES |
|---|---|
| From: | Rich...@netapp.com (Rich...@netapp.com) |
| Date: | 10/14/1997 07:55:02 AM |
| List: | com.perforce.perforce-user |
I have not found it easy to find Unix merge tools either. The only two I have found that are not included with a source control system are MergeRight (which crashed under SunOS when doing cut and paste with standard X-windows middle button) and emacs/xemacs ediff mode. There is of course the command line text based tool called merge but that is not great.
We also use an X-based program called filemerge from Sun - it comes with their "TeamWare" CM product (but I believe it may also come bundled with certain other Sun developement SW packages. Don't know if you can buy it separately).
Also, I've rigged up some glue that allows a "p4 resolve" running on an xterm on a Unix host to start up an instance of a Windows-based merge editor (VdifMrg, but you could do the same thing with others, as long as they support a command line interface) back on the user's PC.
I.e., I'm sitting in front of my desktop NT PC, which is running an X server, logged in to the Unix systems via xterm. The NT and Unix systems have shared access to our multiprotocol (CIFS/NFS) file server, where my source tree is. When I tell "p4 resolve" to run the merge editor, it runs a script on the Unix host that rsh'es off to my NT machine (running a freeware rshd), starting the merge editor on the appropriate files. It's convoluted, but is seems to work well, and in principal could be used with any NT-based merge edit tool.