[wp-hackers] Switching from SVN

[scribu]

On Fri, Dec 10, 2010 at 3:01 PM, Mike Schinkel
<mikeschinkel at newclarity.net>wrote:

> On Dec 10, 2010, at 7:44 AM, Mike Little wrote:
> > If you are working on a fix for the current release, then you need to
> work
> > against the current stable *branch*.
>
> So does a *branch* different from the current release?  I'm as confused by
> all this as Otto is confused by Git.
>

Yes, it does.

The current release is under tags/3.0.3.

The stable branch is in branches/3.0.

At the moment, the 3.0 branch is identical to the 3.0.3 tag, because there
haven't been any commits made yet, but that's not always the case.

> I'm not sure what could be any simpler than the instructions here
> > http://wordpress.org/download/svn/
> >
> > There are  only 4 (svn) steps.
>
> It's not running SVN that is complex, it's getting the right code to run
> SVN against that can be complex.
>

A possible git workflow:

0. Clone the WP repo: git clone git://some-mirror-url.com/wordpress.git

1. Make some changes on the stable branch

2. Switch to dev branch (without loosing changes): git checkout development

3. Test changes and make patch: git format-patch > patch.diff

4. Switch back to stable branch: git checkout stable

Because you have the entire repo stored locally, switching branches is a
snap.

Of course, there are some catches, like a possible db-upgrade, which might
be harder to change back from.