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

Subject: Re: [boost] [git] develop and master are two completely distinct branches
From: Thomas Heller (thom.heller_at_[hidden])
Date: 2013-12-06 11:20:20

Am 06.12.2013 17:04 schrieb "Steven Watanabe" <watanabesj_at_[hidden]>:
>
> AMDG
>
> On 12/06/2013 08:06 AM, Thomas Heller wrote:
> > I just cloned modular boost and wanted to get phoenix back on track.
> > However, something very disturbing occured to me:
> > The develop and master branches in the git repos (for all repos) are
> > completely distinct from each other! How could this happen?
> > In the case of phoenix those have, unfortunately, completely diverged
> > from each other (content wise, commit wise, they have completely
> > distinct commits).
> > What's the best practice to do here? How to proceed?
> >
>
> In svn the branches are completely separate,
> and svn:mergeinfo indicates which commits have
> been merged from other branches.

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.

>  If you want
> to merge everything, I think git merge has
> an option to use the state of one branch as
> the result of the merge.

Yeah. I think that might be an option. Though I'm afraid of losing
commits/content only available in the "to be absorbed" branch.

>
> In Christ,
> Steven Watanabe
>
>
> _______________________________________________
> Unsubscribe & other changes:
http://lists.boost.org/mailman/listinfo.cgi/boost