On Thu, 16 Sep 1999, Steve Cogorno wrote: :->Basically, I would like to get an editable diff of the file that looks like :->the resolve output. Example: :-> :->>>>> ORIGINAL :-><e-i-c gi="caution-note.fmt"><?Pub Lcl _id="f1757"><?Pub Dtl> :->==== YOURS :-><e-i-c gi="caution-note.fmt"><?Pub Lcl _id="f1757"> :-><<<<

It wouldn't solve your problem, but an option to get that output from diff or diff2 would be a nice enhancement. Well - it would make your problem easier to deal with.

:->I want to be able to review the changes and reject some of them before :->submitting the files. I can do this with diff, but it isn't very :->convenient, because I can't edit the merged files. :-> :->Before you say "Well don't change the file if you don't want to keep the :->changes" let me explain. These files are actually edited through a GUI, and :->the tool inserts line changes that are irrelevent. Sometimes the line :->breaking will change, or a "<?Pub Dtl>" will get added. These don't change :->the meaning of the files at all. But what it does do is cause more manual :->conflicts later on when I have to integrate the changes into another branch.

Are these changes random, so that dealing with them once won't solve the problem?

When you say the word "review", I tend to think of two branches - one that's edited and then reviewed, and a second that the reviewed versions are integrated into after they are approved. Would something like that work?

<mike