From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on polar.synack.me X-Spam-Level: X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,INVALID_MSGID autolearn=no autolearn_force=no version=3.4.4 X-Google-Language: ENGLISH,ASCII-7-bit X-Google-Thread: 103376,2b070d1861357fa0 X-Google-Attributes: gid103376,public From: mab@dst17.wdl.loral.com (Mark A Biggar) Subject: Re: Configuration Management ... on Unix Date: 1996/06/04 Message-ID: <4ovved$nc1@wdl1.wdl.loral.com>#1/1 X-Deja-AN: 158312406 references: <9606032056.AA12276@most> organization: Loral Western Development Labs newsgroups: comp.lang.ada Date: 1996-06-04T00:00:00+00:00 List-Id: In article <9606032056.AA12276@most> "W. Wesley Groleau (Wes)" writes: >> A method of merging deltas was described some years ago. >An interactive method is built into the 'sdiff' command in many Unices. >Look for -o in the man page >> It sounded to me like a really bad idea then, and does now. >> The assumption here is that changes that affect different lines are >> independent. >The additional problem is that most difference algorithms get hopelessly >confused when the changes are more than trivial. (e.g., sections relocated >or blank lines inserted). Also see the program Patch, available via the GNU distirbution. It will take almost any form of diff output and make the corresponding changes. It even handles initial leading white space differences and make a good stab a patching file that have other non-conflicting changes. -- Mark BIggar mab@wdl.loral.com