Re: [boost] merging from develop to master

Subject: Re: [boost] merging from develop to master
From: Stefan Seefeld (stefan_at_[hidden])
Date: 2015-06-28 15:42:56

On 28/06/15 03:25 PM, Andrey Semashev wrote:
> On 28.06.2015 21:57, Stefan Seefeld wrote:
>> Hello,
>>
>> I'm trying to compare Boost.Python's develop branch with master, to
>> decide how to proceed. I was naively assuming that develop would
>> regularly be rebased so it's easy to merge patches.
>> However, https://github.com/boostorg/python/branches/active indicates
>> develop is "276 commits ahead". How is that possible ? How did previous
>> maintainers keep the develop branch in sync with master ? How is this
>> handled in other Boost libraries ?
>
> It is normal that develop is ahead of master because all active
> development is supposed to happen in develop (or in separate branches
> that are merged into develop). When stable and tested, develop is
> merged into master.

That's all theory, which I think I understand.
Unfortunately theory and practice are only the same in theory...

>
> However, in your case I can see that develop is 73 commits behind
> master as well. This is what normally should not happen. It means that
> someone committed directly to master. I guess you will have to review
> these commits and cherry-pick them to develop and then merge develop
> to master.

Why cherry-pick ? If master is the Golden Standard, everything should be
rebased on that, no ? (Trying to rebase "develop" to current "master"
stops at a commit from 2006, so it seems this rebasing has never been
done before. And likewise for the other direction: As I reported, there
are 276 commits in develop that haven't been merged to master, which
must have accumulated over many release cycles.

I wonder what the best strategy is to fix this, even incrementally...

Thanks,
        Stefan

-- 
      ...ich hab' noch einen Koffer in Berlin...