Re: Release branch plans

[Andreas Schwab]

Eli Zaretskii <address@hidden> writes:

>> From: Andreas Schwab <address@hidden>
>> Cc: Chong Yidong <address@hidden>,  address@hidden
>> Date: Mon, 02 Apr 2012 19:21:55 +0200
>> 
>> Eli Zaretskii <address@hidden> writes:
>> 
>> > Could we _please_ do it the other way around this time?  That is,
>> > commit to the trunk and merge to the branch?
>> 
>> How can that be correct?  Most of the trunk commits are not supposed to
>> occur on the release branch.
>
> As long as not all branch commits are merged to the trunk, we already
> know how to cope with this problem.

Merging always merges the complete history.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."