Posting in the Magento forums has been disabled pending the implementation of a new and improved forum solution which should better serve the community.

For new questions please post at magento.stackexchange.com, the community-run support site for the Magento community. We will be providing updates on the new forum solution soon. For questions or concerns please email community@magento.com.

Magento Forum

svn merge with Magento’s subversion server? 
 
bcelenza
Member
 
Avatar
Total Posts:  44
Joined:  2008-08-27
 

As much as I’ve tried to avoid doing this, my project has required to make several minor revisions to the core source code (mostly event dispatches). As a result, upgrading Magento to new releases has become somewhat of a merge headache.

I’m wondering if there’s an easier way of doing this than downloading the source code from subversion and using a file merge tool to go line-by-line through each conflicting file. I believe svn merge would solve this problem, but I do not have access to the version history or revision numbers of magento’s server. Is this a service that is provided, or is there an easier way to merge new releases with modified code? Any ideas?

 
Magento Community Magento Community
Magento Community
Magento Community
 
g56h
Jr. Member
 
Total Posts:  1
Joined:  2008-08-25
 

You do realize that you are REQUIRED to share your core code changes to the public under Magento’s license, right? (that is unless you have a Magento commercial license).

People don’t realize this so I figured I’d bring this up.

 
Magento Community Magento Community
Magento Community
Magento Community
 
Anton Makarenko
Magento Team
 
Avatar
Total Posts:  184
Joined:  2008-05-13
Los Angeles, CA
 

AFAIK, this one http://svn.magentocommerce.com/source/branches/1.1 contains v 1.1.6 now and will contain 1.1.7 soon after it released.
So you can perform a checkout and then after the official new version is released, you’ll be able to run svn up.

We’re going to give patch files of changes for default theme templates of 1.1.6 against 1.1.7. I searched for the changes in such a way:
1) performed checkout of 1.1.6 into folder1 from http://svn.magentocommerce.com/source/branches/1.1
2) perforemed checkout of 1.1.7 into folder2 from trunk
3) performed export from folder2 to a folder3 of files i wanted to check for modifications
4) overwritten from folder3 to folder1
5) Now folder1 contains files with 1.1.7 and we can check for modifications against 1.1.6 using TortoiseSVN

 
Magento Community Magento Community
Magento Community
Magento Community
 
bcelenza
Member
 
Avatar
Total Posts:  44
Joined:  2008-08-27
 
Anton Makarenko - 19 November 2008 06:41 AM

AFAIK, this one http://svn.magentocommerce.com/source/branches/1.1 contains v 1.1.6 now and will contain 1.1.7 soon after it released.
So you can perform a checkout and then after the official new version is released, you’ll be able to run svn up.

We’re going to give patch files of changes for default theme templates of 1.1.6 against 1.1.7. I searched for the changes in such a way:
1) performed checkout of 1.1.6 into folder1 from http://svn.magentocommerce.com/source/branches/1.1
2) perforemed checkout of 1.1.7 into folder2 from trunk
3) performed export from folder2 to a folder3 of files i wanted to check for modifications
4) overwritten from folder3 to folder1
5) Now folder1 contains files with 1.1.7 and we can check for modifications against 1.1.6 using TortoiseSVN

We do keep a local history here in our own subversion repo, I just never thought to go about it like that!

Thanks smile

 
Magento Community Magento Community
Magento Community
Magento Community
 
spdaly
Jr. Member
 
Total Posts:  14
Joined:  2008-07-14
Cincinnati, OH
 

As I read it, the OSL 3.0 does not require Magento developers to redistribute Derivative Works back to the Community if those Works are not distributed externally.. 

OSL says that if we choose to externally distribute our Derivative Work we must do so under a OSL license and distribute our changes ("reciprocity").

 
Magento Community Magento Community
Magento Community
Magento Community
 
RoyRubin
Enthusiast
 
Avatar
Total Posts:  968
Joined:  2007-08-07
Los Angeles, CA
 

The OSL license does in fact specifically treat distribution over a network (ie. making your work available on the web) as a distribution. As such derivative works do need to be licensed under OSL and made publicly available. This blog post provides more information:

http://www.magentocommerce.com/blog/comments/magento-licensing-update/

I strongly suggest a commercial license if you intend to make derivative works and not distribute them back to the community. Not doing so puts your business at risk as it is not complying with Magento’s licensing.

 
Magento Community Magento Community
Magento Community
Magento Community
 
spdaly
Jr. Member
 
Total Posts:  14
Joined:  2008-07-14
Cincinnati, OH
 

Roy - Thanks for the quick response. 

I guess it comes down to the interpretation of External Deployment.  I stand corrected.

What is the method that Varien has adopted as acceptable redistribution of the Derivative Works? What falls in/out of the Original Work?  If we copy a base template to start our own template is that considered a Derivative Work??

I’ll review the licensing forum for the answers to the above questions.

Does the AFL 3.0 licensing change with the 1.1.7 release grandfather back to 1.1.6 users?

 
Magento Community Magento Community
Magento Community
Magento Community
 
RoyRubin
Enthusiast
 
Avatar
Total Posts:  968
Joined:  2007-08-07
Los Angeles, CA
 

Steve - let’s start a new thread with your post above in the licensing forum - I want to make sure the information is available to everyone in a central location. I’ll continue commenting at the new location smile

 
Magento Community Magento Community
Magento Community
Magento Community
 
scorxn
Jr. Member
 
Total Posts:  16
Joined:  2008-10-20
 

Legalities aside, for anyone with similar goals for merging via Subversion, see:

http://svnbook.red-bean.com/en/1.4/svn.advanced.vendorbr.html

I also found this blog series helpful (though it uses WordPress as an example):

http://techblog.touchbasic.com/html/using-subversion-with-wordpress-part-1-creating-vendor-branches-and-integrating-your-existing-code/
http://techblog.touchbasic.com/html/using-subversion-with-wordpress-part-2-maintaining-vendor-branches-and-upgrading-wp-core-files/

 
Magento Community Magento Community
Magento Community
Magento Community
Magento Community
Magento Community
Back to top