Markus Heidelberg wrote: > > > No, that doesn't make a difference. You can remove outdated branches and > > > tags from the Git repository via "git push" and overwrite the master > > > branch by force-pushing. > > > > I found the --mirror argument (among the big pile of arguments that git > > has). It appears that "git push --mirror" will delete anything that > > isn't in the local repo. Thus it effectively overwrites the github > > repo. Perhaps I first need to do this from an empty repo, so that we > > are sure everything is deleted. > > I gave the --mirror a short try and it seems to work. However, it really > creates a mirror of your local repository, that means it also pushes you > remote branch references. If you have one, then you have to delete it > afterwards with e.g. > > git push origin :origin/master > > So it seems to be suitable for the initial push, but the updates of > the master branch and the tags later should be done by an ordinary push.
OK. So we can still chose between using the export from Google code and building on top of the resulting github repo, or doing the conversion locally and use --mirror to have it replace the github repo. I suppose this depends on how we do the patch on Mercurial to break the build, which should only be pushed after the conversion to github is fully successful. I'll await your suggestions. > > BTW: you are working on the git cleanup, but is the Mercurial cleanup > > now ready to be committed? AFAIK it all looks OK, so I could apply this > > to my local repository and push it to Google code, right? > > Yes, I started with the Git cleanup script. During that I found another > tag, which should be slightly moved (to the parent commit) to avoid > pointing to an empty Git commit after conversion. In the Git cleanup all > empty commits are removed. So here is a little update to the HG cleanup > script: OK, if there is a chance you still find some improvements for the Mercurial cleanup, we better wait a bit before doing that. Once you have it all figured out, I hope you can send me the final scripts. I wouldn't want some small mistake spoil the fun. > In my initial mail about repository cleanup from 2015-04-01 I added the > following item: > > * Rename tags to match the normal version notation: > s/-/./g > e.g. v7-4-683 -> v7.4.683 > > What do you think about this one? If you want to apply it, then this has > to be done in the HG as well to have the same tag names in HG and Git > repositories and to be consistent in the tag names of the HG mirror. > If you don't like it, then I'd discard this idea. I do like the dot instead of the dash. It only got there because in the past it wasn't allowed to have two dots. Perhaps that dates back from the SVN days? Now that everybody has to switch their setup anyway, might as well do this too. Once we have the switch done we will avoid more changes that breaks people's habits. > Maybe you can comment on some other items from the old mail as well. Can you repeat the relevant questions? -- Proofread carefully to see if you any words out. /// 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.
