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

Re: mercurial repository heads

From: Luc Moreau <L.Moreau@ecs.soton.ac.uk>
Date: Tue, 08 Nov 2011 21:44:08 +0000
Message-ID: <EMEW3|a5e2b4a0e1cbe37e236d7b07c492e063nA7LiE08L.Moreau|ecs.soton.ac.uk|4EB9A2A8.9020204@ecs.soton.ac.uk>
To: public-prov-wg@w3.org
you just need to write hg merge -r 853

On 08/11/11 21:25, Timothy Lebo wrote:
> 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 <mailto: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 
> <mailto: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 
> <mailto: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 
>> <mailto:lebot@rpi.edu>> wrote:
>>
>>     prov-wg,
>>
>>     I have multiple heads on dvcs.w3.org/hg/prov
>>     <http://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:44:52 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 13:06:47 GMT