This is the mail archive of the cygwin-patches@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: cygwin_daemon merge


"Christopher Faylor" <cgf@redhat.com> 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
ChangeLogs
> should reflect changes to the mainline.  If there was a lot of
churning
> 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.

Cheers,

// Conrad



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]