Menu
▾
▴
Re: [ jEdit-devel ] jEdit core and Git
|
From: Matthieu C. <cho...@gm...> - 2012-08-13 15:46:58
|
Ok, but what are the benefits for you ? The fact that I can do a long job and do some little commit locally, then when it is ready push everything on the master ? But if my work takes a long time the risk that the same code was modified by someone else is bigger then the merge will cause problems isn't it ? About the problems that Shlomy has with svn, I know he has those problems since a long time, so if switching to git can help Shlomy working again on jEdit it is a good point :) But I'm not sure about something : commit and update are slow on svn, but are we sure that git will be faster when updating or merging on the master ? Matthieu 2012/8/13 Alan Ezust <ala...@gm...> > The most important thing about doing work over Git is that we all > should be working in our own private branches, and then doing rebase > to keep them up to date with the master, and merging into master when > our changes are all ready to go. > > If you haven't been working on a Git repository that has commits from > more than a couple of people, this is something you may not have done > yet. > > If you google "git workflow' you will see many articles that describe > what it is: > > http://sandofsky.com/blog/git-workflow.html > > So it is important that anyone who pushes to git understands how to do > private branches. > > > On Mon, Aug 13, 2012 at 3:36 AM, Shlomy Reinstein <sre...@gm...> > wrote: > > Hi, > > > > Sorry, I can't read the entire long email. In short, I'm in favor of > > switching the core of jEdit to a DVCS. Not sure if Git is the best one > for > > it - Eric told me a while ago that there are other DVCS which are just as > > good and are easier to learn and use than Git. When I worked on my > plugins, > > I occasionally had problems with Git (mostly not remembering how to do > > things). One of the reasons that working on jEdit annoyed me was the > > (amazing) slowness of the SVN repository where I live. > > > > Regarding the hard step of switching - okay with me. > > > > Thanks, > > Shlomy > > > > > > On Mon, Aug 13, 2012 at 11:35 AM, Vampire <Va...@je...> wrote: > >> > >> Hi guys, > >> > >> the topic came up 2,5 years ago from Alan as far as I remember. > >> Time has gone by and DVCS became mature and usable. > >> In the last months I myself became a big Git fan. > >> It is mighty, it is fast, it is slick and you can do whatever you could > >> imagine doing with a VCS. > >> And if not with a ready-made porcellaine (high-level) command, then > >> easily implemented with the help of the plumbing (low-level) commands. > >> You can even use bzr or hg as frontend much like git-svn as frontend for > >> SVN. > >> "git bisect" e. g. is a very cool command to find the source of a bug. > >> Everyone using Git and not knowing this command should definitely read > >> its helpfile. :-) > >> > >> So I want to call for opinions. > >> Back in the old days we switched over from CVS to SVN, by switching off > >> write-access to CVS and port over to SVN what should be developed > >> further, leaving CVS around for reference and history. > >> > >> Basically I have two questions. > >> 1. What do you think about moving the official jEdit core repository > >> from SVN to GIT? > >> 2. What do you think about doing the same hard step we did in the CVS to > >> SVN switch with which we made good experiences in the past? > >> > >> As a goodie, I prepared some really nice thing in my opinion. > >> I think history is important, especially when it comes to the sourcecode > >> of a software. > >> And in my journey to explore the depths of Git and play with it, I > >> collected all the history of jEdit I was able to get and combined it > >> into a nice Git repository. > >> This includes > >> - files that were laying around in folders on Slavas box > >> - the full history from the GJT Giant Java Tree CVS repository > >> - supplementary files that were not kept in GJT CVS repository but were > >> only added at release time > >> - the full history from the SourceForge CVS repository > >> - the full history from the SourceForge SVN repository > >> > >> I combined all those history sources into one big Git repository, > >> cleaned up the history a bit to have a nice linear flow and to > >> compensate structure changes that were made between GJT CVS and SF CVS > >> repository and removed some old not-used anymore branches and now I have > >> here a Git repository with ALL the history from version > >> jEdit-0.2-19980927 up to and including revision 21994 SF SVN and I can > >> add new revisions coming in after that incrementally. > >> This is not a git-svn clone and can not interact with the Subversion > >> repository. It is a clean conversion of the sources to a proper Git > >> repository not polluted by Subversion meta-data or anything else. The > >> history of a git-svn clone is fine for using git as front-end to a > >> Subversion repository, but the history is often really strange and > >> confusing and not really appropriate for a one-time conversion to Git. > >> > >> As the Git repository at > >> http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/jEdit;a=summary > >> was just some old experiment by Alan, I cleaned that one out and pushed > >> the current state of my repository there. > >> For now it is read-only to everyone but me, so that not someone > >> accidentally pushes something there as long as we didn't decide how to > >> proceed. > >> > >> > >> My answer to my first question is obviously that I second the change for > >> jEdit core to Git. > >> For the first question I don't have too strong feelings. > >> The conversions of the plugins code from SVN to Git could probably be > >> done similar to how I did the jEdit core conversion just much simpler as > >> no history combination would be necessary. The svn2git tool I used > >> (there are multiple out there, I'm talking about the KDE one which is > >> really nice and powerful. And I think I could maybe relatively easily > >> split up the SVN codebase into single plugin Git repositories with > >> proper conversion done, but I didn't investigate further about this yet. > >> > >> > >> Best regards > >> Vampire > >> > >> > >> > ------------------------------------------------------------------------------ > >> Live Security Virtual Conference > >> Exclusive live event will cover all the ways today's security and > >> threat landscape has changed and how IT managers can respond. > Discussions > >> will include endpoint security, mobile security and the latest in > malware > >> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > >> -- > >> ----------------------------------------------- > >> jEdit Developers' List > >> jEd...@li... > >> https://lists.sourceforge.net/lists/listinfo/jedit-devel > > > > > > > > > ------------------------------------------------------------------------------ > > Live Security Virtual Conference > > Exclusive live event will cover all the ways today's security and > > threat landscape has changed and how IT managers can respond. Discussions > > will include endpoint security, mobile security and the latest in malware > > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > > -- > > ----------------------------------------------- > > jEdit Developers' List > > jEd...@li... > > https://lists.sourceforge.net/lists/listinfo/jedit-devel > > > > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > -- > ----------------------------------------------- > jEdit Developers' List > jEd...@li... > https://lists.sourceforge.net/lists/listinfo/jedit-devel > |
