cygwin_daemon merge

Conrad Scott
Sun Sep 22 14:58:00 GMT 2002

"Christopher Faylor" <> wrote:
> Btw, I forgot to mention that the ChangeLog dates should all reflect
> the checkin time.  I have just changed them to today's date.
> Also, maybe you already did this, but for future reference, the
> should reflect changes to the mainline.  If there was a lot of
> on the branch, it shouldn't be reflected in the mainline ChangeLog,
> since the mainline only sees the end result.

Thanks for patching the dates for me and sorry for the bother.

I just followed the example of one of the previous merges that I found
in the archives, but I did wonder whether I'd done the right thing with
the ChangeLog (I just copied across all the entries from the branch w/o
altering them).  I'll go through it some point in the next couple of
days and see if I can slim it down to better reflect the final result,
since there certainly was quite a lot of churn at one point. I'll aim to
do more frequent merges in future now that I've got the hang of it; that
should make the process rather easier too.


// Conrad

More information about the Cygwin-patches mailing list