Hmm.  That looks like a merge gone bad; I'm not sure what happened there.  It 
could well be an artifact of traversing from 1.5 to 1.4, or something like 
that.  

I would not re-remove these files.


On Jan 17, 2011, at 11:11 AM, Pascal Deveze wrote:

> Jeff,
> 
> You removed the following files 
> (https://bitbucket.org/devezep/new-romio-for-openmpi/changeset/9b8f70de722d). 
> I see that they are in the trunk. Shall I remove them again ?
> 
> HACKING
> config/Makefile.options
> config/libltdl-preopen-error.diff
> config/lt224-icc.diff
> config/mca_acinclude.m4
> config/mca_configure.ac
> config/mca_make_configure.pl
> config/ompi_check_libfca.m4
> config/ompi_ensure_contains_optflags.m4
> config/ompi_ext.m4
> config/ompi_microsoft.m4
> config/ompi_setup_component_package.m4
> config/ompi_strip_optflags.m4
> contrib/check_unnecessary_headers.sh
> contrib/code_counter.pl
> contrib/copyright.pl
> contrib/dist/find-copyrights.pl
> contrib/dist/gkcommit.pl
> contrib/dist/linux/README
> contrib/dist/linux/README.ompi-spec-generator
> contrib/dist/linux/buildrpm.sh
> contrib/dist/linux/buildswitcherrpm.sh
> contrib/dist/linux/ompi-spec-generator.py
> contrib/dist/linux/openmpi-switcher-modulefile.spec
> contrib/dist/linux/openmpi-switcher-modulefile.tcl
> contrib/dist/make-authors.pl
> contrib/dist/make_tarball
> contrib/find_occurence.pl
> contrib/find_offenders.pl
> contrib/fix_headers.pl
> contrib/fix_indent.pl
> contrib/gen_stats.pl
> contrib/generate_file_list.pl
> contrib/header_replacement.sh
> contrib/headers.txt
> contrib/hg/build-hgignore.pl
> contrib/hg/set-hg-share-perms.csh
> contrib/nightly/build_sample_config.txt
> contrib/nightly/build_tarball.pl
> contrib/nightly/build_tests.pl
> contrib/nightly/check_devel_headers.pl
> contrib/nightly/create_tarball.sh
> contrib/nightly/illegal_symbols_report.pl
> contrib/nightly/ompi_cronjob.sh
> contrib/nightly/unimplemented_report.sh
> contrib/ompi_cplusplus.sed
> contrib/ompi_cplusplus.sh
> contrib/ompi_cplusplus.txt
> contrib/platform/cisco/ebuild/hlfr
> contrib/platform/cisco/ebuild/hlfr.conf
> 
> 
> Pascal Deveze a écrit :
>> The bitbucket tree (https://bitbucket.org/devezep/new-romio-for-openmpi) has 
>> just been updated with the open-mpi trunk.
>> 
>> 
>> I have made three patches:
>> 
>> hg out
>> comparing with ssh://h...@bitbucket.org/devezep/new-romio-for-openmpi
>> searching for changes
>> changeset:   25:3e677102a125
>> user:        Pascal Deveze <pascal.dev...@bull.net>
>> date:        Mon Jan 17 13:40:10 2011 +0100
>> summary:     Remove all files
>> 
>> changeset:   26:e3989f46f83a
>> user:        Pascal Deveze <pascal.dev...@bull.net>
>> date:        Mon Jan 17 14:46:48 2011 +0100
>> summary:     Import from http://svn.open-mpi.org/svn/ompi/trunki (r24256)
>> 
>> changeset:   27:97f54ec8a575
>> tag:         tip
>> user:        Pascal Deveze <pascal.dev...@bull.net>
>> date:        Mon Jan 17 16:14:06 2011 +0100
>> summary:     New Romio
>> 
>> I have tested the result and the ROMIO tests are OK.
>> 
>> 
>> _______________________________________________
>> devel mailing list
>> de...@open-mpi.org
>> http://www.open-mpi.org/mailman/listinfo.cgi/devel
>> 
>> 
>> 
> 
> 
> _______________________________________________
> devel mailing list
> de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/devel


-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/


Reply via email to