Fixing a divergent tip
Matt Harbison
mharbison72 at gmail.com
Sat Jan 17 02:00:50 UTC 2015
On Fri, 16 Jan 2015 19:47:03 -0500, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 01/16/2015 04:06 PM, Matt Harbison wrote:
>> A couple months ago, I asked about how to fix a particular case of
>> divergence, and the answer was to rebase. Yesterday at work, I pruned a
>> commit, but accidentally specified the wrong successor. I may have
>> followed that with an evolve command, but I got to a point where the
>> only troubled commit was the tip of the branch, which was marked
>> divergent.
>>
>> Is there a way to fix that? I suppose I could have rebased tip back a
>> few ancestors, and then forward again, but I would assume there's an
>> easier way. What I ended up doing, because I had just enabled evolve
>> (and wanted to go home), was to rename the obsstore file and manually
>> record the few prune ops that were stored in it.
>
> quick answer before wrapping my head around the situation: have a look
> at `hg touch --duplicate`
>
Ah! I didn't know about --duplicate. I tried 'hg touch' a couple of
times without it with no success. I'll see if I can clone the repo Monday
and restage obsstore to see if that works, but it sounds like that will
work.
--Matt
More information about the Evolve-testers
mailing list