Open Source Comes to Campus/Resources: Difference between revisions
imported>Paulproteus |
imported>Shauna No edit summary |
||
Line 15: | Line 15: | ||
* Slide 8 (#8 is titled 'Sharing changes: diff and patch') |
* Slide 8 (#8 is titled 'Sharing changes: diff and patch') |
||
* [[OSCTC_Resources#Diff_and_Patch_Demo | Diff and Patch Demo]] |
* [[OSCTC_Resources#Diff_and_Patch_Demo | Diff and Patch Demo]] |
||
* Slides 9- |
* Slides 9-11 (#11 is titled 'Issue Trackers') |
||
* [[OSCTC_Resources#Issue_Tracker_Demo | Issue Tracker Demo]] |
* [[OSCTC_Resources#Issue_Tracker_Demo | Issue Tracker Demo]] |
||
* Slide |
* Slide 12 (#12 is titled 'IRC') |
||
* [[OSCTC_Resources#IRC_Demo | IRC Demo]] |
* [[OSCTC_Resources#IRC_Demo | IRC Demo]] |
||
* Slides |
* Slides 13-19 |
||
=== Version Control Demo === |
=== Version Control Demo === |
Revision as of 19:35, 16 May 2013
What to expect as a staffer
Laptop Setup
Open Source Communication Tools
The slides I use for this talk can be found here. These are modified from a version graciously provided by Jessica McKellar. There are substantial notes in the ODP file which can be viewed by going to the "Notes" tab.
- Slides 1-7 (#7 is titled 'Version Control')
- Version Control Demo
- Slide 8 (#8 is titled 'Sharing changes: diff and patch')
- Diff and Patch Demo
- Slides 9-11 (#11 is titled 'Issue Trackers')
- Issue Tracker Demo
- Slide 12 (#12 is titled 'IRC')
- IRC Demo
- Slides 13-19
Version Control Demo
Go to the Wikipedia page for the host institution, e.g. http://en.wikipedia.org/wiki/Wellesley_College and http://en.wikipedia.org/w/index.php?title=Wellesley_College&action=history. The presenter of this talk will explore the page more thoroughly later.
I also suggest, while you are out of the ODP presentation, showing the German law Git repository as an example of version control for things other than code.
Diff and Patch Demo
This demo uses the files in this repository.
I have a To Do List! But maybe it needs editing. First, I'll make a copy to edit:
cp ToDoList new_ToDoList
Then I'll open it up and make changes to it. (Side note: make sure to explain which editor you're using and give options for those following along - emacs, vim, nano, or a GUI.)
How do I view the differences between the two?
diff -u ToDoList new_ToDoList
That's just printed to the command line, though. How do I store it in a file?
diff -u ToDoList new_ToDoList > changes.diff
I open up the file and see it contains the same stuff as was printed out before. Okay, now how do I apply these changes to the original list?
patch -p0 ToDoList < changes.diff
Note that the argument given to the patch is the file I want to modify, not the file that already has the changes.
People often ask - what does the argument "-u" given to diff mean, or the argument -p0 given to "patch"?
Well, -u tells diff to output in unified diff format. Two other formats are Edit script (specified with -e) and Context format (specified with -c).
-p[x] is an argument which allows the user to specify how much of the given file's path needs to be matched. -p0 gives the entire file name unmodified. The documentation has a bit more info.
Issue Tracker Demo
Pick a few random issue trackers, ideally ones which use different platforms, such as:
- OpenStates (google code)
- Bugzilla's tracker for Bugzilla (in bugzilla! ;) )
- Node (on Github)
Information to look for:
- status
- priority
- owner/assigned
- component/product
- summary/descriptor
- tags like "bite size"
IRC Demo
Log into IRC and join the #openhatch channel.
Forgot to install? Go here.
Show:
- how your name is highlighted if someone uses it
- how to do /me
- how to send messages to individual users
- different servers vs different channels (#openhatch on other servers might be empty)
- how to make a new channel, if asked
Introduction to the Command Line
--link to website?--
Introduction to Version Control
--Marina--
Github Demo
--Paul--
Ethics and History of Free Software
Typically this takes 20-30 minutes and takes place right before the Career panel.
The inspiration for the career panel comes partly from a past event, namely the first one (at Penn). After the main lecturer (Asheesh) gave a history tour in the lecture, students did Q&A with him and one other staffer. The main lecturer and the other staffer had similar but different opinions, which helped.
To deliver an equivalent lecture to what was given at at UMD or Wellesley College, follow the link to the full Ethics history talk.
Staying Involved
- Join our general mailing list.
- Join the alumni mailing list.
- Hang out with us on IRC.
- Training missions?
- Bug list?
- Meetups?
- Programs like GSoC and GNOME outreach.