Mailing-List:	contact cygwin-developers-help AT cygwin DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-developers-subscribe AT cygwin DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin-developers/>
List-Post:	<mailto:cygwin-developers AT cygwin DOT com>
List-Help:	<mailto:cygwin-developers-help AT cygwin DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-developers-owner AT cygwin DOT com
Delivered-To:	mailing list cygwin-developers AT cygwin DOT com
Message-ID:	<015801c260eb$095ebd20$6132bc3e@BABEL>
From:	"Conrad Scott" <Conrad DOT Scott AT dsl DOT pipex DOT com>
To:	"Nicholas Wourms" <nwourms AT netscape DOT net>
Cc:	<cygwin-developers AT cygwin DOT com>
References:	<00dd01c260e3$7dc35070$6132bc3e AT BABEL> <20020920203029 DOT GA29020 AT redhat DOT com> <010701c260e7$b7be0230$6132bc3e AT BABEL> <3D8B8D79 DOT 3090109 AT netscape DOT net>
Subject:	Re: Issue with cygwin_daemon merge
Date:	Fri, 20 Sep 2002 22:16:50 +0100
MIME-Version:	1.0
X-Priority:	3
X-MSMail-Priority:	Normal
X-MimeOLE:	Produced By Microsoft MimeOLE V6.00.2800.1106

"Nicholas Wourms" <nwourms AT netscape DOT net> wrote:
> Wouldn't it just be easier to use "-x foo.h -x foe.h -x
> fum.h" type arguments with cvs diff to generate a patch
> without these headers?  Then you could adjust the includes
> in the source file(s) in a seperate checkin.

I assume you're referring to the original issue of how to merge the
branch into the HEAD?  But for that, there are changes to these very
headers too that I need to merge; and I'd also prefer to do the merge as
a single commit rather than in stages (this avoids leaving the
repository half-broken and also might make the history rather clearer
for those who follow on afterwards).

Cheers,

// Conrad

- Raw text -