Re: mercurial repository heads

Satya, 

hg merge doesn't recognize the changeset ID.


My unsuccessful sequence of quarrels with mercurial:

bash-3.2$ hg heads
changeset:   854:eeee2eaf7b27
tag:         tip
parent:      851:f4253ad815ed
user:        Tim L <lebot@rpi.edu>
date:        Tue Nov 08 14:22:24 2011 -0500
summary:     algebraic division example

changeset:   853:9b4d8ba863f5
parent:      852:ab5aa7c910f0
parent:      850:7ef37443dc30
user:        Luc Moreau <l.moreau@ecs.soton.ac.uk>
date:        Tue Nov 08 16:19:25 2011 +0000
summary:     typo

changeset:   686:f2dec9f10b7c
branch:      fpwd
user:        Luc Moreau <l.moreau@ecs.soton.ac.uk>
date:        Tue Oct 11 16:36:39 2011 +0100
summary:     html 4.x compliant file for fpwd

bash-3.2$ hg update -r 854:eeee2eaf7b27
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

bash-3.2$ hg update -r 853:9b4d8ba863f5
abort: crosses branches (merge branches or use --clean to discard changes)

bash-3.2$ hg merge -r 853:9b4d8ba863f5
abort: unknown revision '853:9b4d8ba863f5'!

bash-3.2$ hg merge -r 854:eeee2eaf7b27 -r 853:9b4d8ba863f5
abort: unknown revision '853:9b4d8ba863f5'!

bash-3.2$ hg merge
abort: outstanding uncommitted changes (use 'hg status' to list changes)

bash-3.2$ hg commit -m 'fighting hg'
nothing changed



Any suggestions?

BTW, I put your suggestions at http://www.w3.org/2011/prov/wiki/Mercurial_repository

-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
> 
>