yade-mpi team mailing list archive

[janek_listy@xxxxx]

> Maybe this rebase can help?
> https://gitlab.com/yade-dev/trunk/issues/80

I hope it will be useful :) Maybe a good idea is to do this


1. add latest commits from mpi branch to to https://gitlab.com/yade-dev/trunk/commits/mpiRebase branch
2.  `kompare trunk1-mpi trunk2-master` and merge in this way. Do this to obtain the „properly merged” contents of files.
3. Copy over all files from (2.) to overwrite all files in (1.) The resulting `git diff` should be very small - it would contain only my mistakes that I did when preparing mpiRebase branch
4. commit this into mpiRebase, and voila! :)


cheers
Janek

On 7 Jun 2019, 11:00 +0200, Deepak Kn <deepak.kn1990@xxxxxxxxx>, wrote:
> > I probably lost track of some discussion but I realize just now that I'm running mpi with python 2.7...
> > So we can't compile it with Py3 at the moment?
>
> > No merge has been done yet, it will be a piece of work to do...
>
> Maybe this rebase can help?
> https://gitlab.com/yade-dev/trunk/issues/80
>
> > On Fri, Jun 7, 2019 at 10:55 AM François <francois.kneib@xxxxxxxxx> wrote:
> > > > > I probably lost track of some discussion but I realize just now that I'm running mpi with python 2.7...
> > > > > So we can't compile it with Py3 at the moment?
> > > >
> > > > No merge has been done yet, it will be a piece of work to do...
> > > --
> > > Mailing list: https://launchpad.net/~yade-mpi
> > > Post to     : yade-mpi@xxxxxxxxxxxxxxxxxxx
> > > Unsubscribe : https://launchpad.net/~yade-mpi
> > > More help   : https://help.launchpad.net/ListHelp
> --
> Mailing list: https://launchpad.net/~yade-mpi
> Post to : yade-mpi@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-mpi
> More help : https://help.launchpad.net/ListHelp
>