Open MPI logo

Hardware Locality Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Hardware Locality Development mailing list

Subject: Re: [hwloc-devel] [hwloc-svn] svn:hwloc r4825 - in branches/components: . doc src
From: Jeff Squyres (jsquyres_at_[hidden])
Date: 2012-09-11 16:33:35


Cool. :-)

On Sep 11, 2012, at 3:54 PM, Brice Goglin wrote:

> Looks like git-svn can now merge svn branches properly (without losing
> mergeinfo).
> You set svn.pushmergeinfo=true is your .git/config and things just work.
>
> If I understand the doc correctly, two things to check before using this:
> * dcommit all local changes (in all involved branches) before merging
> * both branches need new commits since the last merge to make this work
> (don't want a fast-forward)
>
> I assume that this won't work for backports with git cherry-pick (we'd
> have to pass --mergeinfo=... to git svn dcommit)
>
> Brice
>
>
>
> Le 11/09/2012 13:29, svn-commit-mailer_at_[hidden] a écrit :
>> Author: bgoglin (Brice Goglin)
>> Date: 2012-09-11 07:29:01 EDT (Tue, 11 Sep 2012)
>> New Revision: 4825
>> URL: https://svn.open-mpi.org/trac/hwloc/changeset/4825
>>
>> Log:
>> Merge trunk up to r4824 into components branch
>>
>> This is an attempt to svn merge with git merge and svn.pushmergeinfo=true
>> Let's see if mergeinfos are correctly updated.
>>
>> Properties modified:
>> branches/components/ (props changed)
>> Text files modified:
>> branches/components/doc/Makefile.am | 8 +++++++-
>> branches/components/src/topology.c | 2 +-
>> 2 files changed, 8 insertions(+), 2 deletions(-)
>>
>> Modified: branches/components/doc/Makefile.am
>> ==============================================================================
>> --- branches/components/doc/Makefile.am Tue Sep 11 07:22:08 2012 (r4824)
>> +++ branches/components/doc/Makefile.am 2012-09-11 07:29:01 EDT (Tue, 11 Sep 2012) (r4825)
>> @@ -227,6 +227,9 @@
>> # in _DATA suffix names, because AM won't allow us to do things like
>> # man3_extra_MANS = ...group...
>>
>> +# When adding a new _DATA line below, remember to add it to the
>> +# list of dependencies too.
>> +
>> man3_MANS = \
>> $(DOX_MAN_DIR)/man3/hwlocality_api_version.3 \
>> $(DOX_MAN_DIR)/man3/HWLOC_API_VERSION.3 \
>> @@ -667,6 +670,8 @@
>> # *first* before we can try to process/install man pages, the HTML,
>> # run pdflatex, .etc.).
>>
>> +# The list below should match the list of _DATA lines above
>> +
>> $(man3_MANS): $(DOX_TAG)
>> $(man3_topology_DATA): $(DOX_TAG)
>> $(man3_sets_DATA): $(DOX_TAG)
>> @@ -674,6 +679,7 @@
>> $(man3_objects_DATA): $(DOX_TAG)
>> $(man3_creation_DATA): $(DOX_TAG)
>> $(man3_configuration_DATA): $(DOX_TAG)
>> +$(man3_xmlexport_DATA): $(DOX_TAG)
>> $(man3_tinker_DATA): $(DOX_TAG)
>> $(man3_information_DATA): $(DOX_TAG)
>> $(man3_traversal_DATA): $(DOX_TAG)
>> @@ -685,8 +691,8 @@
>> $(man3_helper_types_DATA): $(DOX_TAG)
>> $(man3_helper_traversal_basic_DATA): $(DOX_TAG)
>> $(man3_helper_find_inside_DATA): $(DOX_TAG)
>> -$(man3_helper_find_coverings_DATA): $(DOX_TAG)
>> $(man3_helper_find_covering_DATA): $(DOX_TAG)
>> +$(man3_helper_find_coverings_DATA): $(DOX_TAG)
>> $(man3_helper_find_cache_DATA): $(DOX_TAG)
>> $(man3_helper_traversal_DATA): $(DOX_TAG)
>> $(man3_helper_binding_DATA): $(DOX_TAG)
>>
>> Modified: branches/components/src/topology.c
>> ==============================================================================
>> --- branches/components/src/topology.c Tue Sep 11 07:22:08 2012 (r4824)
>> +++ branches/components/src/topology.c 2012-09-11 07:29:01 EDT (Tue, 11 Sep 2012) (r4825)
>> @@ -381,7 +381,7 @@
>> *** CHECKING ITS CORRECTNESS!
>> *************************************************************
>> */
>> -static unsigned obj_type_order[] = {
>> +static const unsigned obj_type_order[] = {
>> /* first entry is HWLOC_OBJ_SYSTEM */ 0,
>> /* next entry is HWLOC_OBJ_MACHINE */ 1,
>> /* next entry is HWLOC_OBJ_NODE */ 3,
>> _______________________________________________
>> hwloc-svn mailing list
>> hwloc-svn_at_[hidden]
>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-svn
>
>
> _______________________________________________
> hwloc-devel mailing list
> hwloc-devel_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel

-- 
Jeff Squyres
jsquyres_at_[hidden]
For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/