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. > > 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. > > 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 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. > > > 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. > > 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. > > 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.
I have removed the Ubuntu package for hg-fast-export and downloaded the individual files from repo.or.cz. The conversion now runs without any errors or warnings. The result is now available at https://github.com/vim/vim-tryout. Let me know if this is perfect, then I'll push to the vim/vim repository. And then we can continue from there. One thing that's different from the export: That one shows the author as "brammool", that is my GitHub user account. This gives me statistics etc. The locally converted repo doesn't have this. Perhaps this is a matter of changing the email address? Hmm, I can add my [email protected] address to my GitHub account. It didn't have an effect at the toplevel, but if I now open a commit it works. Perhaps it's just some caching. I do believe my commits will also use [email protected]. -- An indication you must be a manager: You can explain to somebody the difference between "re-engineering", "down-sizing", "right-sizing", and "firing people's asses". /// 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.
