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

Re: dpkg development cycle

Raphael Hertzog <hertzog@debian.org> writes:

> On Mon, 14 Jan 2008, Otavio Salvador wrote:
>> > There are two possible options for the workings of the "stable" branch though
>> > I want to point out:
>> > 1) As you described commit everything to "master" and cherry pick the
>> > changes to "stable" if wanted. (backports)
>> > 2) Try to decide where to commit beforehand and commit small changes
>> > directly to "stable" and then merge that to "master". (forwardports)
>> >
>> > The latter generates more merge commits but less "duplicated" commits.
>> > An example project that uses this model is git itself.
>> Yes. And it does work much better. We 1 on parted and we're planning
>> to move to 2 after 1.9 gets released since it makes our merging,
>> releasing and changelog much clearer
> Do you typically have entries in debian/changelog in your commits?

No. I'm using git-dch for it.

> Because that's going to generate conflicts whatever solution you use.

Yes, indeed.

        O T A V I O    S A L V A D O R
 E-mail: otavio@debian.org      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://otavio.ossystems.com.br
"Microsoft sells you Windows ... Linux gives
 you the whole house."

Reply to: