hg-git and hg-evolve incompatibility ?

Aurélien Campéas aurelien.campeas at pythonian.fr
Fri Oct 18 17:50:02 UTC 2019


He answered privately it did the job.


On 18/10/2019 18:21, Pierre-Yves David wrote:
> How did Aurélien proposal go ?
> 
> On 10/17/19 4:05 PM, Aurélien Campéas wrote:
>> Can you try a
>>
>> `hg pull --hidden` from the git repo
>>
>> if you ever obsoleted the common base between
>> your repo and the git repo, this is a likely
>> outcome
>>
>> Aurélien
>>
>> On 17/10/2019 14:19, Pierre Augier wrote:
>>> Hi,
>>>
>>> I used hg-evolve and hg-git to work on a distant Git repository and I 
>>> get a bad state for which I can't pull:
>>>
>>> augier3pi at meige8pcpa79:~/.pyenv$  hg push
>>> pushing togit at github.com:paugier/pyenv.git
>>> searching for changes
>>> abort: branch 'refs/heads/master' changed on the server, please pull 
>>> and merge before pushing
>>>
>>> augier3pi at meige8pcpa79:~/.pyenv$  hg pull
>>> pulling fromgit at github.com:paugier/pyenv.git
>>> importing git objects into hg
>>> abort: you appear to have run strip - please run hg git-cleanup
>>>
>>> augier3pi at meige8pcpa79:~/.pyenv$  hg git-cleanup
>>> git commit map cleaned
>>>
>>> augier3pi at meige8pcpa79:~/.pyenv$  hg pull
>>> pulling fromgit at github.com:paugier/pyenv.git
>>> importing git objects into hg
>>> abort: you appear to have run strip - please run hg git-cleanup
>>>
>>> augier3pi at meige8pcpa79:~/.pyenv$  hg push
>>> pushing togit at github.com:paugier/pyenv.git
>>> searching for changes
>>> abort: branch 'refs/heads/master' changed on the server, please pull 
>>> and merge before pushing
>>>
>>> I guess I modified the distant repository with another hg repo on 
>>> another computer.
>>>
>>> I guess it's more a hg-git problem than a hg-evolve problem (?)
>>>
>>> https://bitbucket.org/durin42/hg-git/issues/292/incompatibility-with-hg-evolve 
>>>
>>>
>>> I also tried with https://dev.heptapod.net/heptapod/hg-git but it 
>>> does not solve the issue.
>>>
>>> Any clues about what can be done ?
>>>
>>> Pierre
>>>
>>>
>>> -- 
>>> Pierre Augier - CR CNRShttp://www.legi.grenoble-inp.fr
>>> LEGI (UMR 5519) Laboratoire des Ecoulements Geophysiques et Industriels
>>> BP53, 38041 Grenoble Cedex, France                tel:+33.4.56.52.86.16
>>>
>>>
>>> _______________________________________________
>>> Evolve-testers mailing list
>>> Evolve-testers at mercurial-scm.org
>>> https://www.mercurial-scm.org/mailman/listinfo/evolve-testers
>>>
>> _______________________________________________
>> Evolve-testers mailing list
>> Evolve-testers at mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/evolve-testers
> 



More information about the Evolve-testers mailing list