[openib-general] git stuff

[Jeff Squyres]

In Tampa, we (can't remember who, excactly -- perhaps it was in the  
last few minutes of the meeting on Friday when we were standing  
around chatting before leaving for the airport?) discussed doing dry  
runs of all this stuff working up to the con call on 4 Dec and having  
a brief sync point on the con call before actually doing a final  
import for any parts of the SVN repo that were not already synced/ 
converted and then cutting over to git.

Does that sound like a good plan?



On Nov 27, 2006, at 10:15 AM, Woodruff, Robert J wrote:

> Tziporet wrote,
>
>> We indeed need this so we can update our daily build with the correct
>> git trees of each owner.
>
>> Tziporet
>
> Sasha from voltaire started importing the svn into git for the  
> userspace
> last week. I think we still need to sink the trees with the latest  
> from
> svn and then we can cut over to git for the userspace code.
> Sasha published this plan last week. I was able to clone all these  
> trees
> and get the userspace code to build and run OK, with a few minor  
> issues
> that I reported last week.
>
> -----Forwarded Message-----
>
> From: Sasha Khapyorsky <sashak at voltaire.com>
> To: Arlin Davis <ardavis at ichips.intel.com>, James Lentini
> <jlentini at netapp.com>, Hal Rosenstock <halr at voltaire.com>, Michael S.
> Tsirkin <mst at mellanox.co.il>, Vladimir Sokolovsky  
> <vlad at mellanox.co.il>,
> Christoph Raisch <raisch at de.ibm.com>, Hoang-Nam Nguyen
> <hnguyen at de.ibm.com>, Sean Hefty <sean.hefty at intel.com>, Robert Walsh
> <rjwalsh at pathscale.com>, Eitan Zahavi <eitan at mellanox.co.il>, Roland
> Dreier <rdreier at cisco.com>, Ishai Rabinovitz <ishai at mellanox.co.il>,
> Tziporet Koren <tziporet at mellanox.co.il>
> Cc: openib-general at openib.org
> Subject: userspace git trees for initial review
> Date: 20 Nov 2006 23:37:01 +0200
>
> Hi All,
>
> Due to plans to move OFA userspace sources to git I've prepared first
> cut
> of userspace projects trees converted to git (with git-svnimport).  
> It is
> now on the new OFA server staging.openfabrics.org and can be cloned:
>
>   git clone git://staging.openfabrics.org/~sashak/<project-name>
>
> Here is list of converted projects:
>
>   dapl
>   examples
>   ibutils
>   imgen
>   ipoibtools
>   libehca
>   libibcm
>   libipathverbs
>   librdmacm
>   libsdp
>   management
>   mstflint
>   perftest
>   srptools
>   tvflash
>   useraccess-lib
>
> Everything (except ibutils) was converted from gen2/*/src/userspace/.
> libibverbs and libmthca are not in the list because it is already
> converted by Roland and published on kernel.org.
>
> Also all is viewable via gitweb: http://staging.openfabrics.org/git- 
> try/
>
> Please note that those trees are converted from SVN repository located
> on the new OFA server which is slightly outdated against
> https://openib.org/svn. SVN repository will be synced this weekend and
> then we will be able to finish to git conversion.
>
>
> Maintainers,
>
> If somebody would like to convert his project by himself, please  
> let me
> know. If any help with such conversion is needed please let me know  
> too.
>
> Others, please clone and review your trees ('gitk --all' may be
> helpful).
> In case of any inconsistency please let me know. Especially  
> interesting
> part of review is history pruning in terms of branches and tags.
> Currently all trees have those branches (heads):
>
>   backport
>   backport-to-2.6.11
>   backport-to-2.6.9
>   ibat
>   ipath
>   iwarp
>   mellanox_fixes
>   mvapich-0.9.7
>   mvapich2-0.9.2
>   ofed_fixes
>   openib_candidate
>   openib-candidate
>   osm-1.8.0-merge
>   osm-pre-1.8.0
>   roland-merge
>   roland-uverbs
>   sdp_historic
>   shaharf-ibat
>   xen-mlx-branch
>   zcopy
>
> , and such tags:
>
>   libibverbs-1.0-rc3
>   libibverbs-1.0-rc5
>   libibverbs-1.0-rc7
>   libmthca-1.0-rc3
>   libmthca-1.0-rc5
>   libmthca-1.0-rc7
>   openib-1.0-rc1
>   openib-1.0-rc2
>   openib-1.0-rc4
>
> , which can be not needed for most userspace projects.
>
> Branches can be removed with 'git branch -D <branch-name>' and tags  
> with
> 'git tag -d <tag-name>'. After removing 'git prune' will clean up your
> repository (remove unreferenced objects). (Don't remove 'master' and
> 'origin' heads, also I guess most people will want to preserve  
> '1.0' and
> '1.1' branches).
>
> If somebody needs help, please let me know.
>
>
> I think final conversion would be done in follow steps:
>
> 1. At Saturday 25/11 SVN repository will be up to date on
>    staging.openfabrics.org
> 2. I will run incremental svn to git import and will publish converted
>    git trees at git://staging.openfabrics.org/~sashak/
> 3. The maintainers will clone and review their trees, will remove not
>    needed tags and branches and will prune the repositories
> 4. The maintainers will publish their trees at staging.openfabrics.org
>    (preferably at ~user/scm directories , so this will be  
> accessible as
>    git://staging.openfabrics.org/~user/<project-name>)
> 5. I will place symbolic links to maintainer's trees at /pub/scm , so
>    maintainer's trees will be visible via gitweb (and also  
> accessible by
>    git as git://staging.openfabrics.org/<project-name>)
>
> Any comments, suggestions, objections?
>
> Sasha


-- 
Jeff Squyres
Server Virtualization Business Unit
Cisco Systems