bq: How have you been able to ignore GitHub for so long :) Willful ignorance and not being forced to ;)
I already have the "Git for SVN users" and similar. They're kinda helpful but I'm still flying blind. I mean apparently "git cherry-pick rev" is equivalent to the merge command I've been using to merge trunk changes into 5x. The key here is "apparently". It would be comforting to know what others do that works in our (future) environment before taking "somebody's blog's" word for it. Although I guess we're all really flying blind in that so far the people who use the Git repo still have to merge via SVN to get code committed. Anyway, it'll work out I'm sure. Prasanna: The history question has been discussed at some length, here's a place to start reviewing what's been done so far: https://issues.apache.org/jira/browse/LUCENE-6933 Best, Erick On Sat, Jan 9, 2016 at 4:40 PM, Mark Miller <[email protected]> wrote: > I think we will update much of the doc as we go, but I'm sure there are > plenty of people that can help on the list with any questions. We can > probably get some basics up relatively painlessly. I'd guess the number of > committers that have not worked with Git yet is very small. > > As a start, my recommendation would be to Google Git for SVN users and look > at some of those resources though. It's probably better than what we will > subset. > > Personally, I like to just use SmartGit and mostly ignore command line Git > :) > > How have you been able to ignore GitHub for so long :) > > Mark > On Sat, Jan 9, 2016 at 6:13 PM Erick Erickson <[email protected]> > wrote: >> >> I'm a little confused. A while ago I asked about whether I had to >> learn all about Git, and as I remember the reply was "this is just >> about the build process". Perhaps I mis-interpreted or that was >> referring only to the bits Dawid was working on at that instant or.... >> >> Anyway, assuming the SVN repo becomes read-only, that implies that all >> our commits need to happen in Git, right? There are still some "git >> challenged" curmudgeons out there (like me) who really haven't much of >> a clue. I'll figure it out, mind you but it'd be nice if there were a >> clear signal that "Now you have to figure it out because you can't >> commit to the SVN repo any more". >> >> And the "how to contribute" page is all about SVN: >> https://wiki.apache.org/solr/HowToContribute, if my understanding is >> at all close that page needs some significant editing. >> >> Personally, before I screw up my first commit under Git, it would be >> super helpful if there were a step-by-step. No doubt that really >> amounts to three commands or something, but before "just trying stuff" >> it would be nice to have the steps for committing (pushing?) to trunk >> and then getting those changes into 5x (well, maybe 6.0 by then) >> outlined... >> >> Or I'm off in the weeds here, always a possibility. >> >> FWIW, >> Erick >> >> >> >> On Sat, Jan 9, 2016 at 2:52 PM, Uwe Schindler <[email protected]> wrote: >> > Hi Mark, >> > >> > >> > >> > thanks for starting this! Looking forward to the whole process. When >> > Infra >> > is about to “activate” the new GIT repo, I will take care of Policeman >> > Jenkins and fix the remaining validation tasks. I don’t want to do this. >> > I >> > think your commit is fine. >> > >> > >> > >> > We now need some workflows how to merge between master/trunk and the >> > release >> > branches. Projects do this in different ways (cherry-picking,…). I have >> > no >> > preference or idea, sorry! I only know how to merge feature branches >> > into >> > master J >> > >> > >> > >> > You mentioned that we should make the old svn read only. Maybe do it >> > similar >> > like we did during LuSolr merge: Add a final commit removing everything >> > from >> > trunk/branch_5x and leaving a readme.txt file in trunk and branch_5x >> > pointing to Git. All other branches stay alive. After that we could make >> > it >> > read only – but it is not really needed. What do others think? >> > >> > >> > >> > Uwe >> > >> > >> > >> > ----- >> > >> > Uwe Schindler >> > >> > H.-H.-Meier-Allee 63, D-28213 Bremen >> > >> > http://www.thetaphi.de >> > >> > eMail: [email protected] >> > >> > >> > >> > From: Mark Miller [mailto:[email protected]] >> > Sent: Saturday, January 09, 2016 10:55 PM >> > To: java-dev <[email protected]> >> > Subject: Moving Lucene / Solr from SVN to Git >> > >> > >> > >> > We have done almost all of the work necessary for a move and I have >> > filed an >> > issue with INFRA. >> > >> > >> > >> > LUCENE-6937: Migrate Lucene project from SVN to Git. >> > >> > https://issues.apache.org/jira/browse/LUCENE-6937 >> > >> > >> > >> > INFRA-11056: Migrate Lucene project from SVN to Git. >> > >> > https://issues.apache.org/jira/browse/INFRA-11056 >> > >> > >> > >> > Everyone knows about rebase and linear history right ;) >> > >> > >> > >> > - Mark >> > >> > -- >> > >> > - Mark >> > >> > about.me/markrmiller >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] >> For additional commands, e-mail: [email protected] >> > -- > - Mark > about.me/markrmiller --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
