[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Release branch plans

From: Eli Zaretskii
Subject: Re: Release branch plans
Date: Mon, 02 Apr 2012 20:53:02 +0300

> 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 from the branch makes it hard to find out where some changes
> > came from and why, because history metadata says some revisions were
> > merged, but their code was not really brought to the target branch.
> Merges are supposed to merge everything.

Yes, except they don't.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]