Date: Mon, 26 Apr 93 09:59:14 EDT
From: DJ Delorie <dj AT ctron DOT com>
To: peprbv AT cfa0 DOT harvard DOT edu
Cc: djgpp AT sun DOT soe DOT clarkson DOT edu
Subject: Re: managing diff's

> How do people handle multiple, overlapping changes to GO32?  I have two sets
> of changes to submit: one adds support for FCB's in exphdlr.c, the other
> allows compiling with Borland C 3.1 with no warnings (when all warnings are
> enabled).  I've figured out how to run diff, but it isn't a program I normally
> use.  My changes overlap, and the only way I see to separate them is to
> edit the difference file by hand.  This seems likely to generate errors, and
> I don't know how to verify the results.

In cases like this, it's probably acceptable to post the two together,
since BC3.1 fixes aren't really "features".  I usually check out the
diffs manually and apply them very carefully when I get them, so you
don't worry about errors from that part of the process (but I do, of
course).

What you can do is insert a line just before each diff chunk (patch
ignores them) stating what each chunk is for, so that I can separate
them myself if I need to.  Example:

Previous:

*** foo Mon Apr 26 09:57:37 1993
--- foo2        Mon Apr 26 09:57:37 1993
***************
*** 1 ****
! total 8711
--- 1 ----
! total 8714
***************
*** 17 ****
! -rw-r--r--  1 dj              0 Apr 26 09:57 foo
--- 17,18 ----
! -rw-r--r--  1 dj           2177 Apr 26 09:57 foo
! -rw-r--r--  1 dj              0 Apr 26 09:57 foo2

New:

*** foo Mon Apr 26 09:57:37 1993
--- foo2        Mon Apr 26 09:57:37 1993

This is the header part
***************
*** 1 ****
! total 8711
--- 1 ----
! total 8714

These are the actual changes
***************
*** 17 ****
! -rw-r--r--  1 dj              0 Apr 26 09:57 foo
--- 17,18 ----
! -rw-r--r--  1 dj           2177 Apr 26 09:57 foo
! -rw-r--r--  1 dj              0 Apr 26 09:57 foo2