Re: [Boost-build] Git usages

Subject: Re: [Boost-build] Git usages
From: Rene Rivera (grafikrobot_at_[hidden])
Date: 2015-04-13 19:04:47

On Mon, Apr 13, 2015 at 11:07 AM, Vladimir Prus <vladimir.prus_at_[hidden]>
wrote:

> On 04/13/2015 05:38 PM, Rene Rivera wrote:
>>
>> On Mon, Apr 13, 2015 at 2:25 AM, Dmitry Moskalchuk <dm_at_[hidden]
>> <mailto:dm_at_[hidden]>> wrote:
>>
>>     On 13/04/15 08:43, Vladimir Prus wrote:
>>     > - When updating from git, do:
>>     >
>>     >        git fetch
>>     >        git rebase develop origin/develop
>>
>>     Just a note: the same could be achieved by "git pull --rebase", or
>> even
>>     turned to be permanent:
>>
>>          git config branch.develop.rebase true
>>          git pull # it will rebase instead of merge now
>>
>>     Note, however, that rebase is not the same as merge, so it could be
>>     dangerous in some cases. There are many explanations around why is it
>>     so; for example, this one:
>>     http://stackoverflow.com/questions/18137918/git-pull-
>> rebase-this-is-a-possibly-dangerous-operation.
>>
>>
>> Read that.. Doesn't clear anything up. Here's some basic questions.. What
>> should I do if I'm using the Eclipse git integration? Should I
>> look into using Mercurial to deal with the git repos as a more sane
>> alternative?
>>
>
> If you're using egit, you should be able to right-click project in project
> navigator, pick Team->Fetch From Upstream, and
> then pick Team->Rebase and select origin/develop.

I realized that doesn't help, sorry :-( As most times I update BB from a
super project that isn't Boost. And I do it with a script that has this:

===
git pull
git submodule init
git submodule foreach git pull
===

Which I need so that the many submodules don't stray from the branch they
are on and become detached. And BB is just another submodule. So it would
be a PITA to do something special for BB. Gods why is git so horrible at
this :-\ More than two years of being forced to use git and the cons are a
magnitude larger than the pros.

-- 
-- Rene Rivera
-- Grafik - Don't Assume Anything
-- Robot Dreams - http://robot-dreams.net
-- rrivera/acm.org (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail