- From: Timothy Lebo <lebot@rpi.edu>
- Date: Mon, 16 Apr 2012 14:36:17 -0400
- To: James Cheney <jcheney@inf.ed.ac.uk>
- Cc: Provenance Working Group <public-prov-wg@w3.org>
Joel put it best as: C:\Users\joel\recipes> hg push pushing to http://joel.example.com:8000/ searching for changes abort: push creates new remote heads! (did you forget to merge? use push -f to force) Ahhh!! Failure! By the way… that message you see there? The one that says use push -f to force? That’s terrible advice. Never, ever, EVER use push -f to force. You will regret it. <http://hginit.com/02.html> -Tim On Apr 15, 2012, at 8:06 PM, James Cheney wrote: > Hi, > > Somehow an extra repository head was created again. I think I have fixed it. > > To avoid this, as noted in http://www.w3.org/2011/prov/wiki/Mercurial_repository, it's good to do a hg pull/hg update before doing any commits, as then you have a chance to resolve any conflicts locally and avoid creating new heads. > > Fingers crossed that I haven't messed it up for others. > > --James > -- > The University of Edinburgh is a charitable body, registered in > Scotland, with registration number SC005336. > > >
Received on Monday, 16 April 2012 18:36:55 UTC