CSE 70, Spring 2010

Software Engineering

Lab Instructions

Apply a patch to your team repository.

First view Changeset 176 in the class-project Trac site. At the very bottom of the page you'll see a link labeled "Unified Diff"; save the file it links to (as changeset_r176.diff). It's what we call a "patch file" or a "diff". Look at its contents; notice how it describes differences between two versions of a file (potentially multiple files, though not in this case).

Apply the patch using the command-line program patch.

• In the trunk directory of your team's project, run patch -p3 < ../changeset_r176.diff.
  Notice that the switch -p3 tells patch to strip the prefix through the 3rd slash (/branches/sp10/) from the paths in the patch file, and the rest simply gives patch input from the file.
• You should see output like patching file src/edu/ucsd/cse70/ircclient/IRCClientWindow.java.
• Now try svn status and svn diff to see the changes that have been made to your working copy.
• Now run svn revert src/edu/ucsd/cse70/ircclient/IRCClientWindow.java and check again to see the changes have been reverted, so we can ...

Apply the patch using Eclipse.

• In your Eclipse package browser, right-click on your project root, select Team->Apply Patch..., and specify the patch file you saved earlier.
• At the "Review Patch" step you may need to adjust the "Ignore leading path name segments" or "Maximum fuzz factor" options (which correspond to the -p and -F command-line options to patch).
• Note you can double-click the "hunks" listed under "Patch Contents" to see a side-by-side comparison of the code before and after that change.
• Also note you can right-click on each hunk and specify whether to exclude or include it when applying the patch.
• When the patch is applied, go through the routine commit procedure, but using "layout patch" instead of a ticket number in your commit comment. Coordinate with your team to make sure the commit happens only once and everyone is able to update their working copy afterward.