dolfin team mailing list archive

["Garth N. Wells" <g.n.wells@xxxxxxxxxx>]

On Thu, 2006-02-09 at 13:25 -0600, Anders Logg wrote:
> Everytime I change something locally and I pull new changes into my
> local repository (from the one on fenics.org), I need to merge. When I
> then push my changes to the repository on fenics.org, I need to use
> 
>     hg push -f default
> 
> to force the creation of a new branch. Do you get the same thing?
> 

I haven't "pushed" often yet, but I haven't used -f. I did

hg pull default
hg update -m (without the -m gave errors)
hg push default

Garth


> It seems natural, but I want to check anyway.
> 
> /Anders
> 
> 
> On Thu, Feb 09, 2006 at 06:46:40PM +0100, 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:   1650:8c4ba73c47994dd0c2de5ecd1ec46e83a4d76a4b
> > tag:         tip
> > parent:      1649:38afd7b33eef0cf91b3fd742a7fa33f16b3dd937
> > parent:      1648:629d248d0871937188f1376be3af911bf362178f
> > user:        "Johan Jansson <johanjan@xxxxxxxxxxxxxxxx>"
> > date:        Thu Feb  9 18:46:26 2006 +0100
> > files:       
> > description:
> > Branch merge apparently.
> > 
> > 
> > changeset:   1649:38afd7b33eef0cf91b3fd742a7fa33f16b3dd937
> > parent:      1643:04af8edfe392968e4a50c686b8db3f2f5d12598a
> > user:        "Johan Jansson <johanjan@xxxxxxxxxxxxxxxx>"
> > date:        Thu Feb  9 18:44:43 2006 +0100
> > files:       src/demo/ode/homotopy/Makefile src/demo/ode/modeling/Makefile src/pydolfin/SettingsGlue.cpp src/pydolfin/SettingsGlue.h src/pydolfin/dolfin.i src/pydolfin/dolfin.py src/pydolfin/dolfin_wrap.cpp
> > description:
> > PyDOLFIN:
> > 
> > Workaround for "set", which seems to be accidentally declared in the
> > global namespace by SWIG somewhere.
> > 
> > The PyDOLFIN demos should now work properly again.
> > 
> > 
> > changeset:   1648:629d248d0871937188f1376be3af911bf362178f
> > user:        "Anders Logg <logg@xxxxxxxxx>"
> > date:        Thu Feb  9 18:42:25 2006 -0500
> > files:       ChangeLog
> > description:
> > Update ChangeLog
> > 
> > 
> > -------------------------------------------------------
> > For more details, visit http://www.fenics.org/hg/dolfin
> > 
> > _______________________________________________
> > DOLFIN-dev mailing list
> > DOLFIN-dev@xxxxxxxxxx
> > http://www.fenics.org/cgi-bin/mailman/listinfo/dolfin-dev
> > 
> 
-- 
Dr. Garth N. Wells
Faculty of Civil Engineering and Geosciences
Delft University of Technology
Stevinweg 1
2628 CN Delft
The Netherlands

tel.     +31 15 278 7922
fax.     +31 15 278 6383
e-mail   g.n.wells@xxxxxxxxxx
url      http://www.mechanics.citg.tudelft.nl/~garth