Re: Issue with cygwin_daemon merge

["Conrad Scott" <Conrad dot Scott at dsl dot pipex dot com>]

"Robert Collins" <rbcollins@cygwin.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