W3C home > Mailing lists > Public > public-prov-wg@w3.org > November 2011

Re: mercurial repository heads

From: Timothy Lebo <lebot@rpi.edu>
Date: Tue, 8 Nov 2011 16:01:53 -0500
Cc: Provenance Working Group WG <public-prov-wg@w3.org>
Message-Id: <114584E0-11D0-4D81-8C4B-27C38D63E3FC@rpi.edu>
To: Satya Sahoo <satya.sahoo@case.edu>
Thanks Satya. I couldn't find my notes for how I've resolved it in the past.

I'll try this out, and get back to work :-)

-Tim

On Nov 8, 2011, at 3:55 PM, Satya Sahoo wrote:

> Hi Tim,
> I have tried it only once during our last "medusa crisis" so may not be the best approach - here is what I did::
> 1. hg update -r <name of changeset> (update to desired head)
> 2. hg merge -r <name of changeset> (if merge is not successful, use hg resolve -m to force resolving conflicts but you may have to loose some changes)
> 3. hg commit -m "merged one head"
> 
> I repeated the above steps for all the heads.
> 
> Hope this helps.
> 
> Best,
> Satya
> 
> On Tue, Nov 8, 2011 at 2:57 PM, Timothy Lebo <lebot@rpi.edu> wrote:
> prov-wg,
> 
> I have multiple heads on dvcs.w3.org/hg/prov
> 
> Could anyone contact me to help resolve it, so I don't lose others' work?
> 
> Thanks so much,
> Tim
> 
> 


Received on Tuesday, 8 November 2011 21:02:22 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 16:51:04 UTC