← Back to team overview

dolfin team mailing list archive

Re: [HG DOLFIN] merge.

 

On Sun, Aug 16, 2009 at 11:31:22PM +0100, Garth N. Wells wrote:
>
>
> Johan Hake wrote:
> > On Monday 17 August 2009 00:15:28 DOLFIN wrote:
> >> One or more new changesets pushed to the primary dolfin repository.
> >> A short summary of the last three changesets is included below.
> >>
> >> changeset:   6745:da5a4b553da51ac48886f2eecc9b1b0c297cb2ed
> >> tag:         tip
> >> parent:      6741:309099b6f2b71a79b7a3e83bc0dab6b23ba1dfc7
> >> parent:      6744:58993bc573026e876c6f27fc9d6c90fae725fbfa
> >> user:        "Garth N. Wells <gnw20@xxxxxxxxx>"
> >> date:        Sun Aug 16 23:15:13 2009 +0100
> >> files:       dolfin/fem/DirichletBC.cpp dolfin/fem/EqualityBC.cpp
> >> dolfin/fem/PeriodicBC.cpp description:
> >> merge.
> >> changeset:   6744:58993bc573026e876c6f27fc9d6c90fae725fbfa
> >> user:        "Garth N. Wells <gnw20@xxxxxxxxx>"
> >> date:        Sun Aug 16 23:12:32 2009 +0100
> >> files:       dolfin/fem/DofMap.cpp
> >> description:
> >> Try to fix merge. Things got really screwed up.
> >
> > Urk...
> >
> > I was a bit worried about this, but I thought we had been working on unrelated
> > stuff.
> >
>
> Not your fault - Anders couldn't resist his cleaning impulses ;).

Sorry, I pushed before I read about you going to push more.

--
Anders


> Garth
>
> > Johan
> >
> >> changeset:   6743:79a47b328440ae1afe1c5dd167bf42298086cb40
> >> parent:      6738:e381c289970f30355bdf76c4a76f509047599edb
> >> parent:      6742:aea5800a083cd7a38abc13e50c79e63dc4312087
> >> user:        "Garth N. Wells <gnw20@xxxxxxxxx>"
> >> date:        Sun Aug 16 23:02:32 2009 +0100
> >> files:       dolfin/fem/DofMap.cpp dolfin/function/Function.cpp
> >> description:
> >> merge.
> >>
> >> ----------------------------------------------------------------------
> >> For more details, visit http://www.fenics.org/hg/dolfin
> >> _______________________________________________
> >> DOLFIN-dev mailing list
> >> DOLFIN-dev@xxxxxxxxxx
> >> http://www.fenics.org/mailman/listinfo/dolfin-dev
> > _______________________________________________
> > DOLFIN-dev mailing list
> > DOLFIN-dev@xxxxxxxxxx
> > http://www.fenics.org/mailman/listinfo/dolfin-dev
>
>
> _______________________________________________
> DOLFIN-dev mailing list
> DOLFIN-dev@xxxxxxxxxx
> http://www.fenics.org/mailman/listinfo/dolfin-dev

Attachment: signature.asc
Description: Digital signature


References