hg-git and hg-evolve incompatibility ?
Pierre Augier
pierre.augier at univ-grenoble-alpes.fr
Thu Oct 17 12:19:00 UTC 2019
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 to git 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 from git 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 from git 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 to git 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 CNRS http://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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/evolve-testers/attachments/20191017/de103fee/attachment.html>
More information about the Evolve-testers
mailing list