Sebastian - this will help! Hopefully Apache infra will also, as Github, understand svn commands in the future. Just a few less commands to type to do simple things :)
Thanks! Markus -----Original message----- > From:Sebastian Nagel <[email protected]> > Sent: Tuesday 1st March 2016 22:18 > To: [email protected] > Subject: Re: [NOTICE] Nutch now using Writeable Git repos at the ASF > > Hi Markus, > > > git push -u origin trunk > > Should be "master" instead of "trunk" after the git migration: > > git push -u origin master > > > What does origin and trunk mean? > > "master" is the default branche name equiv. to > "trunk" or "HEAD". Before "trunk" was the branch > name mirrored from Apache svn to github. > > "origin" is an alias for the remote repository > your local repository has been cloned from. To find > out how the alias is resolved: > > % git remote -v > origin https://git-wip-us.apache.org/repos/asf/nutch.git (fetch) > origin https://git-wip-us.apache.org/repos/asf/nutch.git (push) > > It's possible to have more remote repositories, e.g., > you could clone from github and then add the Apache git server > > % git remote add upstream_apache > https://git-wip-us.apache.org/repos/asf/nutch.git > > Then it might look like: > > % git remote -v > origin https://[email protected]/sebastian-nagel/nutch.git (fetch) > origin https://[email protected]/sebastian-nagel/nutch.git (push) > upstream https://github.com/apache/nutch.git (fetch) > upstream https://github.com/apache/nutch.git (push) > upstream_apache https://git-wip-us.apache.org/repos/asf/nutch.git (fetch) > upstream_apache https://git-wip-us.apache.org/repos/asf/nutch.git (push) > > Sebastian > > On 03/01/2016 04:42 PM, Markus Jelsma wrote: > > Ok, i have a directory called nutch/master. Only the master directory is in > > SCM. I understand git status and git diff to create patches for Jira. > > Consider a commit/push series of steps: > > > > git add file1 file2 > > > > git commit -m "message describing change." > > > > git push -u origin trunk > > > > I understand a local commit and push to central server, but. What does > > origin and trunk mean? I don't have a trunk anywhere right. Also, where is > > my large list of tags i used to have? confusing :) > > > > > > > > > > -----Original message----- > >> From:Mattmann, Chris A (3980) <[email protected]> > >> Sent: Friday 26th February 2016 17:39 > >> To: [email protected] > >> Cc: [email protected] > >> Subject: [NOTICE] Nutch now using Writeable Git repos at the ASF > >> > >> Hi Team, > >> > >> Nutch now officially uses Git to manage its source repos. You can > >> see the final elements to that here: > >> > >> https://issues.apache.org/jira/browse/INFRA-11300 > >> > >> > >> I’ve written a guide for the wiki describing how to migrate your > >> existing SVN checkout to Nutch if you are a user or a developer. > >> Please let us know if you find anything awry with the procedures > >> and/or checkout. > >> > >> https://wiki.apache.org/nutch/UsingGit > >> > >> Devs: having just gone through this for Tika and OODT, it should > >> be pretty seamless with the above guide. We may have some hiccups > >> that we have to work through on release, especially like Nexus > >> upload, but we can work through that as the RM on the next release. > >> > >> Thanks! > >> > >> Chees, > >> Chris > >> > >> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > >> Chris Mattmann, Ph.D. > >> Chief Architect > >> Instrument Software and Science Data Systems Section (398) > >> NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA > >> Office: 168-519, Mailstop: 168-527 > >> Email: [email protected] > >> WWW: http://sunset.usc.edu/~mattmann/ > >> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > >> Adjunct Associate Professor, Computer Science Department > >> University of Southern California, Los Angeles, CA 90089 USA > >> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > >> > >> > >> > >> > >
