merge question

[Phil Edwards]

On Fri, Mar 08, 2002 at 11:59:43AM -0800, Benjamin Kosnik wrote:
> 
> If the same dates are kept in the ChangeLog, then diffs between
> ChangeLogs are meaningful. If the dates indicate when the patch is
> checked in, then there's an accurate textual history.

Good question.  I have no answer.

Maybe we should add a "header sentence" like we do with PR numbers,
referring to the date of the mainline checkin?

On trunk:

    2002-03-06   J. Random Hacker

            The quick brown fox jumped over the lazy dog.

And then on the branch:

    2002-03-08   J. Random Hacker

            Copy from mainline 2002-03-06.
            The quick brown fox jumped over the lazy dog.

That's kind of ugly, though.

What do they do for the compiler?


Phil

-- 
If ye love wealth greater than liberty, the tranquility of servitude greater
than the animating contest for freedom, go home and leave us in peace.  We seek
not your counsel, nor your arms.  Crouch down and lick the hand that feeds you;
and may posterity forget that ye were our countrymen.            - Samuel Adams