Git and eZ Approve 2: checking in

My membership of the eZ Approve 2 project has been given the green light so as a follow up to my previous post Using Git with eZ Publish projects I can present the output of the commits back to the subversion repository.

$ git-svn dcommit
Authentication realm: eZ projects
Password for 'zabbie':
A design/standard/templates/node/view/plain.tpl
Committed r2501
M eventtypes/event/ezapprove2/ezapprove2type.php
Committed r2502
M classes/ezxapprovestatususerlink.php
Committed r2503
M collaboration/ezapprove2/ezapprove2collaborationhandler.php
Committed r2504
M collaboration/ezapprove2/ezapprove2collaborationhandler.php
Committed r2505
A design/standard/templates/node/view/plain.tpl
r2501 = e5a186160c1fab07a2894d180f932e3a6931b782 (git-svn)
M eventtypes/event/ezapprove2/ezapprove2type.php
r2502 = 43c5b3ba16bf4015ee8f9c2f2a1a9e4d4333972d (git-svn)
M classes/ezxapprovestatususerlink.php
r2503 = be6daf109a91319da0ee16c40b2344c0de18291d (git-svn)
M collaboration/ezapprove2/ezapprove2collaborationhandler.php
r2504 = 8113d8d1d58d92da6a4cee34c14b7d6db227ef86 (git-svn)
M collaboration/ezapprove2/ezapprove2collaborationhandler.php
r2505 = e9acd0e93e1c47dea1cd88a47b26e8b34a951552 (git-svn)
No changes between current HEAD and refs/remotes/git-svn
Resetting to the latest refs/remotes/git-svn


Checking the log of the subversion repository shows each of the local git commits as individual subversion commits along with there respective commit log messages.
$ svn log http://svn.projects.ez.no/ezapprove2 | head -n 30
------------------------------------------------------------------------
r2505 | zabbie | 2008-03-03 10:09:47 +1000 (Mon, 03 Mar 2008) | 2 lines

Fix for placement of a previously unpublished object that is edited

------------------------------------------------------------------------
r2504 | zabbie | 2008-03-03 10:09:37 +1000 (Mon, 03 Mar 2008) | 2 lines

Fixed method definitions to match eZCollaborationItemHandler to stop strict messages

------------------------------------------------------------------------
r2503 | zabbie | 2008-03-03 10:09:26 +1000 (Mon, 03 Mar 2008) | 2 lines

Corrected typo in const for role approver

------------------------------------------------------------------------
r2502 | zabbie | 2008-03-03 10:09:18 +1000 (Mon, 03 Mar 2008) | 2 lines

Typo in const

------------------------------------------------------------------------
r2501 | zabbie | 2008-03-03 10:09:06 +1000 (Mon, 03 Mar 2008) | 2 lines

fixed "Placed in:" for items previously unpublished

------------------------------------------------------------------------
r2500 | tw | 2008-01-15 02:15:14 +1000 (Tue, 15 Jan 2008) | 1 line

- Fixed missing static in ezinfo.php
------------------------------------------------------------------------
r2499 | (no author) | 2008-01-15 00:37:38 +1000 (Tue, 15 Jan 2008) | 1 line


For all intents and purposes it's undetectable the other repository users that anything out of the ordinary has gone on.

A couple of the comments to the previous post pointed out alternatives to git:
I don't have the inclination to check them all out, especially given that git meets my requirements.

If you want some more info Dave Dribin has a couple of blog posts that contain a review of Git, Bazzar & Mercurial, and a explanation as to why he choose Mercurial. Dave says that in the end it was a gut choice and that for projects where "I still have to use Subversion, I will be using git-svn".

Comments

Post a Comment

Popular posts from this blog

eZ Publish Admin Prototype extension

Following on from yesterdays post on checking out the eZ Admin Interface prototype I've created an extension that can be easily downloaded, installed and enabled. Download the extension from here Copy to your extension directory and untar: tar xzf admin2prototype.tgz Enable it in your admin siteaccess by editing settings/siteaccess/site_admin/site.ini.append.php and adding: [ExtensionSettings] ActiveAccessExtensions[]=admin2prototype Clear the cache To disable, simply remove the settings from step 3 above and clear the cache. Note: If you enable the extension via the admin interface (Setup -> Extensions) this will effect all site accesses including your front end ones.  Things to check out in the prototype: Lack of Shop and Design tabs - these are disabled by default in eZ Publish 4.3 Hidden right menu. Click on the [+] to expand Content menu (Left Hand side under Content, Users & Media Tabs) can be variably sized. Grab the bottom right hand corner an
Read more

eZ Publish Admin redesign - Dashboard = OpenSocial?

Image
In the preface to the current Admin interface specification the last paragraph caught my eye: A overview of user task need a dashboard , where she can follow here own content, approval and other tasks she might do on a regular basis. I recently saw a demo of the latest version of the bug tracking system JIRA 4.0 by Atlassian . It used an OpenSocial dashboard to allow users to customise their homepage to access and interact with information that was important to them.  The system not only displays JIRA widgets but any OpenSocial widgets (and those from other Atlassian products ). You can check out a video of it in action here and more information on how Atlassian is using OpenSocial here . What is OpenSocial? From the official site: OpenSocial defines a common API for social applications across multiple websites. With standard JavaScript and HTML, developers can create apps that access a social network's friends and update feeds. Google personal home page is an example o
Read more

eZ Publish 5 Virtual Machine

One of the most common issues of newcomers to eZ Publish is the setup of a system suitable for running it. Without a correctly configured system in place they usually do not get beyond the installation process and abandon their evaluation before having experienced the product.  The eZ Publish puppet module is an attempt to codify the requirements  for running eZ Publish and provide a means for automatically creating a system suitable for running it - no more following a checklist of "setting up eZ Publish on XYZ". The eZ Publish 5 Virtual Machine can be found on github at  https://github.com/brucem/vagrant-puppet-ezpublish .   It combines Vagrant, VirtualBox & Puppet to generate a VM with the current eZ Publish community version (2013.4) installed and ready to be configured. The README.md  provides details of the requirements and how to use it. Vagrant is a system that  orchestrates the automatic creation and configuration of systems. It has been used to d
Read more