14 messages in com.perforce.perforce-userHow to integrate .diff files?
FromSent OnAttachments
Robe...@SCRAP.de25 Nov 1998 23:51 
Raym...@orion.no26 Nov 1998 01:42 
Tim....@westmerchant.co.ukTim.Meadowcroft26 Nov 1998 02:37 
WesP...@softweyr.com26 Nov 1998 10:34 
Jere...@sirius.com26 Nov 1998 22:47 
Robe...@SCRAP.de27 Nov 1998 00:31 
Jere...@sirius.com27 Nov 1998 10:22 
Robe...@SCRAP.de28 Nov 1998 07:07 
Jere...@sirius.com28 Nov 1998 14:46 
Robe...@SCRAP.de29 Nov 1998 04:33 
Robe...@SCRAP.de30 Nov 1998 10:05 
Jere...@sirius.com30 Nov 1998 23:20 
Robe...@SCRAP.de01 Dec 1998 05:20 
Jere...@sirius.com01 Dec 1998 09:55 
Subject:How to integrate .diff files?
From:WesP...@softweyr.com (WesP@softweyr.com)
Date:11/26/1998 10:34:27 AM
List:com.perforce.perforce-user

Tim.Meadowcroft at westmerchant.co.uk wrote:

Robert M. Münch writes:

Hi, does someone know how I can merge changes given by a .diff file into my sources? The file .diff wasn't made by Perforce but by the normal Unix diff tool.

I'd guess something like

p4 edit filetobepatched patch < patchfile.diff

I.e, you need the patch utility...

If you're an emacs user (including emacs on NT), the superb Ediff can do this interactively...

And if you're not currently an Emacs user, ediff is reason enough to become one. Especially if you work in chaos like I do, and have to integrate the same fix into 4, 5, 6 different "builds" at different times. Look at the ediff "3diff" apropos entries.

I won't use anything else for diff'ing

Me too. Discerning minds think alike, eh? ;^)

--- "Where am I, and what am I doing in this handbasket?"

Wes Peters Softweyr LLC http://www.softweyr.com/~softweyr wes at softweyr.com