Re: [boost] [git] develop and master are two completely distinct branches

Subject: Re: [boost] [git] develop and master are two completely distinct branches
From: Daniel James (daniel_at_[hidden])
Date: 2013-12-06 11:33:35

On 6 December 2013 16:20, Thomas Heller <thom.heller_at_[hidden]> wrote:
>
> I was hoping that the conversion script tracked and conserved this
> information. In the current state is close to impossible to see where those
> two branches might have diverged. Also, the history of the master branch of
> most repositories is close to useless now.

The history of branches/release wasn't much better. You can still use
subversion to examine the old history, and find out what need to be
merged. In this case:

svn mergeinfo --show-revs eligible
"https://svn.boost.org/svn/boost/trunk/boost/phoenix"
"https://svn.boost.org/svn/boost/branches/release/boost/phoenix"
r71952
r72702
r78205
r79223
r85952

svn mergeinfo --show-revs eligible
"https://svn.boost.org/svn/boost/trunk/libs/phoenix"
"https://svn.boost.org/svn/boost/branches/release/libs/phoenix"
r72702
r73369

Then look through the develop log to find the equivalent git revisions
and decide whether they need to be merged.

Although I think I'd just create separate clones of master and develop
and reconcile the differences manually and then mark it as fully
merged. A graphical merge tool could help here.