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: <3D8B93D7.6050005@netscape.net>
Date: Fri, 20 Sep 2002 17:32:07 -0400
From: Nicholas Wourms <nwourms AT netscape DOT net>
User-Agent: Mozilla/5.0 (Windows; U; Win 9x 4.90; en-US; rv:1.0.1) Gecko/20020823 MultiZilla/v1.1.22
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Conrad Scott <Conrad DOT Scott AT dsl DOT pipex DOT com>
CC: cygwin-developers AT cygwin DOT com
Subject: Re: Issue with cygwin_daemon merge
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> <015801c260eb$095ebd20$6132bc3e AT BABEL>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Conrad Scott wrote:
> "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).
> 
Then temporarily move the offending headers to the Attic and 
then copy them to the target header names.  After you've 
done the MERGE, mv the old headers back into place and put 
the temporary ones into the Attic.  That'll be clean enough 
and won't break HEAD.

Cheers,
Nicholas