Markus Heidelberg wrote: > Am Dienstag, 18. August 2015, 18:42:50 schrieb Bram Moolenaar: > > > > I wrote: > > > > > Applying your git cleanup script after the conversion from hg to git > > > produces lots of these errors: > > > > > > fatal: ambiguous argument 'v7.2.434~4': unknown revision or path not in > > > the working tree. > > > Use '--' to separate paths from revisions, like this: > > > 'git <command> [<revision>...] -- [<file>...]' > > > > > > I'll have a look myself, but perhas you can guess what is wrong? > > > Or should these errors be ignored? > > These errors should not occur. > The reason for them is that the mentioned tag used in the Git cleanup > script cannot be found. In fact, the tags in the Git repo you pushed to > GitHub use the old naming scheme with dashes, i.e. v7-2-434 instead of > v7.2.434 > > It seems you did the conversion from a partially cleaned up HG > repository, where the step of tag renaming was missing.
Hmm, it's possible in all the tryouts I forgot to run the Mercurial cleanup. Or used the wrong Mercurial repo to convert from. I should delete old stuff. > The online HG repo with applied cleanup script looks fine, it is the > same compared to my HG repo cleanup and includes the tag renaming. OK, glad that worked. > The rest of the Git cleanup script was successful. Only the step to > remove the 6 wrong commits, which required the missing tag, failed. I'll redo this part tonight, using the cleaned up Mercurial repo, and push to the vim-tryout repo on github. That should give the same result as doing it "for real", but not risking damaging the vim repo. Although it seems with --mirror we can always overwrite it with a corrected one. > > I let the script continue, ignoring the errors. Then I pushed the > > result to github. I got some errors, I think my sequence of commands is > > not quite right, probably some can be left out: > > > > % git remote add origin [email protected]:vim/vim.git > > % git remote -v > > % git push --mirror > > % git push --set-upstream origin master > > % git push --tags > > % git push origin :origin/master > > Should be ok. Tried locally and it looked good, I only got an error with > the last command because the branch "origin/master" did not exist yet on > the remote repository and could not be deleted. So I just leave out the last command? > > The result is now at https://github.com/vim/vim. It does have > > everything up to patch 7.4.827. Does it look OK? > > Not quite. Apart from the wrong tag naming there is also a wrong merge > order in the two merge commits (obtain them with "git log --merges"), > which already was the case with the direct Google Export. Yes, this is the result of the Google export. Or GitHub import from Google Code, as the conversion is actually done by GitHub. > You said you use the Ubuntu package. I had a look: > http://packages.ubuntu.com/source/vivid/hg-fast-export > Even in the latest Ubuntu version 15.04, the package is from 2014-03-08, > despite having received changes upstream until October 2014. The merge > order problem has been fixed during that time (log: "do not sort merge > commit parents"). The same version is used on Debian unstable Sid. > > A bit disappointing that obviously an old distro package is used for the > Google Exporter. > > So you should use the latest version of hg-fast-export from > http://repo.or.cz/w/fast-export.git > and redo the conversion. OK, sounds like we identified what's wrong in the sequence of commands. > It so happened that 3 days ago there were some new commits. I just > tested, they had no influence and the result is identical (equal object > SHA1 checksums). > > > I'll push the cleaned-up Mercurial repository to Google code next. > > That part appears to be OK now. > > Yes, looks fine. It's available now. OK. More tonight. -- ARTHUR: Charge! [They all charge with swords drawn towards the RABBIT. A tremendous twenty second fight with Peckinpahish shots and borrowing heavily also on the Kung Fu and karate-type films ensues, in which some four KNIGHTS are comprehensively killed.] ARTHUR: Run away! Run away! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
