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:	<017d01c260f1$dd4337f0$6132bc3e@BABEL>
From:	"Conrad Scott" <Conrad DOT Scott AT dsl DOT pipex DOT com>
To:	"Robert Collins" <rbcollins AT cygwin DOT com>
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> <015801c260eb$095ebd20$6132bc3e AT BABEL> <1032558123 DOT 10933 DOT 79 DOT camel AT lifelesswks>
Subject:	Re: Issue with cygwin_daemon merge
Date:	Fri, 20 Sep 2002 23:05:43 +0100
MIME-Version:	1.0
X-Priority:	3
X-MSMail-Priority:	Normal
X-MimeOLE:	Produced By Microsoft MimeOLE V6.00.2800.1106

"Robert Collins" <rbcollins AT cygwin DOT com> wrote:
> CVS is only atomic on single directories. So changes
> to include/sys and include/cygwin will not be identifiable
> as a single commit anyway.

Main point accepted but it would show up as a single action in the
cygwin-cvs mail archives.

> Secondly, as long as you are quick about whatever you're doing,
> a -D based diff will get the full set of changes.

True again but speed is something I'm not sure I can guarantee: I get
all paranoid at check-in time and everything seems to take forever.

> Lastly, I don't understand the problem - you want HEAD to look
> like cygserver right?
[snip]
> That should handle file renames and deletes seamlessly.

It's now very clear that it's me who doesn't understand the problem :-)

Okay, so all I need to do is move the files around in the branch to the
suggested arrangement and then the patch will (by the magic of cvs) sort
it all out for me.  Glorious news and easier than I was assuming it
would be.

Thanks Robert, I'll get on to this now.

// Conrad

- Raw text -