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
Subject: Re: Issue with cygwin_daemon merge
From: Robert Collins <rbcollins AT cygwin DOT com>
To: Conrad Scott <Conrad DOT Scott AT dsl DOT pipex DOT com>
Cc: Nicholas Wourms <nwourms AT netscape DOT net>, cygwin-developers AT cygwin DOT com
In-Reply-To: <015801c260eb$095ebd20$6132bc3e@BABEL>
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: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature";
	boundary="=-WpM3y8zSKBG0XoeuIM2R"
Date: 21 Sep 2002 07:42:02 +1000
Message-Id: <1032558123.10933.79.camel@lifelesswks>
Mime-Version: 1.0


--=-WpM3y8zSKBG0XoeuIM2R
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

On Sat, 2002-09-21 at 07:16, 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.
>=20
> 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).

Conrad,
CVS is only atomic on single directories. So changes to include/sys and
include/cygwin will not be identifiable as a single commit anyway.
Secondly, as long as you are quick abou whatever you're doing, a -D
based diff will get the full set of changes.

Lastly, I don't understand the problem - you want HEAD to look like
cygserver right?
run=20
cd cygserver-source-dir
cvsmkpatch HEAD > mypatch
vim mypatch and review
cd cygwin-HEAD-dir
patch -p0 < mypatch
cvs -z3 ci=20

That should handle file renames and deletes seamlessly.

Rob


--=-WpM3y8zSKBG0XoeuIM2R
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQA9i5YqI5+kQ8LJcoIRArhTAKDIAfiDrEo+FOeYlQcG88CwgvZcxgCgqoZF
OjRUgQW6MycuwCA+TGk6x9k=
=xIDd
-----END PGP SIGNATURE-----

--=-WpM3y8zSKBG0XoeuIM2R--