Git checkout tag different than scm tag1/15/2024 ![]() So, Nico, how and why do you use them? My guess is that you are using CVS checkouts or daily/weekly builds? Can you tell us more? I want to make sure that if/when we switch to Id-less usage, people have usable alternatives. MD makes a good point, so I am interested in understanding the use cases where people actually use the (nasty! evil! smack!) Id tags. If you're in that position of adding things with scripts that aren't in the official source control, you could also put a different standardised version tag at the top of 'official' downloads - so that instead of having the file-specific data it has 'Moodle 1.9.5 release version' in every single file (which can then be tracked in source control using the tag, obviously).Īnd it would even be possible for this script to include some kind of hash of the file contents (after the version) so that an admin report could be written which would list any file that has been modified from its claimed Moodle version.! If you really really want to know what version of a file somebody has and if it's 'true'. ![]() The data that's put in could either be the current information, or something similar (eg date/time the file was last changed) that would allow it to be found in source control. I quite like the 'get rid of them in the source, but have a script that puts them back for the read-only download cvs mirrors' approach - and this is something that could be continued even after a switch to git. Well, it also shows that you haven't found many people who do need them. So it means we either switch to -kk everyhere or stay with -kkv, mixing of these two is going to cause a lot of trouble for anybody using IDE Eloy suggested several tricks how to fool IDEs into thinking that the files are -kk on cvs server, unfortunately none of them are usable. ![]() The solution proposed by Dan suggests we start using -kk on development machines and start submitting -kk patches. Unfortunately patching from command line while using IDEs confuses both Netbeans and Eclipse. -kkv patches do not apply cleanly to later versions because they lack the -kkv patching magic which is available in patch binary.People using git often submitting patches using -kk ($Id$), Netbeans and Eclipse can not apply these to -kkv checkouts.So if you just checkout your code without any tweaking of command line cvs or IDE you will get expanded form $Id: readme_moodle.txt,v 1.16 9 22:48:59 skodak Exp $ All patches submitted into cvs should use -kkv.Just spent a few hours trying to work out so solution suitable for all people, unfortunately failed pretty badly. Is there a solution to this i'm missing?Īlso on a related note - the $id$ tags tend to get used lots round here and people find them useful, is there a way to do this sort of thing in git with hooks? Its another thing to consider for a migration plan. What I am surprised about is that i've never really heard others come across this problem before today (though Tim actually mentioned it earlier).Īs I have never heard about this before I am wondering if I have missed some way to prevent these conflicts with git tools, because as I see it, this will effect any git user going near commited $id$ tags when sharing their changes for others to review or even trying to commit without review using git-cvsexportcommit. I just went through an infuriating time with Petr, cursing ide's not accepting my patches when we discovered a patch I had created was not applying because of the mismatch between the unexpanded $id$ tag and the expanded one from a cvs checkout. Sorry for starting yet another git thread.
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |