yade-dev team mailing list archive

[Bruno Chareyre <bruno.chareyre@xxxxxxxxxxxxxxx>]

This being said I don't think the merge can be the cause of William's 
compile error.
The question is why gcc can't find std::random_device.
Just weird.
B
/
/
On 03/09/2018 06:35 PM, Bruno Chareyre wrote:
> Let us continue the discussion here on yade-dev, William is member.
> Merge commits are painful, as you suggest Robert it applies the 
> upstream changes on the local trunk then it commits the merged code.
> In the log it looks like reapplying the same changes, the problem is 
> if it's not reapplying exactly the same thing it can go unnoticed.
> This is known as "merge bubble" on the git forums.
>
> It can be avoided manually or, more simply, by changing the default 
> behavior of git once for all (on a given machine):|
> git config branch.autosetuprebase always|
>
> Please always consider the above command before any commit to yade trunk.
>
> Cheers
>
> Bruno
>
>
>
> On 03/09/2018 06:08 PM, Robert Caulk wrote:
> > Question #665387 on Yade changed:
> > https://answers.launchpad.net/yade/+question/665387
> >
> >      Status: Open => Answered
> >
> > Robert Caulk proposed the following answer:
> > Hello William,
> >
> > Which linux distribution are you running? Which compiler are you using
> > (gcc --version)?
> >
> > As Bruno mentions on yade-dev, your most recent build passes the
> > buildbot [1] - so it may be a local problem. (I think Bruno's message
> > [2] was not posted here as intended. He suggests you join yade-dev list
> > serv [3] and send compiler questions there).
> >
> > Although it seems unlikely - is it possible this has something to do
> > with this unusual merge of master with itself [4]? Is that a merge into
> > your local repository? Perhaps you are you working off a read-only
> > clone? Do you have duplicated commits on your local machine? I can't
> > quite figure out what is going on there, the "merge" seems to simply add
> > commits that are already committed to the repository.
> >
> > Cheers,
> >
> > Robert
> >
> > [1]https://yade-dem.org/buildbot/builders/yade-full/builds/4507
> > [2]https://lists.launchpad.net/yade-dev/msg13755.html
> > [3]https://launchpad.net/~yade-dev
> > [4]https://github.com/yade/trunk/commit/921bb17079fea51385fe620526f9bc48c055918e
>
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help   : https://help.launchpad.net/ListHelp