01.02.2013 Views

Software Development Cross Solution - Index of - Free

Software Development Cross Solution - Index of - Free

Software Development Cross Solution - Index of - Free

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

3<br />

The fix is in<br />

the branch.<br />

...and commit our changes back in. This time, though, no conflicts:<br />

File Edit Window Help Sweet<br />

hfsd> svn commit src/headfirst/sd/chapter6/BeatBox.java -m “Fixed the<br />

critical security bug in 1.0 release.”<br />

Sending src\headfirst\sd\chapter6\BeatBox.java<br />

Committed revision 10.<br />

hfsd><br />

We have TWO code bases now<br />

With all these changes, we’ve actually got two different sets <strong>of</strong> code: the<br />

1.x branch, where fixes are made to Version 1.0, and the trunk, which has<br />

all the new development.<br />

Our trunk directory in the repository has the latest and greatest code<br />

that’s still in development (and Bob applied the security fix there, too).<br />

We have a version-1.0 tag in our tags directory so we can pull out<br />

Version 1.0 whenever we want.<br />

We have a version-1 branch in our branches directory that has all<br />

<strong>of</strong> our critical patches that have to go out as a 1.x version without any<br />

<strong>of</strong> the new development work.<br />

Download at WoweBook.Com<br />

version control<br />

Don’t forget: when you actually<br />

do release v1.1 with these<br />

patches, create a version-1.1 tag<br />

in the tags directory so you can<br />

get back to that version later if<br />

you have to.<br />

you are here 4 209

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!