[wp-hackers] Switching from SVN

[Curtis McHale]

For me the mental block with SVN stems from not using it (as previously 
stated). I suppose I just need to break down and learn/use it for a 
project and then weigh in with a more balanced opinion. Just as someone 
else stated others needed to do with their Git experience.

> ------------------------------------------------------------------------
>
> 	Mike Schinkel <mailto:mikeschinkel at newclarity.net>
> December 10, 2010 6:40 AM
>
>
>
> Thanks for the attempt. I've got the printed copy of the book, have 
> read it, and still don't get it. I guess it's just a mental block for 
> me. I get that way for some things.
>
> -Mike
> _______________________________________________
> wp-hackers mailing list
> wp-hackers at lists.automattic.com
> http://lists.automattic.com/mailman/listinfo/wp-hackers
> ------------------------------------------------------------------------
>
> 	Mike Schinkel <mailto:mikeschinkel at newclarity.net>
> December 10, 2010 5:23 AM
>
>
> On Dec 10, 2010, at 8:16 AM, scribu wrote:
>> 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.
>
> So with SVN I still have the issue I described; assuming I don't want to break my project by installing not released code I still have to set up another install in order to generate a patch, right?
>
>> 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
>
> And so for the scenario I described Git doesn't allow me to make "patches" to the released code (vs. a branch) any more than SVN, right?
>
> -Mike
> _______________________________________________
> wp-hackers mailing list
> wp-hackers at lists.automattic.com
> http://lists.automattic.com/mailman/listinfo/wp-hackers
> ------------------------------------------------------------------------
>
> 	scribu <mailto:mail at scribu.net>
> December 10, 2010 5:16 AM
>
>
> 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.
> _______________________________________________
> wp-hackers mailing list
> wp-hackers at lists.automattic.com
> http://lists.automattic.com/mailman/listinfo/wp-hackers
> ------------------------------------------------------------------------
>
> 	Mike Schinkel <mailto:mikeschinkel at newclarity.net>
> December 10, 2010 5:01 AM
>
>
> 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.
>
>> 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.
>
> -Mike
> _______________________________________________
> wp-hackers mailing list
> wp-hackers at lists.automattic.com
> http://lists.automattic.com/mailman/listinfo/wp-hackers
> ------------------------------------------------------------------------
>
> 	Mike Little <mailto:wordpress at zed1.com>
> December 10, 2010 4:44 AM
>
>
> Mike,
> If you are working on a fix for the current release, then you need to work
> against the current stable *branch*.
> In the instructions here http://wordpress.org/download/svn/ (mentioned in
> one of the answers to your question the checkout would be
>
> svn co http://core.svn.wordpress.org/branches/3.0
>
> Make sure to indicate that your patch is against the branch when you 
> submit
> it.
>
> I'm not sure what could be any simpler than the instructions here
> http://wordpress.org/download/svn/
>
> There are only 4 (svn) steps.
>
> The only ones missing are 'do an svn revert and svn up' when you want to
> start on the next piece of work.
>
>
>
> Mike

-- 
Curtis McHale
SFNdesign
604.751.3482
http://curtismchale.ca
http://twitter.com/curtismchale
http://ca.linkedin.com/in/curtismchale