From 1a69e2bb31d5ef022473edbb0c57c576a01cd04d Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Thu, 9 May 2024 21:50:08 -0700 Subject: [PATCH] Added new results --- .../combined/merges_analyzer_histograms.pdf | Bin 213437 -> 213437 bytes .../combined/merges_tested/helun/ektorp.csv | 2 +- .../merges_tested/javaparser/javaparser.csv | 2 +- .../merges_tested/jenkinsci/deploy-plugin.csv | 2 +- .../merges_tested/openhft/chronicle-bytes.csv | 2 +- .../combined/merges_timed/47deg/firebrand.csv | 2 +- .../9apps/elasticsearch-cloudwatch.csv | 2 +- .../merges_timed/ab0oo/javaprslib.csv | 2 +- .../combined/merges_timed/abel533/echarts.csv | 2 +- .../merges_timed/acciente/oacc-core.csv | 2 +- .../merges_timed/accla/d4m_api_java.csv | 2 +- results/combined/merges_timed/adamd/z.csv | 2 +- results/combined/merges_timed/adangel/pmd.csv | 2 +- .../combined/merges_timed/addthis/meshy.csv | 2 +- .../merges_timed/addthis/stream-lib.csv | 2 +- .../merges_timed/adoptopenjdk/mjprof.csv | 2 +- .../aerogear/aerogear-crypto-java.csv | 2 +- .../aerospike/aerospike-client-java.csv | 2 +- .../afranken/jmeter-analysis-maven-plugin.csv | 2 +- .../merges_timed/ahmetaa/zemberek-nlp.csv | 2 +- .../merges_timed/ahome-it/lienzo-core.csv | 2 +- .../aleksandr-m/gitflow-maven-plugin.csv | 2 +- .../kickstart-springjerseyhibernate.csv | 2 +- .../elasticsearch-maven-plugin.csv | 2 +- .../merges_timed/alexruiz/fest-util.csv | 2 +- .../merges_timed/alexxiyang/shiro-redis.csv | 2 +- .../combined/merges_timed/alibaba/canal.csv | 2 +- .../merges_timed/alibaba/easyexcel.csv | 2 +- .../allan-huang/remote-procedure-call.csv | 2 +- .../allanbank/mongodb-async-driver.csv | 2 +- .../merges_timed/amplafi/htmlcleaner.csv | 2 +- ...ringboot-angular-atmosphere-quickstart.csv | 2 +- .../andresoviedo/google-drive-ftp-adapter.csv | 2 +- .../andrewphorn/classicube-client.csv | 2 +- .../merges_timed/andygibson/datafactory.csv | 2 +- results/combined/merges_timed/anjuke/hwi.csv | 2 +- .../merges_timed/antlr/grammars-v4.csv | 2 +- .../combined/merges_timed/apache/accumulo.csv | 2 +- results/combined/merges_timed/apache/avro.csv | 2 +- .../combined/merges_timed/apache/cayenne.csv | 2 +- .../merges_timed/apache/commons-bcel.csv | 2 +- .../merges_timed/apache/commons-beanutils.csv | 2 +- .../merges_timed/apache/commons-codec.csv | 2 +- .../apache/commons-collections.csv | 2 +- .../merges_timed/apache/commons-csv.csv | 2 +- .../merges_timed/apache/commons-dbcp.csv | 2 +- .../merges_timed/apache/commons-email.csv | 2 +- .../apache/commons-fileupload.csv | 2 +- .../merges_timed/apache/commons-imaging.csv | 2 +- .../merges_timed/apache/commons-io.csv | 2 +- .../merges_timed/apache/commons-jexl.csv | 2 +- .../merges_timed/apache/commons-lang.csv | 2 +- .../merges_timed/apache/commons-math.csv | 2 +- .../merges_timed/apache/commons-net.csv | 2 +- .../merges_timed/apache/commons-ognl.csv | 2 +- .../merges_timed/apache/commons-pool.csv | 2 +- .../merges_timed/apache/commons-validator.csv | 2 +- .../merges_timed/apache/directory-kerby.csv | 2 +- results/combined/merges_timed/apache/fop.csv | 2 +- .../merges_timed/apache/geronimo-specs.csv | 2 +- .../merges_timed/apache/incubator-tamaya.csv | 2 +- .../apache/jackrabbit-filevault.csv | 2 +- .../merges_timed/apache/jackrabbit.csv | 2 +- .../merges_timed/apache/james-mime4j.csv | 2 +- .../merges_timed/apache/maven-enforcer.csv | 2 +- .../apache/maven-plugin-tools.csv | 2 +- .../merges_timed/apache/metamodel.csv | 2 +- .../merges_timed/apache/olingo-odata2.csv | 2 +- .../merges_timed/apache/olingo-odata4.csv | 2 +- .../combined/merges_timed/apache/opennlp.csv | 2 +- .../combined/merges_timed/apache/roller.csv | 2 +- .../combined/merges_timed/apache/shiro.csv | 2 +- .../apache/tomcat-maven-plugin.csv | 2 +- .../merges_timed/appendium/flatpack.csv | 2 +- .../merges_timed/appstatus/appstatus.csv | 2 +- .../arcbees/arcbees-archetypes.csv | 2 +- .../merges_timed/arcbees/gwtchosen.csv | 2 +- .../arcbees/universal-analytics.csv | 2 +- .../selenium-standalone-server-plugin.csv | 2 +- .../merges_timed/arimus/jmimemagic.csv | 2 +- results/combined/merges_timed/arnim/hdp.csv | 2 +- .../kafka-http-metrics-reporter.csv | 2 +- .../arquillian/arquillian-container-jetty.csv | 2 +- .../merges_timed/arturmkrtchyan/iban4j.csv | 2 +- .../merges_timed/asciidoctor/asciidoclet.csv | 2 +- .../merges_timed/aseldawy/spatialhadoop2.csv | 2 +- .../merges_timed/astefanutti/metrics-cdi.csv | 2 +- .../merges_timed/astrapi69/jaulp.wicket.csv | 2 +- .../combined/merges_timed/ata4/disunity.csv | 2 +- .../combined/merges_timed/atam4j/atam4j.csv | 2 +- .../combined/merges_timed/athou/commafeed.csv | 2 +- .../atmosphere/atmosphere-extensions.csv | 2 +- .../merges_timed/atorstling/bychan.csv | 2 +- .../merges_timed/attoparser/attoparser.csv | 2 +- .../merges_timed/augustt198/lumen.csv | 2 +- .../aurbroszniowski/rainfall-core.csv | 2 +- .../combined/merges_timed/auth0/java-jwt.csv | 2 +- .../avaje-common/avaje-agentloader.csv | 2 +- .../merges_timed/awaisathar/dependensee.csv | 2 +- .../merges_timed/awaitility/awaitility.csv | 2 +- .../aweber/rabbitmq-flume-plugin.csv | 2 +- .../aws/aws-cloudtrail-processing-library.csv | 2 +- .../awslabs/amazon-kinesis-client.csv | 2 +- .../awslabs/amazon-sqs-java-messaging-lib.csv | 2 +- .../merges_timed/awslabs/dynamodb-geo.csv | 2 +- .../awslabs/kinesis-log4j-appender.csv | 2 +- ...azure-activedirectory-library-for-java.csv | 2 +- .../merges_timed/b/kafka-websocket.csv | 2 +- .../merges_timed/barend/java-iban.csv | 2 +- .../merges_timed/basho/riak-java-client.csv | 2 +- .../merges_timed/bastillion-io/bastillion.csv | 2 +- .../merges_timed/bazhenov/load-test-tool.csv | 2 +- .../merges_timed/beastmachine/ggplot.csv | 2 +- .../bedatadriven/jackson-datatype-jts.csv | 2 +- .../merges_timed/benas/easy-rules.csv | 2 +- .../combined/merges_timed/benas/projector.csv | 2 +- .../merges_timed/benoker/dockingframes.csv | 2 +- .../combined/merges_timed/bguerout/jongo.csv | 2 +- .../biezhi/30-seconds-of-java8.csv | 2 +- .../merges_timed/bitletorg/weupnp.csv | 2 +- .../merges_timed/bitzeche/zencoder-java.csv | 2 +- .../bjornharrtell/jts2geojson.csv | 2 +- .../blockchain/api-v1-client-java.csv | 2 +- .../bluebreezecf/sparkjobserverclient.csv | 2 +- .../merges_timed/bobharner/componentworld.csv | 2 +- results/combined/merges_timed/boilit/ebm.csv | 2 +- .../merges_timed/brettflan/worldborder.csv | 2 +- .../brettwooldridge/hikarijson.csv | 2 +- .../brettwooldridge/nuprocess.csv | 2 +- .../merges_timed/brettwooldridge/sansorm.csv | 2 +- .../brettwooldridge/sparsebitset.csv | 2 +- .../brewinapps/ios-maven-plugin.csv | 2 +- .../merges_timed/brianm/config-magic.csv | 2 +- .../combined/merges_timed/brianm/jdbi3.csv | 2 +- .../really-executable-jars-maven-plugin.csv | 2 +- .../merges_timed/brndnmtthws/hdfs.csv | 2 +- .../broadleafcommerce/broadleafcommerce.csv | 2 +- .../merges_timed/bronx/saci-vraptor.csv | 2 +- .../brooklyncentral/brooklyn-ambari.csv | 2 +- .../merges_timed/brooklyncentral/clocker.csv | 2 +- .../merges_timed/brunoribeiro/sql-parser.csv | 2 +- .../merges_timed/bryncooke/cdi-unit.csv | 2 +- .../merges_timed/bsblabs/embed-for-vaadin.csv | 2 +- .../combined/merges_timed/bserdar/jcliff.csv | 2 +- .../merges_timed/btrplace/scheduler.csv | 2 +- .../buddycloud/buddycloud-server-java.csv | 2 +- .../merges_timed/bujiio/buji-pac4j.csv | 2 +- .../buschmais/extended-objects.csv | 2 +- .../merges_timed/bytedeco/javacpp.csv | 2 +- .../merges_timed/caelum/vraptor-console.csv | 2 +- .../caelum/vraptor-environment.csv | 2 +- .../merges_timed/campagnelaboratory/metar.csv | 2 +- .../camsys/onebusaway-application-modules.csv | 2 +- .../camunda/camunda-archetypes.csv | 2 +- .../camunda/camunda-bpm-mockito.csv | 2 +- .../merges_timed/carbonado/carbonado.csv | 2 +- .../merges_timed/carlossg/glacier-cli.csv | 2 +- .../merges_timed/cdi-spec/cdi-tck.csv | 2 +- results/combined/merges_timed/cglib/cglib.csv | 2 +- .../merges_timed/chargebee/chargebee-java.csv | 2 +- .../combined/merges_timed/chat-wane/lseq.csv | 2 +- .../merges_timed/chrisvest/stormpot.csv | 2 +- .../merges_timed/chrsan/css-selectors.csv | 2 +- .../cinovo/cloudconductor-server.csv | 2 +- .../merges_timed/circuitsoftgroup/slackmc.csv | 2 +- .../merges_timed/citysearch/web-widgets.csv | 2 +- .../citytechinc/cq-component-maven-plugin.csv | 2 +- .../merges_timed/cjwizard/cjwizard.csv | 2 +- .../combined/merges_timed/clickntap/vimeo.csv | 2 +- .../combined/merges_timed/clojure/clojure.csv | 2 +- .../cloudfoundry/cf-java-client.csv | 2 +- .../merges_timed/cloudslab/cloudsim.csv | 2 +- .../merges_timed/cloudslang/score.csv | 2 +- .../clusterbench/clusterbench.csv | 2 +- .../merges_timed/code4craft/termblog.csv | 2 +- .../merges_timed/code4craft/webmagic.csv | 2 +- .../codecentric/jmeter-graph-maven-plugin.csv | 2 +- .../merges_timed/codedance/silken.csv | 2 +- .../merges_timed/codeine-cd/codeine.csv | 2 +- .../codelibs/elasticsearch-dataformat.csv | 2 +- .../codelibs/elasticsearch-dynarank.csv | 2 +- .../codelibs/elasticsearch-reindexing.csv | 2 +- .../codingpedia/demo-rest-jersey-spring.csv | 2 +- .../cognifide/sling-dynamic-include.csv | 2 +- .../cognitect-labs/transducers-java.csv | 2 +- .../merges_timed/cognitect/transit-java.csv | 2 +- .../comatoes/ftl-profile-editor.csv | 2 +- .../combined/merges_timed/comcast/jrugged.csv | 2 +- .../merges_timed/commons-rdf/commons-rdf.csv | 2 +- .../merges_timed/connorlinfoot/cratesplus.csv | 2 +- .../merges_timed/conveyal/osm-lib.csv | 2 +- .../merges_timed/corentin59/artnetstack.csv | 2 +- .../combined/merges_timed/corfudb/corfudb.csv | 2 +- .../merges_timed/couchbase/couchbasemock.csv | 2 +- .../merges_timed/coutume/imageonmap.csv | 2 +- .../coverity/coverity-security-library.csv | 2 +- .../cowtowncoder/java-classmate.csv | 2 +- .../cowtowncoder/java-merge-sort.csv | 2 +- .../cowtowncoder/java-uuid-generator.csv | 2 +- .../merges_timed/craigwblake/redline.csv | 2 +- .../merges_timed/creswick/cjwizard.csv | 2 +- .../java-mandrill-wrapper.csv | 2 +- .../merges_timed/cternes/openkeepass.csv | 2 +- .../merges_timed/ctran/tinyradius.csv | 2 +- .../merges_timed/dabsquared/gitlab-plugin.csv | 2 +- .../combined/merges_timed/dakusui/jcunit.csv | 2 +- .../danielflower/maven-gitlog-plugin.csv | 2 +- .../merges_timed/danielgronau/highj.csv | 2 +- .../danielnorberg/auto-matter.csv | 2 +- .../merges_timed/dankurka/gwtphonegap.csv | 2 +- .../combined/merges_timed/dankurka/mgwt.csv | 2 +- .../merges_timed/darcy-framework/darcy-ui.csv | 2 +- .../datanucleus/datanucleus-core.csv | 2 +- .../datanucleus/datanucleus-rdbms.csv | 2 +- .../merges_timed/datasift/datasift-java.csv | 2 +- .../merges_timed/datastax/java-driver.csv | 2 +- .../datumbox/datumbox-framework.csv | 2 +- .../davidb/scala-maven-plugin.csv | 2 +- .../combined/merges_timed/davidmoten/geo.csv | 2 +- .../merges_timed/davidmoten/rtree.csv | 2 +- .../merges_timed/davidmoten/rxjava-extras.csv | 2 +- .../merges_timed/davidmoten/rxjava-file.csv | 2 +- .../merges_timed/davidmoten/rxjava-jdbc.csv | 2 +- .../merges_timed/davidmoten/rxjava-slf4j.csv | 2 +- .../combined/merges_timed/dbaeli/conf4j.csv | 2 +- .../combined/merges_timed/dbaeli/ez18n.csv | 2 +- .../dblock/jenkins-ansicolor-plugin.csv | 2 +- results/combined/merges_timed/dblock/oshi.csv | 2 +- .../combined/merges_timed/dcm4che/dcm4che.csv | 2 +- .../merges_timed/deathmarine/luyten.csv | 2 +- .../combined/merges_timed/deemopen/zkui.csv | 2 +- .../merges_timed/dennisjzh/gwtmobile-ui.csv | 2 +- .../merges_timed/dfabulich/sitemapgen4j.csv | 2 +- .../combined/merges_timed/dgarijo/widoco.csv | 2 +- .../merges_timed/dgradecak/alfresco-mvc.csv | 2 +- .../merges_timed/dieselpoint/norm.csv | 2 +- .../digidotcom/xbeejavalibrary.csv | 2 +- .../digital-preservation/droid.csv | 2 +- .../combined/merges_timed/dius/java-faker.csv | 2 +- .../merges_timed/dkunzler/esperandro.csv | 2 +- .../merges_timed/docopt/docopt.java.csv | 2 +- .../merges_timed/doctau/garbagecat.csv | 2 +- .../merges_timed/documents4j/documents4j.csv | 2 +- .../merges_timed/douglasrodrigo/bfmapper.csv | 2 +- .../merges_timed/dozedoff/similarimage.csv | 2 +- .../driesschulten/dozer-model.csv | 2 +- .../droolsjbpm/droolsjbpm-knowledge.csv | 2 +- .../dropwizard/dropwizard-elasticsearch.csv | 2 +- .../dropwizard/dropwizard-flyway.csv | 2 +- .../merges_timed/druid-io/druid-api.csv | 2 +- .../merges_timed/dschulten/hydra-java.csv | 2 +- .../combined/merges_timed/dspace/dspace.csv | 2 +- .../dtrott/maven-protoc-plugin.csv | 2 +- .../combined/merges_timed/dtrules/dtrules.csv | 2 +- .../duesenklipper/wicket-safemodel.csv | 2 +- .../combined/merges_timed/dvcama/lodview.csv | 2 +- .../dvdme/forecastio-lib-java.csv | 2 +- .../combined/merges_timed/dwslab/dwslib.csv | 2 +- results/combined/merges_timed/dynjs/dynjs.csv | 2 +- .../combined/merges_timed/e-mzungu/rjc.csv | 2 +- .../merges_timed/eaftan/hprof-parser.csv | 2 +- .../merges_timed/easetech/easytest-core.csv | 2 +- .../combined/merges_timed/ebay/xcelite.csv | 2 +- .../merges_timed/edwardcapriolo/nibiru.csv | 2 +- .../egineering-llc/collectd-fast-jmx.csv | 2 +- .../combined/merges_timed/ehcache/sizeof.csv | 2 +- .../einsamhauer/disthene-reader.csv | 2 +- .../merges_timed/einsamhauer/disthene.csv | 2 +- .../eirslett/frontend-maven-plugin.csv | 2 +- .../combined/merges_timed/ekryd/sortpom.csv | 2 +- .../ekt/biblio-transformation-engine.csv | 2 +- .../elasticjob/elastic-job-lite.csv | 2 +- .../java-vector-tile.csv | 2 +- .../merges_timed/elisarver/selophane.csv | 2 +- .../combined/merges_timed/elunez/eladmin.csv | 2 +- .../merges_timed/emicklei/rendersnake.csv | 2 +- .../engine-alpha/engine-alpha.csv | 2 +- .../vertx-elasticsearch-service.csv | 2 +- .../merges_timed/entertailion/fling.csv | 2 +- .../combined/merges_timed/erudika/para.csv | 2 +- .../merges_timed/esapi/esapi-java-legacy.csv | 2 +- .../combined/merges_timed/eskatos/asadmin.csv | 2 +- .../merges_timed/esotericsoftware/kryo.csv | 2 +- .../combined/merges_timed/evil-co/nbt-lib.csv | 2 +- .../merges_timed/evolute-pt/dbtransfer.csv | 2 +- .../merges_timed/facebook/jcommon.csv | 2 +- .../merges_timed/farin/jcloisterzone.csv | 2 +- .../combined/merges_timed/fasseg/exp4j.csv | 2 +- .../merges_timed/fasterxml/aalto-xml.csv | 2 +- .../fasterxml/jackson-annotations.csv | 2 +- .../merges_timed/fasterxml/jackson-core.csv | 2 +- .../fasterxml/jackson-dataformat-avro.csv | 2 +- .../fasterxml/jackson-dataformat-cbor.csv | 2 +- .../fasterxml/jackson-dataformat-xml.csv | 2 +- .../fasterxml/jackson-datatype-guava.csv | 2 +- .../fasterxml/jackson-datatype-hibernate.csv | 2 +- .../fasterxml/jackson-datatype-joda.csv | 2 +- .../fasterxml/jackson-datatype-jsr310.csv | 2 +- .../fasterxml/jackson-module-afterburner.csv | 2 +- .../jackson-module-jaxb-annotations.csv | 2 +- .../fasterxml/jackson-module-mrbean.csv | 2 +- results/combined/merges_timed/feedzai/pdb.csv | 2 +- .../fenixedu/fenixedu-academic.csv | 2 +- .../fernandezpablo85/scribe-java.csv | 2 +- .../combined/merges_timed/feroult/yawp.csv | 2 +- .../merges_timed/feuyeux/jax-rs2-atup.csv | 2 +- .../fex-team/fis-velocity-tools.csv | 2 +- .../combined/merges_timed/ffay/lanproxy.csv | 2 +- .../combined/merges_timed/fiji/trackmate.csv | 2 +- .../fiji/trainable_segmentation.csv | 2 +- .../combined/merges_timed/fincatto/nfe.csv | 2 +- .../combined/merges_timed/findwise/hydra.csv | 2 +- .../merges_timed/finraos/jtaf-xcore.csv | 2 +- .../fit2cloud/qingcloud-api-java-wrapper.csv | 2 +- .../merges_timed/flaptor/indextank-java.csv | 2 +- .../merges_timed/flaxsearch/luwak.csv | 2 +- .../flipkart-incubator/zjsonpatch.csv | 2 +- .../fluentlenium/fluentlenium.csv | 2 +- .../flyingsaucerproject/flyingsaucer.csv | 2 +- .../merges_timed/fmcarvalho/htmlflow.csv | 2 +- .../fommil/matrix-toolkits-java.csv | 2 +- .../analytics-cloud-dataset-utils.csv | 2 +- .../merges_timed/forcedotcom/sitecrawler.csv | 2 +- .../combined/merges_timed/forcedotcom/wsc.csv | 2 +- .../merges_timed/fordfrog/apgdiff.csv | 2 +- .../merges_timed/frankbille/scoreboard.csv | 2 +- .../freehep/freehep-vectorgraphics.csv | 2 +- .../merges_timed/frizbog/gedcom4j.csv | 2 +- .../merges_timed/fusesource/hawtjni.csv | 2 +- .../merges_timed/fusesource/jansi-native.csv | 2 +- .../merges_timed/fusesource/jansi.csv | 2 +- .../merges_timed/galenframework/galen.csv | 2 +- .../merges_timed/garbagemule/mobarena.csv | 2 +- .../merges_timed/gatein/gatein-api-java.csv | 2 +- .../merges_timed/gbif/name-parser.csv | 2 +- .../geisbruch/hadoopcryptocompressor.csv | 2 +- .../merges_timed/geoffreywiseman/moo.csv | 2 +- .../geosolutions-it/geoserver-manager.csv | 2 +- results/combined/merges_timed/gephi/gephi.csv | 2 +- .../merges_timed/getbridge/bridge-java.csv | 2 +- .../merges_timed/ghillairet/emfjson.csv | 2 +- .../combined/merges_timed/giltene/jhiccup.csv | 2 +- .../merges_timed/gini/dropwizard-gelf.csv | 2 +- .../combined/merges_timed/gitools/gitools.csv | 2 +- .../merges_timed/giusepperizzo/nerd4java.csv | 2 +- .../merges_timed/glamdring/aardwark.csv | 2 +- .../merges_timed/glenkpeterson/fp4java7.csv | 2 +- .../merges_timed/glenkpeterson/j-cicle.csv | 2 +- .../merges_timed/glenkpeterson/j-sicle.csv | 2 +- .../merges_timed/glowroot/glowroot.csv | 2 +- .../merges_timed/gooddata/gooddata-cl.csv | 2 +- .../google/closure-stylesheets.csv | 2 +- .../merges_timed/google/compile-testing.csv | 2 +- .../merges_timed/google/error-prone.csv | 2 +- .../google/google-java-format.csv | 2 +- .../combined/merges_timed/google/guice.csv | 2 +- .../merges_timed/google/gwtmockito.csv | 2 +- .../google/identity-toolkit-java-client.csv | 2 +- .../combined/merges_timed/google/truth.csv | 2 +- .../googlecloudplatform/gcloud-java.csv | 2 +- .../gcloud-maven-plugin.csv | 2 +- .../merges_timed/gpedro/slack-webhook.csv | 2 +- .../graphaware/neo4j-noderank.csv | 2 +- .../merges_timed/graphity/graphity-client.csv | 2 +- .../graylog2/graylog2-alarmcallback-slack.csv | 2 +- .../merges_timed/greenlaw110/rythm.csv | 2 +- .../greenmail-mail-test/greenmail.csv | 2 +- .../merges_timed/greese/dasein-cloud-core.csv | 2 +- .../merges_timed/gridgain/yardstick.csv | 2 +- .../combined/merges_timed/grove/presto.csv | 2 +- .../merges_timed/grundid/nfctools.csv | 2 +- .../combined/merges_timed/grunka/fortuna.csv | 2 +- .../merges_timed/guhilling/cdi-test.csv | 2 +- .../gwt-test-utils/gwt-test-utils.csv | 2 +- .../gwtbootstrap3/gwtbootstrap3.csv | 2 +- .../hansolo/steelseries-swing.csv | 2 +- .../haraldwalker/user-agent-utils.csv | 2 +- results/combined/merges_timed/hdiv/hdiv.csv | 2 +- .../hdrhistogram/hdrhistogram.csv | 2 +- .../helpscout/helpscout-api-java.csv | 2 +- .../combined/merges_timed/helun/ektorp.csv | 2 +- .../heroku/devcenter-embedded-tomcat.csv | 2 +- .../heroku/heroku-maven-plugin.csv | 2 +- .../heroku/java-getting-started.csv | 2 +- .../combined/merges_timed/heronarts/lx.csv | 2 +- .../hmsonline/storm-cassandra-cql.csv | 2 +- .../combined/merges_timed/hoijui/javaosc.csv | 2 +- results/combined/merges_timed/hoijui/jawk.csv | 2 +- .../merges_timed/hoten/java-delaunay.csv | 2 +- .../merges_timed/hoverruan/weiboclient4j.csv | 2 +- .../merges_timed/httpcache4j/httpcache4j.csv | 2 +- .../merges_timed/huaban/jieba-analysis.csv | 2 +- .../merges_timed/hudec/sql-processor.csv | 2 +- .../merges_timed/hyphen-ated/djbot.csv | 2 +- .../combined/merges_timed/icoloma/tldgen.csv | 2 +- .../combined/merges_timed/idpf/epubcheck.csv | 2 +- .../idris-hackers/idris-java-rts.csv | 2 +- .../merges_timed/igniterealtime/tinder.csv | 2 +- .../ignorance77/transformiceapi.csv | 2 +- .../merges_timed/iipc/webarchive-commons.csv | 2 +- .../merges_timed/imagej/imagej-ops.csv | 2 +- .../combined/merges_timed/imglib/imglib2.csv | 2 +- .../merges_timed/imixs/imixs-workflow.csv | 2 +- .../immobilienscout24/deadcode4j.csv | 2 +- .../khs-spring-batch-report-writer.csv | 2 +- .../merges_timed/inaiat/jqplot4java.csv | 2 +- .../ingenieux/awseb-deployment-plugin.csv | 2 +- .../combined/merges_timed/intcode/sweetie.csv | 2 +- .../ipeirotis/get-another-label.csv | 2 +- .../irobertson/jpa-annotation-processor.csv | 2 +- results/combined/merges_timed/irstv/cts.csv | 2 +- .../combined/merges_timed/iryndin/jdbf.csv | 2 +- .../iterate-ch/java-openstack-swift.csv | 2 +- .../merges_timed/j-easy/easy-rules.csv | 2 +- .../merges_timed/j256/ormlite-core.csv | 2 +- .../merges_timed/j256/simplemagic.csv | 2 +- .../jacquesberger/jsonparsingexample.csv | 2 +- .../merges_timed/jadler-mocking/jadler.csv | 2 +- .../merges_timed/jahia/jahiapp-newsletter.csv | 2 +- .../merges_timed/jahia/ldap-provider.csv | 2 +- .../jai-imageio/jai-imageio-jpeg2000.csv | 2 +- .../merges_timed/jakewharton/disklrucache.csv | 2 +- .../merges_timed/jalkanen/speed4j.csv | 2 +- .../merges_timed/japgolly/svg-android.csv | 2 +- .../merges_timed/jasig/java-cas-client.csv | 2 +- .../merges_timed/jasig/jspc-maven-plugin.csv | 2 +- .../merges_timed/jasig/webproxyportlet.csv | 2 +- .../merges_timed/javamoney/jsr354-api.csv | 2 +- .../merges_timed/javamoney/jsr354-ri.csv | 2 +- .../merges_timed/javaparser/javaparser.csv | 2 +- .../combined/merges_timed/javasoze/clue.csv | 2 +- .../combined/merges_timed/javen205/ijpay.csv | 2 +- .../merges_timed/jayway/awaitility.csv | 2 +- .../jboss-logging/jboss-logging-tools.csv | 2 +- .../jboss-modules/jboss-modules.csv | 2 +- .../merges_timed/jboss-msc/jboss-msc.csv | 2 +- .../jboss-remoting/jboss-remoting.csv | 2 +- .../jboss/jboss-jacc-api_spec.csv | 2 +- .../merges_timed/jbossas/jboss-dmr.csv | 2 +- .../merges_timed/jbossas/remoting-jmx.csv | 2 +- .../merges_timed/jbossas/staxmapper.csv | 2 +- .../merges_timed/jcabi/jcabi-aspects.csv | 2 +- .../merges_timed/jcabi/jcabi-dynamo.csv | 2 +- .../jcabi/jcabi-dynamodb-maven-plugin.csv | 2 +- .../merges_timed/jcabi/jcabi-github.csv | 2 +- .../merges_timed/jcabi/jcabi-http.csv | 2 +- .../merges_timed/jcabi/jcabi-jdbc.csv | 2 +- .../merges_timed/jcabi/jcabi-manifests.csv | 2 +- .../combined/merges_timed/jcabi/jcabi-w3c.csv | 2 +- .../merges_timed/jclawson/hazeltask.csv | 2 +- .../merges_timed/jdatepicker/jdatepicker.csv | 2 +- .../merges_timed/jdeparser/jdeparser2.csv | 2 +- .../combined/merges_timed/jdkcn/jabberer.csv | 2 +- .../combined/merges_timed/jdupl/lancoder.csv | 2 +- .../jeevatkm/digitalocean-api-java.csv | 2 +- .../jeluard/maven-plantuml-plugin.csv | 2 +- .../jeluard/semantic-versioning.csv | 2 +- .../merges_timed/jenkins-infra/ircbot.csv | 2 +- .../jenkinsci/active-directory-plugin.csv | 2 +- .../merges_timed/jenkinsci/ant-plugin.csv | 2 +- .../jenkinsci/backend-update-center2.csv | 2 +- .../jenkinsci/bitbucket-plugin.csv | 2 +- .../jenkinsci/build-timeout-plugin.csv | 2 +- .../jenkinsci/configurationslicing-plugin.csv | 2 +- .../jenkinsci/copyartifact-plugin.csv | 2 +- .../jenkinsci/coverity-plugin.csv | 2 +- .../jenkinsci/credentials-plugin.csv | 2 +- .../merges_timed/jenkinsci/deploy-plugin.csv | 2 +- .../jenkinsci/disk-usage-plugin.csv | 2 +- .../jenkinsci/docker-build-publish-plugin.csv | 2 +- .../jenkinsci/email-ext-plugin.csv | 2 +- .../embeddable-build-status-plugin.csv | 2 +- .../jenkinsci/google-oauth-plugin.csv | 2 +- .../jenkinsci/instant-messaging-plugin.csv | 2 +- .../merges_timed/jenkinsci/jira-plugin.csv | 2 +- .../jenkinsci/jobconfighistory-plugin.csv | 2 +- .../merges_timed/jenkinsci/junit-plugin.csv | 2 +- .../merges_timed/jenkinsci/ldap-plugin.csv | 2 +- .../jenkinsci/log-parser-plugin.csv | 2 +- .../merges_timed/jenkinsci/mailer-plugin.csv | 2 +- .../jenkinsci/maven-hpi-plugin.csv | 2 +- .../jenkinsci/mercurial-plugin.csv | 2 +- .../jenkinsci/nested-view-plugin.csv | 2 +- .../jenkinsci/oki-docki-plugin.csv | 2 +- .../merges_timed/jenkinsci/plot-plugin.csv | 2 +- .../jenkinsci/promoted-builds-plugin.csv | 2 +- .../merges_timed/jenkinsci/rebuild-plugin.csv | 2 +- .../jenkinsci/ruby-runtime-plugin.csv | 2 +- .../jenkinsci/ssh-slaves-plugin.csv | 2 +- .../jenkinsci/testng-plugin-plugin.csv | 2 +- .../throttle-concurrent-builds-plugin.csv | 2 +- .../jenkinsci/token-macro-plugin.csv | 2 +- .../jenkinsci/ui-samples-plugin.csv | 2 +- .../jenkinsci/urltrigger-plugin.csv | 2 +- .../jenkinsci/vsphere-cloud-plugin.csv | 2 +- .../windows-azure-storage-plugin.csv | 2 +- .../combined/merges_timed/jexp/jpatterns.csv | 2 +- .../merges_timed/jexp/neo4j-rdbms-import.csv | 2 +- .../combined/merges_timed/jfaster/mango.csv | 2 +- .../combined/merges_timed/jfinal/jfinal.csv | 2 +- .../jfrogdev/teamcity-artifactory-plugin.csv | 2 +- .../combined/merges_timed/jgralab/jgralab.csv | 2 +- .../combined/merges_timed/jgrapht/jgrapht.csv | 2 +- .../jhalterman/concurrentunit.csv | 2 +- .../merges_timed/jhalterman/expiringmap.csv | 2 +- .../merges_timed/jhalterman/failsafe.csv | 2 +- .../combined/merges_timed/jiaqi/jmxterm.csv | 2 +- .../combined/merges_timed/jinahya/bit-io.csv | 2 +- .../combined/merges_timed/jingwei/krati.csv | 2 +- .../merges_timed/jitsi/dnssecjava.csv | 2 +- .../merges_timed/jkotlinski/lsdpatch.csv | 2 +- .../combined/merges_timed/jline/jline2.csv | 2 +- .../jlinn/quartz-redis-jobstore.csv | 2 +- .../merges_timed/jmacglashan/burlap.csv | 2 +- .../combined/merges_timed/jmetal/jmetal.csv | 2 +- .../jmeter-maven-plugin.csv | 2 +- .../merges_timed/jmrozanec/cron-utils.csv | 2 +- .../merges_timed/jmurty/java-xmlbuilder.csv | 2 +- .../jmxtrans/embedded-jmxtrans.csv | 2 +- .../merges_timed/jmxtrans/jmxtrans-agent.csv | 2 +- .../jnasmartcardio/jnasmartcardio.csv | 2 +- .../combined/merges_timed/jnr/jnr-enxio.csv | 2 +- .../merges_timed/jnr/jnr-unixsocket.csv | 2 +- .../joaoarthurbm/designwizard.csv | 2 +- .../merges_timed/jodaorg/joda-beans.csv | 2 +- .../jodastephen/property-alliance.csv | 2 +- .../assertj-assertions-generator.csv | 2 +- .../joel-costigliola/assertj-core.csv | 2 +- .../joelittlejohn/embedmongo-maven-plugin.csv | 2 +- .../merges_timed/johncarl81/parceler.csv | 2 +- .../merges_timed/johnnei/javatorrent.csv | 2 +- results/combined/merges_timed/jooq/jooq.csv | 2 +- .../joschi/dropwizard-elasticsearch.csv | 2 +- .../merges_timed/joschi/dropwizard-flyway.csv | 2 +- .../merges_timed/joshlong/spring-birt.csv | 2 +- .../merges_timed/joyent/java-manta.csv | 2 +- .../combined/merges_timed/jparsec/jparsec.csv | 2 +- .../merges_timed/jpmml/openscoring.csv | 2 +- .../jprante/elasticsearch-csv.csv | 2 +- .../combined/merges_timed/jqm4gwt/jqm4gwt.csv | 2 +- .../merges_timed/jqno/equalsverifier.csv | 2 +- .../spring-comparing-template-engines.csv | 2 +- .../combined/merges_timed/jri/deepamehta.csv | 2 +- .../combined/merges_timed/jruby/bytelist.csv | 2 +- .../merges_timed/jruby/jruby-parser.csv | 2 +- .../jsamoocha/linksalienceclassification.csv | 2 +- .../merges_timed/jsevellec/cassandra-unit.csv | 2 +- .../merges_timed/jsimone/webapp-runner.csv | 2 +- .../combined/merges_timed/jsprit/jsprit.csv | 2 +- .../merges_timed/jtablesaw/tablesaw.csv | 2 +- .../merges_timed/julianhyde/linq4j.csv | 2 +- .../merges_timed/julianhyde/sqlline.csv | 2 +- .../merges_timed/julietkilo/canbabel.csv | 2 +- .../merges_timed/juniper/netconf-java.csv | 2 +- .../merges_timed/junit-team/junit.csv | 2 +- .../merges_timed/junit-team/junit4.csv | 2 +- .../jutzig/github-release-plugin.csv | 2 +- .../merges_timed/jvirtanen/nassau.csv | 2 +- .../merges_timed/jvirtanen/parity.csv | 2 +- .../jvm-profiling-tools/async-profiler.csv | 2 +- .../merges_timed/jwcarman/wicketopia.csv | 2 +- results/combined/merges_timed/jwtk/jjwt.csv | 2 +- results/combined/merges_timed/k3po/k3po.csv | 2 +- .../combined/merges_timed/kaazing/k3po.csv | 2 +- .../combined/merges_timed/kaazing/robot.csv | 2 +- .../merges_timed/kamranzafar/jtar.csv | 2 +- .../merges_timed/kantega/pdf-converter.csv | 2 +- .../kawasima/websocket-classloader.csv | 2 +- .../kbnlresearch/europeananp-ner.csv | 2 +- .../merges_timed/keedio/flume-ftp-source.csv | 2 +- .../keedio/flume-ng-sql-source.csv | 2 +- .../merges_timed/kevin-wayne/algs4.csv | 2 +- .../combined/merges_timed/kevinbayes/vest.csv | 2 +- .../khmarbaise/iterator-maven-plugin.csv | 2 +- .../maven-license-verifier-plugin.csv | 2 +- .../merges_timed/khuxtable/wagon-gitsite.csv | 2 +- .../merges_timed/kifj/jboss-syslog.csv | 2 +- .../killbilling/recurly-java-library.csv | 2 +- .../merges_timed/killme2008/aviator.csv | 2 +- .../merges_timed/killme2008/xmemcached.csv | 2 +- .../combined/merges_timed/kimshen/sissi.csv | 2 +- .../merges_timed/kinow/testlink-java-api.csv | 2 +- .../merges_timed/kohsuke/access-modifier.csv | 2 +- .../kohsuke/file-leak-detector.csv | 2 +- .../merges_timed/kohsuke/github-api.csv | 2 +- .../merges_timed/kohsuke/groovy-sandbox.csv | 2 +- .../merges_timed/kohsuke/libpam4j.csv | 2 +- .../combined/merges_timed/kohsuke/winp.csv | 2 +- .../spring-mvc-quickstart-archetype.csv | 2 +- .../komamitsu/jackson-dataformat-msgpack.csv | 2 +- .../combined/merges_timed/komoot/photon.csv | 2 +- .../merges_timed/kong/unirest-java.csv | 2 +- .../kongchen/swagger-maven-plugin.csv | 2 +- .../merges_timed/konloch/bytecode-viewer.csv | 2 +- .../merges_timed/koraktor/mavanagaiata.csv | 2 +- .../koraktor/steam-condenser-java.csv | 2 +- .../merges_timed/kpelykh/docker-java.csv | 2 +- .../combined/merges_timed/krilivye/jocco.csv | 2 +- .../kroimon/bukkit-alphachest.csv | 2 +- .../merges_timed/kshchepanovskyi/zkcopy.csv | 2 +- .../merges_timed/kstyrc/embedded-redis.csv | 2 +- .../merges_timed/kungfoo/geohash-java.csv | 2 +- .../merges_timed/kurbatov/firmata4j.csv | 2 +- .../merges_timed/kvladislav/ticketmanager.csv | 2 +- .../merges_timed/laforge49/jactor.csv | 2 +- .../merges_timed/laforge49/jactor2.csv | 2 +- results/combined/merges_timed/larsga/duke.csv | 2 +- .../lazaromedina/flume-ftp-source.csv | 2 +- .../lbehnke/hierarchical-clustering-java.csv | 2 +- .../lbroudoux/es-amazon-s3-river.csv | 2 +- .../learning-layers/socialsemanticserver.csv | 2 +- .../merges_timed/learnlib/learnlib.csv | 2 +- .../leeadkins/elasticsearch-redis-river.csv | 2 +- .../lemire/externalsortinginjava.csv | 2 +- .../combined/merges_timed/lemire/javaewah.csv | 2 +- .../leonlee/flume-ng-mongodb-sink.csv | 2 +- .../merges_timed/lettuce-io/lettuce-core.csv | 2 +- .../leveluplunch/levelup-java-examples.csv | 2 +- .../merges_timed/librato/metrics-librato.csv | 2 +- .../combined/merges_timed/linkedin/camus.csv | 2 +- .../merges_timed/linlinjava/litemall.csv | 2 +- .../linsolas/casperjs-runner-maven-plugin.csv | 2 +- .../combined/merges_timed/lintool/clueweb.csv | 2 +- .../merges_timed/lionsoul2014/jcseg.csv | 2 +- .../merges_timed/liyiorg/weixin-popular.csv | 2 +- .../logstash/log4j-jsonevent-layout.csv | 2 +- .../logstash/logstash-logback-encoder.csv | 2 +- .../merges_timed/lookfirst/sardine.csv | 2 +- .../merges_timed/lukas-krecan/json2xml.csv | 2 +- .../merges_timed/lukas-krecan/jsonunit.csv | 2 +- .../lukaszlenart/launch4j-maven-plugin.csv | 2 +- .../lukegb/gitdescribe-maven-plugin.csv | 2 +- .../merges_timed/lusito/gamedevweek.csv | 2 +- .../merges_timed/lwhite1/tablesaw.csv | 2 +- .../combined/merges_timed/lyncode/xoai.csv | 2 +- .../merges_timed/lyogavin/pistachio.csv | 2 +- .../maciejwalkowiak/java-plist-serializer.csv | 2 +- .../maciejzaleski/jmeter-websocketsampler.csv | 2 +- .../merges_timed/magro/kryo-serializers.csv | 2 +- .../merges_timed/mahoney/slf4j-test.csv | 2 +- .../mambu-gmbh/mambu-apis-java.csv | 2 +- .../merges_timed/mangstadt/ez-vcard.csv | 2 +- .../merges_timed/maoo/maven-tiles.csv | 2 +- .../marginallyclever/makelangelo.csv | 2 +- .../aliendroid-activerecord.csv | 2 +- .../marschall/memoryfilesystem.csv | 2 +- .../martinpaljak/globalplatformpro.csv | 2 +- .../merges_timed/martylamb/nailgun.csv | 2 +- .../merges_timed/mashape/unirest-java.csv | 2 +- .../masterthought/cucumber-reporting.csv | 2 +- .../merges_timed/matthias247/jawampa.csv | 2 +- .../mattinsler/com.lowereast.guiceymongo.csv | 2 +- .../maven-nar/cpptasks-parallel.csv | 2 +- .../maven-nar/nar-maven-plugin.csv | 2 +- .../combined/merges_timed/mavocz/smscsim.csv | 2 +- .../merges_timed/maxmind/geoip-api-java.csv | 2 +- .../merges_timed/mbaechler/proxy-servlet.csv | 2 +- .../mbknor/dropwizard-activemq-bundle.csv | 2 +- .../maven-java-formatter-plugin.csv | 2 +- .../combined/merges_timed/mbosecke/pebble.csv | 2 +- .../merges_timed/mboudreau/alternator.csv | 2 +- .../combined/merges_timed/mcmmo-dev/mcmmo.csv | 2 +- .../merges_timed/mcupak/beacon-of-beacons.csv | 2 +- .../combined/merges_timed/mdeanda/lorem.csv | 2 +- .../mdeinum/spring-batch-excel.csv | 2 +- .../medcl/elasticsearch-analysis-ik.csv | 2 +- .../medcl/elasticsearch-analysis-pinyin.csv | 2 +- .../elasticsearch-analysis-stconvert.csv | 2 +- .../medcl/elasticsearch-partialupdate.csv | 2 +- .../merges_timed/mercadopago/sdk-java.csv | 2 +- .../merges_timed/metamx/extendedset.csv | 2 +- .../merges_timed/meyerjp3/psychometrics.csv | 2 +- .../merges_timed/mh4j/metaheuristics4java.csv | 2 +- .../merges_timed/michaelwittig/java-q.csv | 2 +- .../merges_timed/micromata/javaapiforkml.csv | 2 +- .../merges_timed/mikaelhg/openblocks.csv | 2 +- .../combined/merges_timed/mikera/vectorz.csv | 2 +- .../merges_timed/mikvor/money-conversion.csv | 2 +- .../merges_timed/milkbowl/vaultapi.csv | 2 +- .../combined/merges_timed/mimno/mallet.csv | 2 +- .../merges_timed/minecrafter/bungeejson.csv | 2 +- .../merges_timed/mitre/http-proxy-servlet.csv | 2 +- .../merges_timed/mixpanel/mixpanel-java.csv | 2 +- .../merges_timed/mjsalerno/unobot.csv | 2 +- .../combined/merges_timed/mjsax/aeolus.csv | 2 +- .../mklemm/jaxb2-rich-contract-plugin.csv | 2 +- .../merges_timed/mlaccetti/javapns.csv | 2 +- .../merges_timed/mmastrac/nanojson.csv | 2 +- results/combined/merges_timed/mmazi/rescu.csv | 2 +- .../merges_timed/mmlab/rmlprocessor.csv | 2 +- .../mojohaus/exec-maven-plugin.csv | 2 +- .../merges_timed/mongobee/mongobee.csv | 2 +- .../monitorjbl/excel-streaming-reader.csv | 2 +- .../elasticsearch-analysis-morfologik.csv | 2 +- .../mooso/azure-tables-hadoop.csv | 2 +- .../merges_timed/moquette-io/moquette.csv | 2 +- .../morfologik/morfologik-stemming.csv | 2 +- .../moritanosuke/glacieruploader.csv | 2 +- .../merges_timed/motown-io/motown.csv | 2 +- .../combined/merges_timed/movsim/movsim.csv | 2 +- .../combined/merges_timed/mpatric/mp3agic.csv | 2 +- .../combined/merges_timed/mpusher/mpush.csv | 2 +- .../mrcookieslime/slimefun-3.0.csv | 2 +- .../merges_timed/mrice/license-check.csv | 2 +- .../merges_timed/mrpdaemon/encfs-java.csv | 2 +- ...azure-activedirectory-library-for-java.csv | 2 +- .../omnituredatafileinputformat.csv | 2 +- .../combined/merges_timed/mtedone/podam.csv | 2 +- .../combined/merges_timed/mttkay/signpost.csv | 2 +- .../combined/merges_timed/mwanji/toml4j.csv | 2 +- .../merges_timed/mybatis/jpetstore-6.csv | 2 +- .../merges_timed/mybatis/mybatis-3.csv | 2 +- .../combined/merges_timed/mybatis/spring.csv | 2 +- .../mycila/license-maven-plugin.csv | 2 +- .../merges_timed/mygrid/rightfield.csv | 2 +- .../mypurecloud/elasticsearch-lambda.csv | 2 +- .../n0rad/jstest-maven-plugin.csv | 2 +- .../combined/merges_timed/nabedge/mixer2.csv | 2 +- .../nabeelmukhtar/github-java-sdk.csv | 2 +- .../combined/merges_timed/named-data/jndn.csv | 2 +- .../merges_timed/nanohttpd/nanohttpd.csv | 2 +- .../combined/merges_timed/nastel/tnt4j.csv | 2 +- .../nea/vertx-mod-cassandra-persistor.csv | 2 +- .../merges_timed/needle4j/needle4j.csv | 2 +- .../merges_timed/nepxion/discovery.csv | 2 +- .../stash-jenkins-postreceive-webhook.csv | 2 +- .../combined/merges_timed/netflix/rxjava.csv | 2 +- .../merges_timed/newbee-ltd/newbee-mall.csv | 2 +- .../combined/merges_timed/nhl/link-etl.csv | 2 +- .../nicoulaj/checksum-maven-plugin.csv | 2 +- .../combined/merges_timed/ning/compress.csv | 2 +- .../merges_timed/ninjaframework/ninja.csv | 2 +- .../combined/merges_timed/ninjudd/drip.csv | 2 +- .../merges_timed/nitnelave/creeperheal.csv | 2 +- .../merges_timed/nlpchina/nlp-lang.csv | 2 +- .../merges_timed/nmdp-bioinformatics/ngs.csv | 2 +- .../merges_timed/northconcepts/event-bus.csv | 2 +- .../combined/merges_timed/northlander/a.csv | 2 +- .../merges_timed/nuodb/migration-tools.csv | 2 +- .../merges_timed/nurkiewicz/async-retry.csv | 2 +- .../nurkiewicz/java8-workshop.csv | 2 +- .../combined/merges_timed/nutzam/nutzwx.csv | 2 +- .../merges_timed/nysenate/openlegislation.csv | 2 +- results/combined/merges_timed/oaqa/baseqa.csv | 2 +- .../combined/merges_timed/oauth-apis/apis.csv | 2 +- .../obourgain/elasticsearch-http.csv | 2 +- .../octo-technology/sonar-objective-c.csv | 2 +- .../merges_timed/okjsp/okmakeover.csv | 2 +- .../combined/merges_timed/okleine/ncoap.csv | 2 +- .../merges_timed/oldhu/suunto2nike.csv | 2 +- .../oldmanpushcart/greys-anatomy.csv | 2 +- .../combined/merges_timed/olibye/guvna.csv | 2 +- .../merges_timed/oltpbenchmark/oltpbench.csv | 2 +- .../merges_timed/omnifaces/omnifaces.csv | 2 +- .../onebusaway-application-modules.csv | 2 +- .../onebusaway/onebusaway-gtfs-modules.csv | 2 +- .../onebusaway-gtfs-realtime-api.csv | 2 +- .../merges_timed/onyxbits/raccoon.csv | 2 +- .../openapitools/openapi-generator.csv | 2 +- .../opendatalab-de/geojson-jackson.csv | 2 +- .../combined/merges_timed/openhab/jmdns.csv | 2 +- .../merges_timed/openhft/chronicle-bytes.csv | 2 +- .../openhft/chronicle-network.csv | 2 +- .../openhft/chronicle-threads.csv | 2 +- .../openhft/zero-allocation-hashing.csv | 2 +- .../openmicroscopy/bioformats.csv | 2 +- .../combined/merges_timed/openpnp/openpnp.csv | 2 +- .../merges_timed/openrefine/openrefine.csv | 2 +- .../merges_timed/openskynetwork/java-adsb.csv | 2 +- .../merges_timed/opentosca/container.csv | 2 +- .../merges_timed/openzipkin/zipkin.csv | 2 +- .../ops4j/org.ops4j.pax.swissbox.csv | 2 +- .../optimaize/language-detector.csv | 2 +- .../merges_timed/orctom/was-maven-plugin.csv | 2 +- .../merges_timed/orien/bean-matchers.csv | 2 +- .../orientechnologies/orientdb-etl.csv | 2 +- results/combined/merges_timed/oripa/oripa.csv | 2 +- .../merges_timed/oskopek/javaanpr.csv | 2 +- .../combined/merges_timed/outbrain/ob1k.csv | 2 +- .../merges_timed/overturetool/overture.csv | 2 +- .../merges_timed/oxo42/stateless4j.csv | 2 +- .../merges_timed/pablissimo/sonartsplugin.csv | 2 +- .../pagehelper/mybatis-pagehelper.csv | 2 +- .../merges_timed/pandcorps/pandam.csv | 2 +- .../cassandra-list-subranges.csv | 2 +- .../merges_timed/paulosuzart/jtornado.csv | 2 +- .../merges_timed/pax95/camel-ironmq.csv | 2 +- .../merges_timed/pedrovgs/algorithms.csv | 2 +- .../merges_timed/peterisp/morphology.csv | 2 +- .../petitparser/java-petitparser.csv | 2 +- .../merges_timed/phaed420/simpleclans.csv | 2 +- .../phantomydn/wicket-orientdb.csv | 2 +- .../combined/merges_timed/phax/jcodemodel.csv | 2 +- .../merges_timed/pholser/jopt-simple.csv | 2 +- .../merges_timed/pholser/junit-quickcheck.csv | 2 +- .../merges_timed/pires/obd-java-api.csv | 2 +- .../merges_timed/plaid/plaid-java.csv | 2 +- .../combined/merges_timed/plum-umd/rubah.csv | 2 +- .../combined/merges_timed/plutext/docx4j.csv | 2 +- results/combined/merges_timed/pmd/pmd.csv | 2 +- .../merges_timed/poetix/protonpack.csv | 2 +- .../polopoly/jetty-maven-plugin.csv | 2 +- .../merges_timed/pragmatists/junitparams.csv | 2 +- .../merges_timed/premium-minds/billy.csv | 2 +- .../premium-minds/pm-wicket-utils.csv | 2 +- .../merges_timed/prism/prism-bukkit.csv | 2 +- .../merges_timed/progether/jadventure.csv | 2 +- .../projectblueshift/blueshiftapi.csv | 2 +- .../merges_timed/projectdanube/xdi2.csv | 2 +- .../projectkorra/projectkorra.csv | 2 +- .../merges_timed/ptgoetz/storm-hdfs.csv | 2 +- .../merges_timed/pydio/pydio-sdk-java.csv | 2 +- .../combined/merges_timed/pyknic/codegen.csv | 2 +- results/combined/merges_timed/qcadoo/mes.csv | 2 +- .../merges_timed/qihoo360/xlearning.csv | 2 +- .../merges_timed/qubole/presto-udfs.csv | 2 +- .../querydsl/apt-maven-plugin.csv | 2 +- .../combined/merges_timed/qunarcorp/qmq.csv | 2 +- .../merges_timed/quux00/simplecsv.csv | 2 +- .../merges_timed/rackerlabs/blueflood.csv | 2 +- .../combined/merges_timed/radkovo/cssbox.csv | 2 +- .../merges_timed/radkovo/jstyleparser.csv | 2 +- results/combined/merges_timed/radsz/jacop.csv | 2 +- .../merges_timed/ralscha/embeddedtc.csv | 2 +- .../raml-org/raml-java-parser.csv | 2 +- .../merges_timed/rcarz/jira-client.csv | 2 +- .../merges_timed/rcongiu/hive-json-serde.csv | 2 +- .../merges_timed/rcsb/colorbrewer.csv | 2 +- .../combined/merges_timed/rdfhdt/hdt-java.csv | 2 +- .../merges_timed/reckart/shib-http-client.csv | 2 +- .../merges_timed/recommenders/rival.csv | 2 +- .../merges_timed/recruit-tech/redpen.csv | 2 +- .../merges_timed/redhogs/cron-parser.csv | 2 +- .../redline-smalltalk/redline-smalltalk.csv | 2 +- .../merges_timed/redsolution/otr4j.csv | 2 +- .../merges_timed/reficio/p2-maven-plugin.csv | 2 +- .../merges_timed/reinert/jjschema.csv | 2 +- .../merges_timed/relayrides/pushy.csv | 2 +- .../pom-manipulation-ext.csv | 2 +- .../generalized-language-modeling-toolkit.csv | 2 +- .../merges_timed/renggli/java-petitparser.csv | 2 +- .../merges_timed/renggli/petitparserjava.csv | 2 +- .../merges_timed/resthub/springmvc-router.csv | 2 +- .../merges_timed/resty-gwt/resty-gwt.csv | 2 +- .../richardwarburton/lambda-behave.csv | 2 +- .../merges_timed/risingoak/jenkins-client.csv | 2 +- .../merges_timed/rjohnsondev/java-libpst.csv | 2 +- .../merges_timed/rncryptor/jncryptor.csv | 2 +- .../merges_timed/rnewson/couchdb-lucene.csv | 2 +- .../merges_timed/robert-bor/csveed.csv | 2 +- .../merges_timed/robobees/simbeeotic.csv | 2 +- .../robotframework/javalibcore.csv | 2 +- .../merges_timed/robotiumtech/robotium.csv | 2 +- .../combined/merges_timed/robrua/orianna.csv | 2 +- .../rocketscience-projects/javaslang.csv | 2 +- .../combined/merges_timed/rometools/rome.csv | 2 +- .../romix/java-concurrent-hash-trie-map.csv | 2 +- .../merges_timed/roncoo/roncoo-pay.csv | 2 +- .../merges_timed/rschreijer/lutung.csv | 2 +- .../rtyley/android-viewholder-listviews.csv | 2 +- results/combined/merges_timed/ru/casanova.csv | 2 +- .../merges_timed/rubenlagus/telegrambots.csv | 2 +- .../ruedigermoeller/kontraktor.csv | 2 +- .../merges_timed/runeflobakk/motif.csv | 2 +- .../merges_timed/runelite/runelite.csv | 2 +- .../ryantenney/metrics-spring.csv | 2 +- .../merges_timed/rylinaux/plugman.csv | 2 +- .../s4u/pgpverify-maven-plugin.csv | 2 +- .../sachin-handiekar/jinstagram.csv | 2 +- .../sailthru/sailthru-java-client.csv | 2 +- .../salyh/elasticsearch-river-imap.csv | 2 +- .../merges_timed/sammthomson/semafor.csv | 2 +- .../merges_timed/samskivert/jmustache.csv | 2 +- .../merges_timed/samskivert/pythagoras.csv | 2 +- .../merges_timed/samskivert/samskivert.csv | 2 +- .../merges_timed/sander2798/enderstone.csv | 2 +- .../sandergielisse/enderstone.csv | 2 +- .../merges_timed/saucelabs/ci-sauce.csv | 2 +- .../merges_timed/sbtourist/journal.io.csv | 2 +- .../merges_timed/schema-repo/schema-repo.csv | 2 +- .../combined/merges_timed/scifio/scifio.csv | 2 +- .../merges_timed/scribble/scribble-java.csv | 2 +- .../merges_timed/scribejava/scribejava.csv | 2 +- .../merges_timed/sd4324530/fastweixin.csv | 2 +- .../sdllanguagetechnologies/testy.csv | 2 +- results/combined/merges_timed/seam/render.csv | 2 +- .../merges_timed/seanchenxi/gwt-storage.csv | 2 +- .../merges_timed/sebfz1/wicket-jquery-ui.csv | 2 +- .../merges_timed/seedboxer/seedboxer.csv | 2 +- .../merges_timed/segmentio/analytics-java.csv | 2 +- .../semanticvectors/semanticvectors.csv | 2 +- .../merges_timed/sexyideas/moosificator.csv | 2 +- .../sgoeschl/jmeter-sla-report.csv | 2 +- .../merges_timed/shazam/shazamcrest.csv | 2 +- .../shhs-coding-club/drugwars.csv | 2 +- .../shimikano/spring-jpa-bulk.csv | 2 +- .../shopizer-ecommerce/shopizer.csv | 2 +- .../sijpesteijn/mafia-maven-plugin.csv | 2 +- .../silverpop/engage-api-client.csv | 2 +- .../combined/merges_timed/simasch/qlrm.csv | 2 +- .../merges_timed/simmetrics/simmetrics.csv | 2 +- .../simpligility/android-ndk-maven-plugin.csv | 2 +- .../merges_timed/skyscreamer/jsonassert.csv | 2 +- .../merges_timed/skyscreamer/nevado.csv | 2 +- .../merges_timed/skyscreamer/yoga.csv | 2 +- .../merges_timed/smartrics/restfixture.csv | 2 +- .../smartsheet-java-sdk.csv | 2 +- results/combined/merges_timed/snazy/ohc.csv | 2 +- .../sndyuk/logback-more-appenders.csv | 2 +- .../merges_timed/soabase/exhibitor.csv | 2 +- .../socialsensor/graphdb-benchmarks.csv | 2 +- .../sockeqwe/annotatedadapter.csv | 2 +- .../merges_timed/sockeqwe/fragmentargs.csv | 2 +- .../socketio4netty/socketio4j.csv | 2 +- .../merges_timed/sofastack/sofa-bolt.csv | 2 +- .../merges_timed/softinstigate/restheart.csv | 2 +- .../merges_timed/solita/functional-utils.csv | 2 +- .../solovyevk/htm-cla-visualizer.csv | 2 +- .../sonarcommunity/sonar-build-breaker.csv | 2 +- .../sonarcommunity/sonar-ldap.csv | 2 +- .../merges_timed/sonarcommunity/sonar-php.csv | 2 +- .../merges_timed/sonarcommunity/sonar-pmd.csv | 2 +- .../sonarcommunity/sonar-scm-activity.csv | 2 +- .../merges_timed/sonarcommunity/sonar-web.csv | 2 +- .../merges_timed/sonarcommunity/sonar-xml.csv | 2 +- .../sonarsource/jenkins-sonar-plugin.csv | 2 +- .../sonarsource/sonar-findbugs.csv | 2 +- .../combined/merges_timed/sonatype/jgit.csv | 2 +- .../merges_timed/sonatype/plexus-compiler.csv | 2 +- .../soundcloud/prometheus-hystrix.csv | 2 +- .../merges_timed/spigotmc/bungeecord.csv | 2 +- .../spinscale/dropwizard-jobs.csv | 2 +- .../splunk/splunk-library-javalogging.csv | 2 +- .../combined/merges_timed/spotify/apollo.csv | 2 +- .../merges_timed/spotify/dockerfile-maven.csv | 2 +- .../spotify/elasticsearch-index-window.csv | 2 +- .../merges_timed/spotify/ffwd-java.csv | 2 +- .../merges_timed/spotify/hdfs2cass.csv | 2 +- .../merges_timed/spotify/netty-zmtp.csv | 2 +- .../spoutcraft/legacylauncher.csv | 2 +- .../spring-data-elasticsearch.csv | 2 +- .../spring-projects/spring-guice.csv | 2 +- .../combined/merges_timed/sps/pushover4j.csv | 2 +- .../merges_timed/spullara/cli-parser.csv | 2 +- .../spullara/java-future-jdk8.csv | 2 +- .../combined/merges_timed/square/burst.csv | 2 +- .../combined/merges_timed/square/javapoet.csv | 2 +- .../combined/merges_timed/srdc/ontmalizer.csv | 2 +- .../merges_timed/srt/asterisk-java.csv | 2 +- .../sstrickx/yahoofinance-api.csv | 2 +- .../stackforge/monasca-common.csv | 2 +- .../combined/merges_timed/stapler/stapler.csv | 2 +- .../merges_timed/statefulj/statefulj.csv | 2 +- .../merges_timed/stealthly/xml-avro.csv | 2 +- .../stefanhendriks/dune2themaker4j.csv | 2 +- .../merges_timed/stephenc/high-scale-lib.csv | 2 +- .../merges_timed/stephenc/java-iso-tools.csv | 2 +- .../merges_timed/steveice10/mcprotocollib.csv | 2 +- .../merges_timed/steveice10/packetlib.csv | 2 +- .../dependency-check-sonar-plugin.csv | 2 +- .../merges_timed/stoicflame/enunciate.csv | 2 +- .../merges_timed/stratehm/stratum-proxy.csv | 2 +- .../merges_timed/straup/dogeared-extruder.csv | 2 +- .../merges_timed/stripesframework/stripes.csv | 2 +- .../combined/merges_timed/structr/structr.csv | 2 +- .../stuartgunter/dropwizard-cassandra.csv | 2 +- .../merges_timed/sviperll/static-mustache.csv | 2 +- .../swagger-api/swagger-codegen.csv | 2 +- .../swagger-api/swagger-parser.csv | 2 +- .../swagger-api/validator-badge.csv | 2 +- .../sylvain-bugat/rundeckmonitor.csv | 2 +- .../merges_timed/synbiodex/libsbolj.csv | 2 +- .../combined/merges_timed/syncleus/ferma.csv | 2 +- .../merges_timed/synergian/wagon-git.csv | 2 +- .../merges_timed/t-oster/liblasercut.csv | 2 +- results/combined/merges_timed/t0xa/gelfj.csv | 2 +- .../merges_timed/tabulapdf/tabula-java.csv | 2 +- .../merges_timed/tacitknowledge/jcr-mock.csv | 2 +- .../merges_timed/tackley/dbdeploy.csv | 2 +- .../merges_timed/tadglines/socket.io-java.csv | 2 +- .../merges_timed/taimos/daemon-framework.csv | 2 +- .../merges_timed/takari/maven-polyglot.csv | 2 +- .../merges_timed/takari/maven-profiler.csv | 2 +- .../merges_timed/taotaotheripper/sault.csv | 2 +- results/combined/merges_timed/tarql/tarql.csv | 2 +- .../tasermonkey/thumbnailator.csv | 2 +- .../merges_timed/tatsuhiro-t/argparse4j.csv | 2 +- results/combined/merges_timed/tcurdt/jdeb.csv | 2 +- .../tdebatty/string-similarity.csv | 2 +- .../tdesjardins/gwt-ol3-playground.csv | 2 +- .../merges_timed/tdunning/log-synth.csv | 2 +- .../merges_timed/tdunning/t-digest.csv | 2 +- .../combined/merges_timed/teamed/qulice.csv | 2 +- .../tech-advantage/sonar-gerrit-plugin.csv | 2 +- .../techblue/alfresco-restclient.csv | 2 +- .../merges_timed/technicpack/launchercore.csv | 2 +- .../merges_timed/technicpack/launcherv3.csv | 2 +- .../technophobia/substeps-core.csv | 2 +- .../teknux-org/jetty-bootstrap.csv | 2 +- .../netphony-network-protocols.csv | 2 +- results/combined/merges_timed/termd/termd.csv | 2 +- .../testingbot/testingbot-tunnel.csv | 2 +- .../texasdigitallibrary/vireo.csv | 2 +- .../combined/merges_timed/tgac/miso-lims.csv | 2 +- .../merges_timed/thealgorithms/java.csv | 2 +- .../theholywaffle/teamspeak-3-java-api.csv | 2 +- .../thelinmichael/spotify-web-api-java.csv | 2 +- .../spring-hibernate-20120924.csv | 2 +- .../thepoofy/foursquare_v2_java_adapter.csv | 2 +- .../theupswell/appengine-counter.csv | 2 +- .../merges_timed/thinkgem/jeesite.csv | 2 +- .../thomas-joiner/hunspellbridj.csv | 2 +- .../thomasjungblut/tjungblut-math.csv | 2 +- .../merges_timed/thoqbk/traprange.csv | 2 +- .../merges_timed/threerings/getdown.csv | 2 +- .../merges_timed/threeten/threeten-extra.csv | 2 +- .../thymeleafexamples-springmail.csv | 2 +- .../combined/merges_timed/timroes/axmlrpc.csv | 2 +- .../combined/merges_timed/tipsy/javalin.csv | 2 +- .../merges_timed/titokone/titokone.csv | 2 +- .../tkelley-eg/collectd-fast-jmx.csv | 2 +- .../combined/merges_timed/tntim96/jscover.csv | 2 +- .../combined/merges_timed/tomitribe/crest.csv | 2 +- .../torquebox/jruby-maven-plugins.csv | 2 +- .../tpietzsch/bigdataviewer-core.csv | 2 +- .../merges_timed/tpietzsch/spimviewer.csv | 2 +- .../tqh/uglifyjs-maven-plugin.csv | 2 +- .../combined/merges_timed/tracee/tracee.csv | 2 +- .../trecloux/yeoman-maven-plugin.csv | 2 +- .../merges_timed/tridentsdk/tridentsdk.csv | 2 +- .../trung/inmemoryjavacompiler.csv | 2 +- .../merges_timed/tuanhiep/mqtt-jmeter.csv | 2 +- .../tuck182/harmony-java-client.csv | 2 +- .../combined/merges_timed/tumblr/jumblr.csv | 2 +- .../combined/merges_timed/tupilabs/tap4j.csv | 2 +- .../merges_timed/turbospaces/turbospaces.csv | 2 +- .../merges_timed/turini/vraptor-authz.csv | 2 +- .../merges_timed/twilio/starter-java.csv | 2 +- .../merges_timed/twilio/twilio-java.csv | 2 +- .../merges_timed/tyagihas/java_nats.csv | 2 +- .../merges_timed/tynamo/tapestry-security.csv | 2 +- .../ubervu/elasticsearch-river-github.csv | 2 +- .../merges_timed/uklimaschewski/evalex.csv | 2 +- .../umut/spring-social-salesforce.csv | 2 +- .../unitsofmeasurement/unit-api.csv | 2 +- .../unitsofmeasurement/unit-impl-se.csv | 2 +- .../unitsofmeasurement/uom-se.csv | 2 +- .../univocity/univocity-parsers.csv | 2 +- .../merges_timed/unruly/junit-rules.csv | 2 +- .../merges_timed/urbanairship/datacube.csv | 2 +- .../urbanairship/java-library.csv | 2 +- .../merges_timed/urbancode/terraform.csv | 2 +- .../merges_timed/urish/gwt-titanium.csv | 2 +- .../uwolfer/gerrit-rest-java-client.csv | 2 +- .../merges_timed/valotrading/silvertip.csv | 2 +- .../combined/merges_timed/vandurme/jerboa.csv | 2 +- .../merges_timed/vanduynslagerp/enml4j.csv | 2 +- .../vbehar/rundeck-api-java-client.csv | 2 +- .../spring-boot-security-saml-sample.csv | 2 +- .../merges_timed/vdurmont/emoji-java.csv | 2 +- .../javaverbalexpressions.csv | 2 +- .../combined/merges_timed/verhas/djcproxy.csv | 2 +- .../versioneye/versioneye_maven_plugin.csv | 2 +- .../combined/merges_timed/vert-x3/docgen.csv | 2 +- .../merges_timed/vert-x3/vertx-docgen.csv | 2 +- .../combined/merges_timed/vidstige/jadb.csv | 2 +- results/combined/merges_timed/vietj/modsh.csv | 2 +- .../vijay2win/flume-cassandra-sink.csv | 2 +- .../combined/merges_timed/vipshop/saturn.csv | 2 +- .../combined/merges_timed/vkostyukov/la4j.csv | 2 +- .../vojtechhabarta/typescript-generator.csv | 2 +- .../vt-middleware/cryptacular.csv | 2 +- .../merges_timed/w3c/ldp-testsuite.csv | 2 +- .../merges_timed/wakaleo/game-of-life.csv | 2 +- .../warmuuh/libsass-maven-plugin.csv | 2 +- .../combined/merges_timed/wasdev/ci.ant.csv | 2 +- .../combined/merges_timed/wasdev/ci.maven.csv | 2 +- .../combined/merges_timed/webbit/webbit.csv | 2 +- .../merges_timed/webbukkit/dynmapcoreapi.csv | 2 +- .../merges_timed/webjars/webjars-locator.csv | 2 +- .../merges_timed/whizzosoftware/wzwave.csv | 2 +- .../wikimedia/search-highlighter.csv | 2 +- .../merges_timed/wildfirechat/server.csv | 2 +- .../wildfly/jandex-maven-plugin.csv | 2 +- .../winder/universal-g-code-sender.csv | 2 +- .../combined/merges_timed/wizzercn/nutzwk.csv | 2 +- .../wkennedy/swagger4spring-web.csv | 2 +- .../wnagele/hadoop-filesystem-sftp.csv | 2 +- .../combined/merges_timed/wnbittle/dyn4j.csv | 2 +- .../merges_timed/wocommunity/wonder.csv | 2 +- .../combined/merges_timed/woder/torchbot.csv | 2 +- results/combined/merges_timed/wokier/teh.csv | 2 +- .../merges_timed/wordnik/swagger-codegen.csv | 2 +- .../combined/merges_timed/wsky/top-push.csv | 2 +- .../merges_timed/wstrange/googleauth.csv | 2 +- .../wvengen/proguard-maven-plugin.csv | 2 +- .../merges_timed/wwadge/hbnpojogen.csv | 2 +- .../combined/merges_timed/xaverw/msearch.csv | 2 +- .../merges_timed/xceptance/xcmailr.csv | 2 +- .../combined/merges_timed/xebia/xebium.csv | 2 +- .../merges_timed/xerial/sqlite-jdbc.csv | 2 +- .../combined/merges_timed/xuxueli/xxl-job.csv | 2 +- .../merges_timed/yandex-qatools/ashot.csv | 2 +- .../yandex-qatools/postgresql-embedded.csv | 2 +- .../elasticsearch-entity-resolution.csv | 2 +- .../merges_timed/yaphone/itchat4j.csv | 2 +- .../combined/merges_timed/yegor256/rexsl.csv | 2 +- .../combined/merges_timed/yegor256/xembly.csv | 2 +- .../merges_timed/yfpeng/pengyifan-commons.csv | 2 +- .../yfpeng/pengyifan-leetcode.csv | 2 +- results/combined/merges_timed/yinlou/mltk.csv | 2 +- .../merges_timed/yinwang0/rubysonar.csv | 2 +- .../merges_timed/ymnk/jsch-agent-proxy.csv | 2 +- .../merges_timed/yubico/ykneo-openpgp.csv | 2 +- .../zalando/java-sproc-wrapper.csv | 2 +- .../merges_timed/zauberlabs/gnip4j.csv | 2 +- .../zenria/weed-fs-java-client.csv | 2 +- .../combined/merges_timed/zeromq/jeromq.csv | 2 +- .../merges_timed/zeroturnaround/zt-zip.csv | 2 +- .../combined/merges_timed/zextras/openzal.csv | 2 +- .../zhegexiaohuozi/jsoupxpath.csv | 2 +- .../merges_timed/zhongdj/lifecycle.csv | 2 +- .../merges_timed/zhuowei/raspberryjuice.csv | 2 +- .../zsoltfabok/dojo.exercises.csv | 2 +- results/combined/merges_timed/zxing/zxing.csv | 2 +- .../combined/plots/all/cost_with_manual.pdf | Bin 36299 -> 36300 bytes .../combined/plots/all/cost_with_manual.pgf | 12 ++--- .../plots/all/cost_without_manual.pdf | Bin 36198 -> 36198 bytes .../plots/all/cost_without_manual.pgf | 12 ++--- results/combined/plots/all/heatmap.pdf | Bin 41526 -> 41529 bytes results/combined/plots/all/heatmap.pgf | 44 +++++++++--------- .../combined/plots/git/cost_with_manual.pdf | Bin 34453 -> 34453 bytes .../plots/git/cost_without_manual.pdf | Bin 34099 -> 34099 bytes results/combined/plots/git/heatmap.pdf | Bin 36753 -> 36753 bytes .../combined/plots/tools/cost_with_manual.pdf | Bin 35179 -> 35177 bytes .../combined/plots/tools/cost_with_manual.pgf | 12 ++--- .../plots/tools/cost_without_manual.pdf | Bin 35092 -> 35090 bytes .../plots/tools/cost_without_manual.pgf | 12 ++--- results/combined/plots/tools/heatmap.pdf | Bin 37268 -> 37268 bytes results/combined/plots/tools/heatmap.pgf | 20 ++++---- results/combined/result.csv | 8 ++-- .../tables/all/table_feature_main_summary.tex | 4 +- .../combined/tables/all/table_run_time.tex | 4 +- results/combined/tables/all/table_summary.tex | 4 +- .../tools/table_feature_main_summary.tex | 4 +- .../combined/tables/tools/table_run_time.tex | 4 +- .../combined/tables/tools/table_summary.tex | 4 +- .../merges_analyzer_histograms.pdf | Bin 34046 -> 34046 bytes .../merges_tested/javaparser/javaparser.csv | 2 +- .../merges_timed/addthis/stream-lib.csv | 2 +- .../merges_timed/alibaba/canal.csv | 2 +- .../merges_timed/alibaba/easyexcel.csv | 2 +- .../merges_timed/antlr/grammars-v4.csv | 2 +- .../merges_timed/apache/commons-beanutils.csv | 2 +- .../merges_timed/apache/commons-codec.csv | 2 +- .../apache/commons-collections.csv | 2 +- .../merges_timed/apache/commons-dbcp.csv | 2 +- .../merges_timed/apache/commons-io.csv | 2 +- .../merges_timed/apache/commons-lang.csv | 2 +- .../merges_timed/apache/shiro.csv | 2 +- .../apache/tomcat-maven-plugin.csv | 2 +- .../merges_timed/ata4/disunity.csv | 2 +- .../merges_timed/athou/commafeed.csv | 2 +- .../merges_timed/auth0/java-jwt.csv | 2 +- .../merges_timed/awaitility/awaitility.csv | 2 +- .../merges_timed/bastillion-io/bastillion.csv | 2 +- .../biezhi/30-seconds-of-java8.csv | 2 +- .../merges_timed/bytedeco/javacpp.csv | 2 +- .../merges_timed/cglib/cglib.csv | 2 +- .../merges_timed/clojure/clojure.csv | 2 +- .../merges_timed/code4craft/webmagic.csv | 2 +- .../merges_timed/deathmarine/luyten.csv | 2 +- .../merges_timed/deemopen/zkui.csv | 2 +- .../merges_timed/dius/java-faker.csv | 2 +- .../eirslett/frontend-maven-plugin.csv | 2 +- .../elasticjob/elastic-job-lite.csv | 2 +- .../merges_timed/elunez/eladmin.csv | 2 +- .../merges_timed/esotericsoftware/kryo.csv | 2 +- .../fasterxml/jackson-annotations.csv | 2 +- .../merges_timed/fasterxml/jackson-core.csv | 2 +- .../merges_timed/ffay/lanproxy.csv | 2 +- .../merges_timed/gephi/gephi.csv | 2 +- .../google/google-java-format.csv | 2 +- .../merges_timed/google/guice.csv | 2 +- .../merges_timed/google/truth.csv | 2 +- .../hdrhistogram/hdrhistogram.csv | 2 +- .../merges_timed/j-easy/easy-rules.csv | 2 +- .../merges_timed/jakewharton/disklrucache.csv | 2 +- .../merges_timed/javaparser/javaparser.csv | 2 +- .../merges_timed/javen205/ijpay.csv | 2 +- .../merges_timed/jfinal/jfinal.csv | 2 +- .../merges_timed/jgrapht/jgrapht.csv | 2 +- .../merges_timed/jhalterman/failsafe.csv | 2 +- .../joel-costigliola/assertj-core.csv | 2 +- .../merges_timed/johncarl81/parceler.csv | 2 +- .../greatest_hits/merges_timed/jooq/jooq.csv | 2 +- .../merges_timed/jtablesaw/tablesaw.csv | 2 +- .../merges_timed/junit-team/junit4.csv | 2 +- .../jvm-profiling-tools/async-profiler.csv | 2 +- .../greatest_hits/merges_timed/jwtk/jjwt.csv | 2 +- .../merges_timed/kevin-wayne/algs4.csv | 2 +- .../merges_timed/killme2008/aviator.csv | 2 +- .../merges_timed/kong/unirest-java.csv | 2 +- .../merges_timed/konloch/bytecode-viewer.csv | 2 +- .../merges_timed/lettuce-io/lettuce-core.csv | 2 +- .../merges_timed/linlinjava/litemall.csv | 2 +- .../merges_timed/liyiorg/weixin-popular.csv | 2 +- .../logstash/logstash-logback-encoder.csv | 2 +- .../medcl/elasticsearch-analysis-ik.csv | 2 +- .../medcl/elasticsearch-analysis-pinyin.csv | 2 +- .../mojohaus/exec-maven-plugin.csv | 2 +- .../merges_timed/moquette-io/moquette.csv | 2 +- .../merges_timed/mpusher/mpush.csv | 2 +- .../merges_timed/mybatis/mybatis-3.csv | 2 +- .../merges_timed/mybatis/spring.csv | 2 +- .../merges_timed/nanohttpd/nanohttpd.csv | 2 +- .../merges_timed/nepxion/discovery.csv | 2 +- .../merges_timed/newbee-ltd/newbee-mall.csv | 2 +- .../merges_timed/ninjaframework/ninja.csv | 2 +- .../merges_timed/ninjudd/drip.csv | 2 +- .../oldmanpushcart/greys-anatomy.csv | 2 +- .../openapitools/openapi-generator.csv | 2 +- .../merges_timed/openrefine/openrefine.csv | 2 +- .../merges_timed/openzipkin/zipkin.csv | 2 +- .../pagehelper/mybatis-pagehelper.csv | 2 +- .../merges_timed/pedrovgs/algorithms.csv | 2 +- .../greatest_hits/merges_timed/pmd/pmd.csv | 2 +- .../merges_timed/qihoo360/xlearning.csv | 2 +- .../merges_timed/qunarcorp/qmq.csv | 2 +- .../merges_timed/robotiumtech/robotium.csv | 2 +- .../merges_timed/roncoo/roncoo-pay.csv | 2 +- .../merges_timed/rubenlagus/telegrambots.csv | 2 +- .../merges_timed/runelite/runelite.csv | 2 +- .../merges_timed/scribejava/scribejava.csv | 2 +- .../shopizer-ecommerce/shopizer.csv | 2 +- .../merges_timed/soabase/exhibitor.csv | 2 +- .../merges_timed/sofastack/sofa-bolt.csv | 2 +- .../merges_timed/spotify/apollo.csv | 2 +- .../merges_timed/spotify/dockerfile-maven.csv | 2 +- .../spring-data-elasticsearch.csv | 2 +- .../merges_timed/square/javapoet.csv | 2 +- .../swagger-api/swagger-codegen.csv | 2 +- .../merges_timed/thealgorithms/java.csv | 2 +- .../merges_timed/thinkgem/jeesite.csv | 2 +- .../merges_timed/tipsy/javalin.csv | 2 +- .../merges_timed/vdurmont/emoji-java.csv | 2 +- .../javaverbalexpressions.csv | 2 +- .../merges_timed/vipshop/saturn.csv | 2 +- .../merges_timed/wakaleo/game-of-life.csv | 2 +- .../merges_timed/wildfirechat/server.csv | 2 +- .../merges_timed/wizzercn/nutzwk.csv | 2 +- .../merges_timed/xuxueli/xxl-job.csv | 2 +- .../merges_timed/yaphone/itchat4j.csv | 2 +- .../merges_timed/zeromq/jeromq.csv | 2 +- .../merges_timed/zxing/zxing.csv | 2 +- .../plots/all/cost_with_manual.pdf | Bin 36299 -> 36302 bytes .../plots/all/cost_with_manual.pgf | 12 ++--- .../plots/all/cost_without_manual.pdf | Bin 36204 -> 36208 bytes .../plots/all/cost_without_manual.pgf | 12 ++--- results/greatest_hits/plots/all/heatmap.pdf | Bin 41536 -> 41536 bytes .../plots/git/cost_with_manual.pdf | Bin 34463 -> 34463 bytes .../plots/git/cost_without_manual.pdf | Bin 34110 -> 34110 bytes results/greatest_hits/plots/git/heatmap.pdf | Bin 35708 -> 35708 bytes .../plots/tools/cost_with_manual.pdf | Bin 35177 -> 35179 bytes .../plots/tools/cost_with_manual.pgf | 12 ++--- .../plots/tools/cost_without_manual.pdf | Bin 35089 -> 35090 bytes .../plots/tools/cost_without_manual.pgf | 12 ++--- results/greatest_hits/plots/tools/heatmap.pdf | Bin 37387 -> 37387 bytes results/greatest_hits/result.csv | 2 +- .../tables/all/table_feature_main_summary.tex | 4 +- .../tables/all/table_summary.tex | 4 +- .../tools/table_feature_main_summary.tex | 4 +- .../tables/tools/table_summary.tex | 4 +- results/reaper/merges_analyzer_histograms.pdf | Bin 206688 -> 206688 bytes results/reaper/merges_tested/helun/ektorp.csv | 2 +- .../merges_tested/javaparser/javaparser.csv | 2 +- .../merges_tested/jenkinsci/deploy-plugin.csv | 2 +- .../merges_tested/openhft/chronicle-bytes.csv | 2 +- results/reaper/plots/all/cost_with_manual.pdf | Bin 36288 -> 36294 bytes results/reaper/plots/all/cost_with_manual.pgf | 12 ++--- .../reaper/plots/all/cost_without_manual.pdf | Bin 36196 -> 36206 bytes .../reaper/plots/all/cost_without_manual.pgf | 12 ++--- results/reaper/plots/all/heatmap.pdf | Bin 41537 -> 41538 bytes results/reaper/plots/all/heatmap.pgf | 44 +++++++++--------- results/reaper/plots/git/cost_with_manual.pdf | Bin 34460 -> 34460 bytes .../reaper/plots/git/cost_without_manual.pdf | Bin 34106 -> 34106 bytes results/reaper/plots/git/heatmap.pdf | Bin 36360 -> 36360 bytes .../reaper/plots/tools/cost_with_manual.pdf | Bin 35172 -> 35181 bytes .../reaper/plots/tools/cost_with_manual.pgf | 12 ++--- .../plots/tools/cost_without_manual.pdf | Bin 35088 -> 35094 bytes .../plots/tools/cost_without_manual.pgf | 12 ++--- results/reaper/plots/tools/heatmap.pdf | Bin 37275 -> 37276 bytes results/reaper/plots/tools/heatmap.pgf | 20 ++++---- results/reaper/result.csv | 8 ++-- .../tables/all/table_feature_main_summary.tex | 4 +- results/reaper/tables/all/table_summary.tex | 4 +- .../tools/table_feature_main_summary.tex | 4 +- results/reaper/tables/tools/table_summary.tex | 4 +- src/scripts/merge_tools/merging | 2 +- 1299 files changed, 1409 insertions(+), 1409 deletions(-) diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf index 310a245c5e16c48f0507ed887b803fdb381bb969..868e789565cd6b760c3907e89ee6ebbd3545d6c0 100644 GIT binary patch delta 29 kcmdnn%)7Ulx1oixg=q^jlMTD2p{ap^k@0p;8|E#n0F8_YJ^%m! delta 29 kcmdnn%)7Ulx1oixg=q^jlMTD6p^1T|vB7pu8|E#n0F99dKmY&$ diff --git a/results/combined/merges_tested/helun/ektorp.csv b/results/combined/merges_tested/helun/ektorp.csv index a45a8bf3e4..454cb36276 100644 --- a/results/combined/merges_tested/helun/ektorp.csv +++ b/results/combined/merges_tested/helun/ektorp.csv @@ -6,7 +6,7 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_t 79,refs/heads/master,345afd6ec12dea70d76c5bd5bb47b7ce742b3e1c,be0a79db1d2a22eae390e8b9de685de251970f65,753ab4ad68ea6256efccca4075ba57321bf30910,,True,True,71ce7951bb39ced4bb3f30bdf89f50521ff542c0df66e6a89a674e22f424a579,Tests_passed,22149e14a0166579cf98af7fd170c4ff6925112f8c755421c9dd2ce4952e53d2,Tests_passed,True,True,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,c66222be93f2389a23bc2c014ae0e122fcde8bf49863b5950fa011fc145e16dd,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,c66222be93f2389a23bc2c014ae0e122fcde8bf49863b5950fa011fc145e16dd,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,34fa7f56cdca66b3a47e6fd0c5dd14d357a765fcb4b820128c0b66de63552372,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa 103,refs/heads/master,f4c9132355bd663e323801f480281ed66c565cb1,cd8065680a19dcb75651905522822b45ea91664c,baa5d0f934fa7fd8123ff223b3ef93eb0903c1c7,,True,True,6090d4fa7c35aec0605f8f65af89032e3f995574164ab0ebb7435560e42e6d1b,Tests_passed,c87eca59a16a18a51455034dfcad5eb2f6ea182c51b818be95383134f4c0d7dc,Tests_passed,True,True,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_failed,d719badd1fe3a0684b54618594a0232e8cc3a357343b8f28c7b727db1fcc5d6b,Tests_failed,d719badd1fe3a0684b54618594a0232e8cc3a357343b8f28c7b727db1fcc5d6b,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,eac9be4b009dfc52188b17030ae381745697c291368291a2ee160e5475075a38,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd 113,refs/heads/master,65e477cb21c8ace53b8b4322b93330ca2584b949,d6692417c338767f81a78f7a4fe261d5be0244a7,5a10854ce7f0a14a7bec61777ee00d17bd065d5e,,True,True,be2b757c77fb954520b734234af794f7a3b2062c5041449eadcaff76688037ab,Tests_passed,c7f37351eb8bafa66689e6624d79248f7a61119f19e61bf9a9be1b7d1c6750eb,Tests_passed,True,True,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,2713b0ed640932408ef941e1e596e0e8bec2e19180913c25056c16c7f094ff1e,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,2713b0ed640932408ef941e1e596e0e8bec2e19180913c25056c16c7f094ff1e,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,5753f220134d656ae68bcaf9c42a791962ed4225113ee98a52263c69ed8610ab,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a -128,refs/heads/master,be831799cf7bb0f27c544e77e2db6caa6e5e9a2b,9ac133542c7e534d818926bc92efb2370b312184,cc4724ae4c52b7006c0d9e69ad7edf9de4f6bb98,,True,True,edbf1d9cfc94046f2969b2d6822cfe0a2161b781e73d83487f051166a616aede,Tests_passed,bf3bf4ddcaea9f690e00daedc5b86f6ba5546bbe69ea2f69477fe09d5b2b52ea,Tests_passed,True,True,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_failed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_failed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,be9fde368a3b74bdfe6f43a21e7d3ad479804c22a95cd3d91c30eecde1c6f07d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf +128,refs/heads/master,be831799cf7bb0f27c544e77e2db6caa6e5e9a2b,9ac133542c7e534d818926bc92efb2370b312184,cc4724ae4c52b7006c0d9e69ad7edf9de4f6bb98,,True,True,edbf1d9cfc94046f2969b2d6822cfe0a2161b781e73d83487f051166a616aede,Tests_passed,bf3bf4ddcaea9f690e00daedc5b86f6ba5546bbe69ea2f69477fe09d5b2b52ea,Tests_passed,True,True,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_passed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,be9fde368a3b74bdfe6f43a21e7d3ad479804c22a95cd3d91c30eecde1c6f07d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf 132,refs/heads/master,ecc17e03e4b4879293d2d8ef55ff5d29e7c11735,4b7c1f352ce1b2d7de36f4f4bd37528c5f9c4ea2,262208f7a653371ac353b3f23d48511f4439cf56,,True,True,c45385779fc92e8ef90f37afc7e945b3d66555a33ed8696f6f9b9c46ba2d7cfb,Tests_passed,6046b3ea6b58bb8fe0968d093fd31950bffa784ef405d8fbd75e7dd55e021f0d,Tests_passed,True,True,Merge_failed,35e90c8aebf4080d4c9b4d3a4c4dd6036a522ff392a61d8f303a353ff816ebe7,Merge_failed,9a54eabeced0180dd25de9b5bec50e7914c9d4495fb8844a45689073e6c50cf9,Merge_failed,35e90c8aebf4080d4c9b4d3a4c4dd6036a522ff392a61d8f303a353ff816ebe7,Merge_failed,5b55708567e80aedb0e8469b89ec88ec148f3ad41ba58cd7004bd4971e029e60,Merge_failed,4da4d71896c3b2ab23ef0cb9af290100a91fa8079ee214eb7432138628f8016c,Merge_failed,4da4d71896c3b2ab23ef0cb9af290100a91fa8079ee214eb7432138628f8016c,Merge_failed,4da4d71896c3b2ab23ef0cb9af290100a91fa8079ee214eb7432138628f8016c,Merge_failed,b74189b36742854668bcec6ee36610a8b8616ac7c541ae928a897fe669f5a4ec,Merge_failed,35e90c8aebf4080d4c9b4d3a4c4dd6036a522ff392a61d8f303a353ff816ebe7,Merge_failed,a505e485b62f46eaac402a6831c80412003609d4f55b6c60539f99ebba8c26c1,Merge_failed,a505e485b62f46eaac402a6831c80412003609d4f55b6c60539f99ebba8c26c1,Merge_failed,c3b81acfb62744378b333ce39c7f57e744e0666e77e32bc82a2f0cf21bd81398,Tests_passed,df29a5fe8e21567655554c4e5b1dd03f910341e0536cbd6677c3a7e9580096c5,Merge_failed,91aef1095eef616108742fce499c9e18721a61357ac1a855fa7c7388857f4676 143,refs/remotes/origin/pull/271,3f8848a9133da7fad3bb55fb4f0c7cafbf8103d8,36cea424db31c1292a1c985469e2c5e1e5367f53,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,,True,True,bc68d33bc1dd7e94779577ac88d2302bb7dcd54d72e3e764472a02c972aee266,Tests_passed,8cead63e6744d51c52f2ac338b27733a0b752fb76b7bf25c4660c3dbfe99ff19,Tests_passed,True,True,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Tests_passed,bc68d33bc1dd7e94779577ac88d2302bb7dcd54d72e3e764472a02c972aee266,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Tests_passed,bc68d33bc1dd7e94779577ac88d2302bb7dcd54d72e3e764472a02c972aee266,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Merge_failed,dbf53a9d0e7b12edf31610e6f249e51620237b2ead360d45671dcbc6aebbb1e9,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Tests_passed,269a67b9199bb0fae191fcfd6a94bbead6884779a812859c21bad5fa9b16a7ef,Tests_passed,269a67b9199bb0fae191fcfd6a94bbead6884779a812859c21bad5fa9b16a7ef,Merge_failed,9ffa90396bb51477b4f2cf3e9429a8b464c99c41c85053eaf7c85056ddca3bd8,Tests_passed,1f42a2d4e0f6a8bef6353208c2ac8c35f0bcd6b71849a6a47636cef828d00fe8,Merge_failed,da263ddec94b9078f9f481e546499af1cc8592e534939680db00f38b396c3c43 144,refs/remotes/origin/pull/271,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,147a38fd89a5f2cf0d6bc54fc538f1cb95031ee5,66abcdc152ce8f4d61d882958e42c88b59ade06b,,True,True,442a9475b54cf8061d09c0d8ccce1cabbcc7709f559ebe3245b88194b34dde0d,Tests_passed,a55529ee7282f95d271c336ef0f35cd28cdaa358af48b5db6c5f664e9cac166f,Tests_passed,True,True,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2bd91ebab9d163dc9aa1146aa65e5e3ff9a5e1030880d4fc9be5abb1f7a3b8c2,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,bed19c3d97b2a25ae8e90d14b25fd5b97227d02d1e884e76c4221a1a892282d1,Merge_failed,e5a66a2d365954acfc6791d6a8c124b6470db8f83e543d2eeee76cf46ce6fa91 diff --git a/results/combined/merges_tested/javaparser/javaparser.csv b/results/combined/merges_tested/javaparser/javaparser.csv index 1d9b13ee59..e4bcb495c3 100644 --- a/results/combined/merges_tested/javaparser/javaparser.csv +++ b/results/combined/merges_tested/javaparser/javaparser.csv @@ -35,7 +35,7 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test re 2567,refs/remotes/origin/Issue3112,89c83f2cda338e57d5b0d6339c76acfd159b1a15,4b45bdb4b613e8e9e68640f387019c479b595927,0e768bfe7fb1b96ef4a1e32f5a369170e18a1efa,,03884b955ad72befbc339e0612a8345f7c1cf3baadafbd32ba13238b01c971bc,Tests_passed,5c4a1ab696a07b85c75a55d5f1319256ec5bbde562adb60cc045fbeaca8eef9d,Tests_passed,True,True,True,True,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,3b80ec0b193c678a17e3368637f901cacfccd7185e67171da5af934d01a3daa5,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,baa9567c0099a9cbf8daf621184addc80dfc5844f73bd0de99f9049585a0ac0d,Merge_failed,baa9567c0099a9cbf8daf621184addc80dfc5844f73bd0de99f9049585a0ac0d,Merge_failed,ab2b2b5da9aec43e70f88377c45e9bc0d5ce6800733ba86d809ccadc3ddf70ce,Tests_passed,72c3913c8b7a1928e223ca41cb04f22a11d3f2a7931e60d54fd9483f02909bf9,Merge_failed,08c65e2f8ba36a17742b3d8f2d055a9eb7f4b8a5fbdbfaee286020a46112aab1 2575,refs/remotes/origin/Issue3112,92a17baadf0066a1d326744b8c47478f2f67b69a,2229ec2e8d0d7fe4306ea0dcc4624f01ee9c2d91,1b6d2d11e2ba79c6299470b4842ebe04ae619e93,,877af0a05be6f21e510466261a02115cd0ca7be557ff36a9966650facd84f642,Tests_passed,902acb76e5b1c99646187c4f8662a1b91ebfa49132e9471a7ed79926a69d9661,Tests_passed,True,True,True,True,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,1deb92fa0cbd8b762a85dd11639483246e5975551a8d85393b346933d13c8cb6,Tests_passed,1deb92fa0cbd8b762a85dd11639483246e5975551a8d85393b346933d13c8cb6,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,0f9cb7dd770b295f4b739fa19c27c7e6e8d5b9126fce435400baff564e20d6a4,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322 2633,refs/remotes/origin/Issue3112,31cf9e1365d59cade0bce29bd22eb58d0cf2c113,2ec600c5eb514e35d3c0c24986f192d1397639ee,8045627142e190a41767094c91d3328781452d1f,,83c57eb44fc8d80edf63ec5e0d8d1f71fe5a1dbaf7691cbf60fd0e4f53a9eafc,Tests_passed,61c3a01148b5a74972541e76bbf3a92b74c3b5bfeebbeee083b33d67e364479d,Tests_passed,True,True,True,True,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,ddeec205fa871d40e89e391990d1e14030e136e40373fb3c3e9029c8d98f48cf,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Tests_passed,dfd36a0f7cb1c7b4c79848e8bf8155719f40c4c39989ae62fdfaa133ce1b9cbf,Tests_passed,dfd36a0f7cb1c7b4c79848e8bf8155719f40c4c39989ae62fdfaa133ce1b9cbf,Merge_failed,f6bcef92175c2fc36aba054a28460060adaee31555888d69ea46a740f3934d7f,Tests_passed,d62b38bebd95c5c556d3e1ae6ee5ceb178cfdf2c2af28c594c3e30a53185a1dd,Merge_failed,163c3df56fd8d3987004c45b764b74142b7f546630cf209bd609fe4d6df9ed7c -2647,refs/remotes/origin/Issue3112,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b +2647,refs/remotes/origin/Issue3112,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b 2651,refs/remotes/origin/Issue3112,fda4e4c52ee61a099533aa4d489f899591769d02,e0d5efee2e83c5bb1ecbaf60e00458dc384f04ad,ea5c9c1d7da1d88ad23c32af2de3db2daa279aee,,d0d4278ac4883ca82c6b63413a63f19397da1c861e86fd6ae0514ee602218bf9,Tests_passed,6901a58e8cd212b196c2979654a29631952db6dd94d43171ce82fb23b3cb9c52,Tests_passed,True,True,True,True,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8fdef3410d848e7de9e0e50c50d174e5088bdbfc8d992cf1fd966609dfd6b297,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8fdef3410d848e7de9e0e50c50d174e5088bdbfc8d992cf1fd966609dfd6b297,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8ac62bbf3033821ac2c44f497579449a0df6d3fa6dfcddef022cfc15d79be54d,Tests_passed,8ac62bbf3033821ac2c44f497579449a0df6d3fa6dfcddef022cfc15d79be54d,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Merge_failed,01775427a382a22204d0d9d86940603b94cb268f3d1beb6f6fc25d514c42df86,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c 2663,refs/remotes/origin/Issue3183,226365c30ea42f7a9bb83f1d0fe7fe23d75774a7,1339ae280956354b765d779f509b0dab89c5f57c,8e88daa7ca1019bb9337b1e10440d2fd03aaf391,,018e850fec6a361fa48e8d76d496fb4fad16a057023646bb75cd713f02a78904,Tests_passed,b7452039838e155eb9cc26be933af2b5bc807655daa46a64d6f75626ea16cf9c,Tests_passed,True,True,True,True,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,2e78f00365f1e97a17448c66490866a4b36da6c0b27c12265d6491aa67a5c9a9,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134 2720,refs/remotes/origin/Issue3183,19d15f4dbed959fe2c837532f0155a3e41ed0456,155768b66aca4e5dc4c2b575e52f386dbf2508d8,1aad07e18f628eb6c2bebd53e16917b2c02576f7,,2966711f6291f8687a588cffb3bf51b913b5e2c8c7bf7d1ab520d51f6afd42ce,Tests_passed,d359343cc6555eb19a8f7194bea5267d70b48760473189e06f5b910a435fbaee,Tests_passed,True,True,True,True,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,f3f2c08172bf7f832dfbe36d91439cdc77e3ba002b5bdbcfe0e767823d1167a1,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,f3f2c08172bf7f832dfbe36d91439cdc77e3ba002b5bdbcfe0e767823d1167a1,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,803b513c2d5869402b2535a742025450a6bbb7ca1692e2dcd1a28a5a4b72a762,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,7b212de88dbb77166ab64490eca38228d87754e24f4984cf4937579701b3aedc,Merge_failed,47ca2c30a9e0e4fabc490d048e7020c48a36c5291184014eed6994913dd90fc9,Merge_failed,181c9c26f9835ce2689a2cb4009a9070266b4c10cbb27c189c38bda63900595f,Merge_failed,5f803467858708e557d495bf8565b913adaeaa667fc9e071afe7cc18ee292ec8,Merge_failed,71f6077791eee222e9824b531aba9c5afef1fb8456d3f0fcea8c6229a482a337 diff --git a/results/combined/merges_tested/jenkinsci/deploy-plugin.csv b/results/combined/merges_tested/jenkinsci/deploy-plugin.csv index e5fbda0a1c..a3113e1d87 100644 --- a/results/combined/merges_tested/jenkinsci/deploy-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/deploy-plugin.csv @@ -1,3 +1,3 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -4,refs/heads/master,c58791723cc93e49d7430e51478ccd3d5fab8637,1d8fa627276dc4c63522d2f60c391c84211bd56a,71a4889710cfa96ee4ed356a696dbdb8a0d66615,,True,True,a39565f84f2a26d90542eb2e3307687bee2c087103959451775aad51bc28a3a9,Tests_passed,536c26a1583c10b4025b47c8100288487b96bd9627c59801d5ff3dd254d2bfa7,Tests_passed,True,True,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,1c54b3e59e72297131cc947f9783814f7ba61cde2db09d3b3e692aa6c21cc891,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Tests_passed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Tests_passed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,e2b41d2fd42a72d2b26d94a4a316239554cfc5ca32a5327e04d1f86e0deb346d +4,refs/heads/master,c58791723cc93e49d7430e51478ccd3d5fab8637,1d8fa627276dc4c63522d2f60c391c84211bd56a,71a4889710cfa96ee4ed356a696dbdb8a0d66615,,True,True,a39565f84f2a26d90542eb2e3307687bee2c087103959451775aad51bc28a3a9,Tests_passed,536c26a1583c10b4025b47c8100288487b96bd9627c59801d5ff3dd254d2bfa7,Tests_passed,True,True,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,1c54b3e59e72297131cc947f9783814f7ba61cde2db09d3b3e692aa6c21cc891,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Tests_failed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Tests_failed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,e2b41d2fd42a72d2b26d94a4a316239554cfc5ca32a5327e04d1f86e0deb346d 23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,True,True,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,Tests_passed,True,True,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,a72cf44162f0c612e3c2220cd90af30e204218d8cc10e876b683990ed7bbe02b,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,2b0123ac923208bb3ae6c43a0834a3477d86ecd62d49df8043cea31b4c12055a,Merge_failed,75ebaeaf049491c6e9f3978f4f2ccee3b7788e8b316855ffd1f6f997ab37bd8e,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0 diff --git a/results/combined/merges_tested/openhft/chronicle-bytes.csv b/results/combined/merges_tested/openhft/chronicle-bytes.csv index 5b8ffe22b3..517a77dd4b 100644 --- a/results/combined/merges_tested/openhft/chronicle-bytes.csv +++ b/results/combined/merges_tested/openhft/chronicle-bytes.csv @@ -1,5 +1,5 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,True,True,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,Tests_passed,True,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_failed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_failed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba +26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,True,True,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,Tests_passed,True,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba 40,refs/heads/ea,e3ac571d253f5fcf85f24e64833bb488092d58d9,2caddfea71d4a3291923e5932bf994076318b9cb,4d42f73c641704d7902aa284121ab19e3c082243,,True,True,84cc90e53681ca3be51813ccd0fa6573ecfbb2a76a204b32822d33bfe371e839,Tests_passed,6f35fce28168ab0482ac3702347930cba2f1ae10e297ec926ccfaa2640fbffa6,Tests_passed,True,True,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,669e8909cd3af663789ae3721ce7470622bfd7e35e02b6ba67792cbf4a05e35e,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,669e8909cd3af663789ae3721ce7470622bfd7e35e02b6ba67792cbf4a05e35e,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,7c916f37092b8f8e24ef8b0d0d4bde7a7b61889978632c3b37c70c682a9ae457,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,68a3032d06a0e2e05bcb37f26d8e6fa5488db90109e274d87274e5673a31a7f9,Merge_failed,68a3032d06a0e2e05bcb37f26d8e6fa5488db90109e274d87274e5673a31a7f9,Merge_failed,97e8829c4ccc4e632b02f3c721993aad8935741eaad61b2dc60b1374c05643b1,Tests_passed,b422e8d651ec939af5d4cba19f1cbb4a5d56bd0b9f0893f467bf9a39ca0a2731,Merge_failed,022708a8eae12696937384aa613a4c172d517cbf70b26da11a604faf03ec550d 50,refs/heads/ea,5bad7e86eaeaf961867ab32657bf3d9c5f4a55af,420ea2a65d88fc2661a898a5bd25ff7b4efb1a27,b92648cfac1e07a32364e98ae1214fae8ec44e56,,True,True,13f16a5d7750798b50b36cdcb3dccf80f54be2b171e306ea170267eb35982dcf,Tests_passed,e580028e81c720573643b18b671b25df9c1403f37853e8779af7b034a3f3cd9f,Tests_passed,True,True,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,33c74e6748d06bdf0d9ea6570181c9c74abebd7035d281e3e450de9189ecc918,Tests_failed,33c74e6748d06bdf0d9ea6570181c9c74abebd7035d281e3e450de9189ecc918,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,d8a4b9e85d89abab6949ac9da5e88efcabebe884f9cdd6709966ee6cd1c38ef5,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc 91,refs/heads/ea,8790063989f100d1dbbef74c717017c707fcc895,1a104fdabcbdd83df23ed505a50b02d7358e42ed,c75795b6aed917f3ae8b15a092782236c2e2adfa,,True,True,a445cf16d3b4fd38273ca6b618133f2c432c4bcd5e270c372cfb7b68f5b7102f,Tests_passed,8516c95a7fc650a1ddd17d11a0ff4be05a773dd0a6c036c0d964d1413e1b13a5,Tests_passed,True,True,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,59453f7d172684b48db0f1f474379714e4943012b38afe6c6c953d64ff1a5c68,Tests_passed,59453f7d172684b48db0f1f474379714e4943012b38afe6c6c953d64ff1a5c68,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,85a9013e772b863ce7ecba58000331f2c87483bc55471da8e770a0d6b0ca24cf,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b diff --git a/results/combined/merges_timed/47deg/firebrand.csv b/results/combined/merges_timed/47deg/firebrand.csv index 1fbfdf4ebd..479636e5dd 100644 --- a/results/combined/merges_timed/47deg/firebrand.csv +++ b/results/combined/merges_timed/47deg/firebrand.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,Tests_passed,True,True,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,0.012896537780761719,0.013041973114013672,0.014720678329467773,0.015104532241821289,0.015526533126831055,0.014889001846313477,0.015382051467895508,0.04253840446472168,0.013667583465576172,0.17956089973449707,0.17443633079528809,0.07213640213012695,1.2309420108795166,0.18947243690490723 +5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,Tests_passed,True,True,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,0.012896537780761719,0.013041973114013672,0.014720678329467773,0.015104532241821289,0.015526533126831055,0.014889001846313477,0.015382051467895508,0.04253840446472168,0.013667583465576172,0.1671314239501953,0.1683790683746338,0.07213640213012695,1.2309420108795166,0.18947243690490723 diff --git a/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv b/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv index 066b44425b..a6c89cf9f6 100644 --- a/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv +++ b/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,Tests_passed,True,True,True,True,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,0.04126715660095215,0.043260812759399414,0.035515785217285156,0.041515350341796875,0.03974151611328125,0.04084277153015137,0.04258370399475098,0.15624451637268066,0.03874063491821289,0.15428614616394043,0.1535961627960205,0.11542272567749023,1.0952305793762207,0.1811068058013916 +2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,Tests_passed,True,True,True,True,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,0.04126715660095215,0.043260812759399414,0.035515785217285156,0.041515350341796875,0.03974151611328125,0.04084277153015137,0.04258370399475098,0.15624451637268066,0.03874063491821289,0.15256905555725098,0.15196847915649414,0.11542272567749023,1.0952305793762207,0.1811068058013916 diff --git a/results/combined/merges_timed/ab0oo/javaprslib.csv b/results/combined/merges_timed/ab0oo/javaprslib.csv index 4fb731ca5a..680eae6e1f 100644 --- a/results/combined/merges_timed/ab0oo/javaprslib.csv +++ b/results/combined/merges_timed/ab0oo/javaprslib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,True,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,Tests_passed,True,True,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,aa9af827534520af2d7cef78542ceced14f4d4ec4fc62d5be033d9b138f1e691,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,6f46ec75a746a3c4a8581a73f7497be7bca08ac06774a1e9174c8f4976182f49,Merge_failed,6f46ec75a746a3c4a8581a73f7497be7bca08ac06774a1e9174c8f4976182f49,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,0.06235551834106445,0.04878687858581543,0.06207394599914551,0.05366110801696777,0.048295021057128906,0.04230785369873047,0.05101799964904785,0.5498142242431641,0.12056684494018555,0.6016194820404053,0.5984351634979248,0.4436039924621582,3.4207303524017334,0.2215745449066162 +2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,True,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,Tests_passed,True,True,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,aa9af827534520af2d7cef78542ceced14f4d4ec4fc62d5be033d9b138f1e691,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,6f46ec75a746a3c4a8581a73f7497be7bca08ac06774a1e9174c8f4976182f49,Merge_failed,6f46ec75a746a3c4a8581a73f7497be7bca08ac06774a1e9174c8f4976182f49,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,0.06235551834106445,0.04878687858581543,0.06207394599914551,0.05366110801696777,0.048295021057128906,0.04230785369873047,0.05101799964904785,0.5498142242431641,0.12056684494018555,0.568922758102417,0.5676779747009277,0.4436039924621582,3.4207303524017334,0.2215745449066162 diff --git a/results/combined/merges_timed/abel533/echarts.csv b/results/combined/merges_timed/abel533/echarts.csv index 00b44e4efa..c1131b1b23 100644 --- a/results/combined/merges_timed/abel533/echarts.csv +++ b/results/combined/merges_timed/abel533/echarts.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,Tests_passed,True,True,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,29326553a8028f23a6604f8ec4736c8e60bfedd7ee241f8f43a324a7a0cdd8e6,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,0.058470726013183594,0.05220508575439453,0.05234074592590332,0.01652383804321289,0.04126787185668945,0.058524370193481445,0.0620577335357666,0.37039971351623535,0.07571935653686523,0.47843146324157715,0.4409956932067871,0.29036879539489746,1.5497477054595947,0.31255149841308594 +9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,Tests_passed,True,True,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,29326553a8028f23a6604f8ec4736c8e60bfedd7ee241f8f43a324a7a0cdd8e6,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,0.058470726013183594,0.05220508575439453,0.05234074592590332,0.01652383804321289,0.04126787185668945,0.058524370193481445,0.0620577335357666,0.37039971351623535,0.07571935653686523,0.44581031799316406,0.4371020793914795,0.29036879539489746,1.5497477054595947,0.31255149841308594 diff --git a/results/combined/merges_timed/acciente/oacc-core.csv b/results/combined/merges_timed/acciente/oacc-core.csv index 230e85fa65..637146bd57 100644 --- a/results/combined/merges_timed/acciente/oacc-core.csv +++ b/results/combined/merges_timed/acciente/oacc-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,0ca7e4ea4fd000ca5a3b51bb5e2e2fc27f6217f2,57e7150a72573f547092a0054317ffab8219bc45,c32cb07eda7eae130ce52a9cada989e58a1fbfa3,,True,True,9648b81286e53d474cb0ca01597f0a94b155d0dd8b1bd322a8921c3ec40b15c2,Tests_passed,5137eaf1d40f9a64f41e55dfd63637b140570923d93196f215cb3b23151b0dea,Tests_passed,True,True,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,0ad53a1530f8a34063dbd30466d149f7910e477ea05235886981b3b336b9fda5,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,0.050095558166503906,0.051225900650024414,0.06375885009765625,0.0576019287109375,0.05429577827453613,0.06433653831481934,0.0503392219543457,1.1793642044067383,0.05313301086425781,2.393768787384033,2.3976223468780518,0.9874467849731445,15.49375867843628,0.4616739749908447 +4,refs/heads/master,0ca7e4ea4fd000ca5a3b51bb5e2e2fc27f6217f2,57e7150a72573f547092a0054317ffab8219bc45,c32cb07eda7eae130ce52a9cada989e58a1fbfa3,,True,True,9648b81286e53d474cb0ca01597f0a94b155d0dd8b1bd322a8921c3ec40b15c2,Tests_passed,5137eaf1d40f9a64f41e55dfd63637b140570923d93196f215cb3b23151b0dea,Tests_passed,True,True,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,0ad53a1530f8a34063dbd30466d149f7910e477ea05235886981b3b336b9fda5,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Tests_passed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,0.050095558166503906,0.051225900650024414,0.06375885009765625,0.0576019287109375,0.05429577827453613,0.06433653831481934,0.0503392219543457,1.1793642044067383,0.05313301086425781,2.4133777618408203,2.409677743911743,0.9874467849731445,15.49375867843628,0.4616739749908447 diff --git a/results/combined/merges_timed/accla/d4m_api_java.csv b/results/combined/merges_timed/accla/d4m_api_java.csv index 545d35ad8e..0271871ed3 100644 --- a/results/combined/merges_timed/accla/d4m_api_java.csv +++ b/results/combined/merges_timed/accla/d4m_api_java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,3d17b93fcaca70344f20d3adcd3bcb71b71ab097,dcd1e6bfeb129f5e5ca5c693082f255b47953e71,ffa103b362d32bf79911c413e0b290954a212577,,True,True,84bf4629f950943fc40bda04af8cfe5a677d96ca7482eace7e62211b8251690d,Tests_passed,591e65e775e1fe25a44402f01cc237c299ab39e77b832912a9dba9d5aeabfbd8,Tests_passed,True,True,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,4fa0d1a98a18b2f58ca89c97803a82f41b69e994d5199796c7abdb7d899a313a,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,433859be5e23bb27563c18163de13df149c42a73f2874bda8d175b9091767450,Merge_failed,433859be5e23bb27563c18163de13df149c42a73f2874bda8d175b9091767450,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,32807dc1e632a981efb923294f9ff9151015e5097849c94b51640fe621fa6ebb,0.048334598541259766,0.03995060920715332,0.047515869140625,0.015685081481933594,0.03248739242553711,0.05497384071350098,0.04095602035522461,0.1878986358642578,0.0999305248260498,0.23615002632141113,0.3025965690612793,0.13338041305541992,3.1145060062408447,0.3455660343170166 +11,refs/heads/master,3d17b93fcaca70344f20d3adcd3bcb71b71ab097,dcd1e6bfeb129f5e5ca5c693082f255b47953e71,ffa103b362d32bf79911c413e0b290954a212577,,True,True,84bf4629f950943fc40bda04af8cfe5a677d96ca7482eace7e62211b8251690d,Tests_passed,591e65e775e1fe25a44402f01cc237c299ab39e77b832912a9dba9d5aeabfbd8,Tests_passed,True,True,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,4fa0d1a98a18b2f58ca89c97803a82f41b69e994d5199796c7abdb7d899a313a,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,433859be5e23bb27563c18163de13df149c42a73f2874bda8d175b9091767450,Merge_failed,433859be5e23bb27563c18163de13df149c42a73f2874bda8d175b9091767450,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,32807dc1e632a981efb923294f9ff9151015e5097849c94b51640fe621fa6ebb,0.048334598541259766,0.03995060920715332,0.047515869140625,0.015685081481933594,0.03248739242553711,0.05497384071350098,0.04095602035522461,0.1878986358642578,0.0999305248260498,0.36479663848876953,0.3592853546142578,0.13338041305541992,3.1145060062408447,0.3455660343170166 diff --git a/results/combined/merges_timed/adamd/z.csv b/results/combined/merges_timed/adamd/z.csv index a9555ded10..da00352e28 100644 --- a/results/combined/merges_timed/adamd/z.csv +++ b/results/combined/merges_timed/adamd/z.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,da778dcb9cf35110cc3b35d9c4c26a66238d3450,f8384828f24a11ae196120ff713d10f772828334,3bee6597c0de4c16e2050187c6c18b753a93cee4,,108d15f512d15b3844a5e3cf260858f271ab6b7f85a9fcc2843f4c044250a122,Tests_passed,52bbd0b851c78d8f31bd94992c4d977de86880020109607f7f52095ab16c7025,Tests_passed,True,True,True,True,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,a1904180eec746d81df4ebd7d31d641e3c2bc0abba0026933257f1ec487084eb,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,f3c294a48946daf2bd294d2b5f29864288708137a09184271140f43dce1e000f,Merge_failed,f3c294a48946daf2bd294d2b5f29864288708137a09184271140f43dce1e000f,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Merge_failed,c7c8c3dcba62ab2f7540aa63637b67bcb1191b6545eca27397f3d3a204dd183a,0.04894566535949707,0.032440900802612305,0.042497873306274414,0.040682077407836914,0.04343724250793457,0.0345759391784668,0.04829692840576172,0.1744997501373291,0.06703448295593262,0.07052183151245117,0.0793302059173584,0.12603282928466797,2.02311372756958,0.2251896858215332 +1,refs/heads/master,da778dcb9cf35110cc3b35d9c4c26a66238d3450,f8384828f24a11ae196120ff713d10f772828334,3bee6597c0de4c16e2050187c6c18b753a93cee4,,108d15f512d15b3844a5e3cf260858f271ab6b7f85a9fcc2843f4c044250a122,Tests_passed,52bbd0b851c78d8f31bd94992c4d977de86880020109607f7f52095ab16c7025,Tests_passed,True,True,True,True,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,a1904180eec746d81df4ebd7d31d641e3c2bc0abba0026933257f1ec487084eb,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,f3c294a48946daf2bd294d2b5f29864288708137a09184271140f43dce1e000f,Merge_failed,f3c294a48946daf2bd294d2b5f29864288708137a09184271140f43dce1e000f,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Merge_failed,c7c8c3dcba62ab2f7540aa63637b67bcb1191b6545eca27397f3d3a204dd183a,0.04894566535949707,0.032440900802612305,0.042497873306274414,0.040682077407836914,0.04343724250793457,0.0345759391784668,0.04829692840576172,0.1744997501373291,0.06703448295593262,0.0767815113067627,0.07810640335083008,0.12603282928466797,2.02311372756958,0.2251896858215332 diff --git a/results/combined/merges_timed/adangel/pmd.csv b/results/combined/merges_timed/adangel/pmd.csv index bf7187af93..8887a98568 100644 --- a/results/combined/merges_timed/adangel/pmd.csv +++ b/results/combined/merges_timed/adangel/pmd.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -372,refs/heads/master,a2c344fb54f78c17d684a9b8b2158d23e326a874,c5691ecf3524e69422f4e0b3dbcf31663fc4c8a9,494719d8ea74102313cbbca6c69bdc6e714f43d4,,5659132465f31609bb508c3b9f6727d89fe0273ec2b8a06f8e28b85a5d9f38f3,Tests_passed,671ea11802bc5efa664eac801aa45a164b4f478cb732a9cac20864aa7f6883d9,Tests_passed,True,True,True,True,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7b397d9858ce04ef6f080eef96ef54986de392de1a55dd54680660cc7c558110,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,e801101318f5efe7ba9e1b6d7b763e4b31054b332d4ffd55829ad9cc69d8d75a,Merge_failed,e801101318f5efe7ba9e1b6d7b763e4b31054b332d4ffd55829ad9cc69d8d75a,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_failed,91c259922779353b550c481109abacb5bc44d305aa3138a9a78b7bb779cecdb0,0.059174299240112305,0.0492095947265625,0.061598777770996094,0.06244969367980957,0.07065439224243164,0.07184767723083496,0.06354117393493652,0.3733937740325928,0.17394042015075684,0.09875869750976562,0.09890460968017578,0.17336368560791016,1.0058441162109375,2.350447416305542 +372,refs/heads/master,a2c344fb54f78c17d684a9b8b2158d23e326a874,c5691ecf3524e69422f4e0b3dbcf31663fc4c8a9,494719d8ea74102313cbbca6c69bdc6e714f43d4,,5659132465f31609bb508c3b9f6727d89fe0273ec2b8a06f8e28b85a5d9f38f3,Tests_passed,671ea11802bc5efa664eac801aa45a164b4f478cb732a9cac20864aa7f6883d9,Tests_passed,True,True,True,True,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7b397d9858ce04ef6f080eef96ef54986de392de1a55dd54680660cc7c558110,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,e801101318f5efe7ba9e1b6d7b763e4b31054b332d4ffd55829ad9cc69d8d75a,Merge_failed,e801101318f5efe7ba9e1b6d7b763e4b31054b332d4ffd55829ad9cc69d8d75a,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_failed,91c259922779353b550c481109abacb5bc44d305aa3138a9a78b7bb779cecdb0,0.059174299240112305,0.0492095947265625,0.061598777770996094,0.06244969367980957,0.07065439224243164,0.07184767723083496,0.06354117393493652,0.3733937740325928,0.17394042015075684,0.10003232955932617,0.09995245933532715,0.17336368560791016,1.0058441162109375,2.350447416305542 diff --git a/results/combined/merges_timed/addthis/meshy.csv b/results/combined/merges_timed/addthis/meshy.csv index e909071b78..38020b95e7 100644 --- a/results/combined/merges_timed/addthis/meshy.csv +++ b/results/combined/merges_timed/addthis/meshy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/remotes/origin/pull/7,66ca16d72b571aa4ce1ed8286de3484fc007ec45,5f37bbd2de7caa3e5d23f54d4a1e685d37e2a74d,58b0e349f804c13a0214a30a9ac93dcde42be2ca,,True,True,1ff45d0cdda0ae3c5518967939172bd066cb971972d87b36cc1252b07877c87d,Tests_passed,78ec20e951c988bc2eb553cfcaf5bcdc4d03ae76632490c97261b8d9430fa49f,Tests_passed,True,True,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,4556d4267b5a466652b2ae1db1dcb50aba3b62d6e04c9b6bba76997ff41076c5,Merge_failed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,0.01888275146484375,0.01868128776550293,0.023008108139038086,0.02333831787109375,0.023616313934326172,0.02317953109741211,0.023730993270874023,0.05086326599121094,0.0182342529296875,0.17458534240722656,0.17513370513916016,0.07240724563598633,1.0570788383483887,0.19292306900024414 +8,refs/remotes/origin/pull/7,66ca16d72b571aa4ce1ed8286de3484fc007ec45,5f37bbd2de7caa3e5d23f54d4a1e685d37e2a74d,58b0e349f804c13a0214a30a9ac93dcde42be2ca,,True,True,1ff45d0cdda0ae3c5518967939172bd066cb971972d87b36cc1252b07877c87d,Tests_passed,78ec20e951c988bc2eb553cfcaf5bcdc4d03ae76632490c97261b8d9430fa49f,Tests_passed,True,True,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,4556d4267b5a466652b2ae1db1dcb50aba3b62d6e04c9b6bba76997ff41076c5,Merge_failed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,0.01888275146484375,0.01868128776550293,0.023008108139038086,0.02333831787109375,0.023616313934326172,0.02317953109741211,0.023730993270874023,0.05086326599121094,0.0182342529296875,0.17240118980407715,0.17555856704711914,0.07240724563598633,1.0570788383483887,0.19292306900024414 diff --git a/results/combined/merges_timed/addthis/stream-lib.csv b/results/combined/merges_timed/addthis/stream-lib.csv index 2e83c19f0c..61bef4321f 100644 --- a/results/combined/merges_timed/addthis/stream-lib.csv +++ b/results/combined/merges_timed/addthis/stream-lib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -83,refs/remotes/origin/pull/3,efd2e9109fb28ab7c4439d0cbd544de31b14c370,cbf6ced5ab8f1d937bd9b71d703a3aed92ed3bcc,87a0cde639eb0d7bd288942cec23e03ca05193ba,,True,True,2bdcd30693dbabdd1e8f9a98ebfc1a15ef63ae2275ff13d908e1660fd45e70b1,Tests_passed,6e3ab9557e76c728b79fd80513b734157b3fc184dc20163a195072574e828540,Tests_passed,True,True,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,dd545ad348a544e026549182ee1de212a350ea65639875c65fc05648b6bda39c,Merge_failed,dd545ad348a544e026549182ee1de212a350ea65639875c65fc05648b6bda39c,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,555f4683d4101904ed9ad425f9da055d43ecfd1cd733e4d148bb736109be10a1,0.04139542579650879,0.03820514678955078,0.0413060188293457,0.041778564453125,0.0441133975982666,0.03551530838012695,0.05505013465881348,0.1272902488708496,0.06768059730529785,0.08187294006347656,0.08181381225585938,0.11559677124023438,0.6391665935516357,0.21042990684509277 +83,refs/remotes/origin/pull/3,efd2e9109fb28ab7c4439d0cbd544de31b14c370,cbf6ced5ab8f1d937bd9b71d703a3aed92ed3bcc,87a0cde639eb0d7bd288942cec23e03ca05193ba,,True,True,2bdcd30693dbabdd1e8f9a98ebfc1a15ef63ae2275ff13d908e1660fd45e70b1,Tests_passed,6e3ab9557e76c728b79fd80513b734157b3fc184dc20163a195072574e828540,Tests_passed,True,True,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,dd545ad348a544e026549182ee1de212a350ea65639875c65fc05648b6bda39c,Merge_failed,dd545ad348a544e026549182ee1de212a350ea65639875c65fc05648b6bda39c,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,555f4683d4101904ed9ad425f9da055d43ecfd1cd733e4d148bb736109be10a1,0.04139542579650879,0.03820514678955078,0.0413060188293457,0.041778564453125,0.0441133975982666,0.03551530838012695,0.05505013465881348,0.1272902488708496,0.06768059730529785,0.08134913444519043,0.08172154426574707,0.11559677124023438,0.6391665935516357,0.21042990684509277 diff --git a/results/combined/merges_timed/adoptopenjdk/mjprof.csv b/results/combined/merges_timed/adoptopenjdk/mjprof.csv index 73a558cfdd..bf903c28f8 100644 --- a/results/combined/merges_timed/adoptopenjdk/mjprof.csv +++ b/results/combined/merges_timed/adoptopenjdk/mjprof.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,754462e890ac29f2155ef2f60aeba253ad15ce76,4962f53609eea0aeef8b98fa156f0d8d12ced109,b53ee16a330b07ab9a9171da60c2919319542260,,True,True,5b9435e155856cdcbee1c87c1a2a84b98957fc6e9ffdc5bcfc0d512ec6cad1e7,Tests_passed,2b9f80aeff490dd0aba9103f23c5be1914eab72d338aa977739f57ec51c71cc5,Tests_passed,True,True,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,2c461c7ba0969bfe6de5284264f5a3c9a8eba337c46787cc0aea261b241b202c,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,2c461c7ba0969bfe6de5284264f5a3c9a8eba337c46787cc0aea261b241b202c,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,62d9d6b1cb3d0a5516df5a5d0c2a35ff8c88c29768d81c546caf08eceb14eb13,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,3b1fa0bfe87f72f4ae027cf0b2c0e6aafe513beabc816d1695ef59b303656437,Merge_failed,3b1fa0bfe87f72f4ae027cf0b2c0e6aafe513beabc816d1695ef59b303656437,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Merge_failed,482551837e83e9b82fd694d4be401111862cbefe29fe2a672ef52d991d2ee734,0.04915285110473633,0.043497323989868164,0.04964947700500488,0.0445246696472168,0.051734209060668945,0.03849434852600098,0.05000710487365723,0.36870265007019043,0.07616281509399414,0.4840548038482666,0.48341846466064453,0.2714059352874756,2.2204344272613525,0.26149559020996094 +10,refs/heads/master,754462e890ac29f2155ef2f60aeba253ad15ce76,4962f53609eea0aeef8b98fa156f0d8d12ced109,b53ee16a330b07ab9a9171da60c2919319542260,,True,True,5b9435e155856cdcbee1c87c1a2a84b98957fc6e9ffdc5bcfc0d512ec6cad1e7,Tests_passed,2b9f80aeff490dd0aba9103f23c5be1914eab72d338aa977739f57ec51c71cc5,Tests_passed,True,True,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,2c461c7ba0969bfe6de5284264f5a3c9a8eba337c46787cc0aea261b241b202c,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,2c461c7ba0969bfe6de5284264f5a3c9a8eba337c46787cc0aea261b241b202c,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,62d9d6b1cb3d0a5516df5a5d0c2a35ff8c88c29768d81c546caf08eceb14eb13,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,3b1fa0bfe87f72f4ae027cf0b2c0e6aafe513beabc816d1695ef59b303656437,Merge_failed,3b1fa0bfe87f72f4ae027cf0b2c0e6aafe513beabc816d1695ef59b303656437,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Merge_failed,482551837e83e9b82fd694d4be401111862cbefe29fe2a672ef52d991d2ee734,0.04915285110473633,0.043497323989868164,0.04964947700500488,0.0445246696472168,0.051734209060668945,0.03849434852600098,0.05000710487365723,0.36870265007019043,0.07616281509399414,0.48561882972717285,0.48591113090515137,0.2714059352874756,2.2204344272613525,0.26149559020996094 diff --git a/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv b/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv index 628feac7bd..8dde5ada1e 100644 --- a/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv +++ b/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/master,4c895357e7aa06557e4ca3eae89f727c2c1534f5,592aac6c071772332a8f3f405fcc6d6c2b94fcb3,07beb7efc7bd0c3319076c9f14219f8392a39b7c,,True,True,c63b54bfea1e25b29e519ebf48e0e4a7f834431446bc01f8a4fbf657a9917b2b,Tests_passed,8e399dc2b014f51497be382d63e2bef7b908ba4b122fd20dbf03847fac0aba46,Tests_passed,True,True,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,0.04066610336303711,0.0356898307800293,0.049436092376708984,0.04321742057800293,0.04697704315185547,0.038055419921875,0.04082536697387695,0.16793203353881836,0.0392305850982666,0.14627718925476074,0.14653778076171875,0.11169123649597168,0.5147333145141602,0.18735146522521973 +17,refs/heads/master,4c895357e7aa06557e4ca3eae89f727c2c1534f5,592aac6c071772332a8f3f405fcc6d6c2b94fcb3,07beb7efc7bd0c3319076c9f14219f8392a39b7c,,True,True,c63b54bfea1e25b29e519ebf48e0e4a7f834431446bc01f8a4fbf657a9917b2b,Tests_passed,8e399dc2b014f51497be382d63e2bef7b908ba4b122fd20dbf03847fac0aba46,Tests_passed,True,True,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,0.04066610336303711,0.0356898307800293,0.049436092376708984,0.04321742057800293,0.04697704315185547,0.038055419921875,0.04082536697387695,0.16793203353881836,0.0392305850982666,0.14440417289733887,0.1438138484954834,0.11169123649597168,0.5147333145141602,0.18735146522521973 diff --git a/results/combined/merges_timed/aerospike/aerospike-client-java.csv b/results/combined/merges_timed/aerospike/aerospike-client-java.csv index aff4bb653a..81dbeaaee1 100644 --- a/results/combined/merges_timed/aerospike/aerospike-client-java.csv +++ b/results/combined/merges_timed/aerospike/aerospike-client-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -66,refs/remotes/origin/proxy-stream-selection,94db6c183ad87d64bc7a89f731e55f65018ceea0,0df88d60943e223fb5842ed3292925c05f46e4a6,123bb510608100b0b51c51fb0d8b0f86d7628640,,True,True,116d6520584868b62f4f7687e24e8dd133d7f90b5bdd1135564fdee82f46df0e,Tests_passed,af6222d6abee98f4a8744d2daf07fa3360d61c59321e0930640f1ab496b9f9c0,Tests_passed,True,True,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,7f6df8fb5f01030f2e429885cd84e8ab36ae8f140399dff2a3497286b8df619f,Merge_failed,7f6df8fb5f01030f2e429885cd84e8ab36ae8f140399dff2a3497286b8df619f,Merge_failed,7f6df8fb5f01030f2e429885cd84e8ab36ae8f140399dff2a3497286b8df619f,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,30be88a47e8a8b8ccd3e9856261d02b04131dde574a8f4b4bacc2bb42a145e1a,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,1be7e876813c478066c0cf2507deaf6842f5b78d3c265a47810c870025b51d1e,Merge_failed,1be7e876813c478066c0cf2507deaf6842f5b78d3c265a47810c870025b51d1e,Merge_failed,d03d84d75b478a1d966a0fa830a8b13700c36f6314d4519b0349adec1df8f83d,Merge_failed,df73568f22e587d0e55e24bc45c5921bf36fb63ff17927793a9bee89d10ef633,Merge_failed,5946af71a74baeba6caf025cbb47a50a762e713e15e57a13c170556696698af9,0.044617652893066406,0.04093766212463379,0.03664231300354004,0.044622182846069336,0.04131793975830078,0.04255843162536621,0.04135847091674805,0.18261218070983887,0.07683134078979492,0.06558632850646973,0.0832526683807373,0.12122583389282227,0.629514217376709,0.2656893730163574 +66,refs/remotes/origin/proxy-stream-selection,94db6c183ad87d64bc7a89f731e55f65018ceea0,0df88d60943e223fb5842ed3292925c05f46e4a6,123bb510608100b0b51c51fb0d8b0f86d7628640,,True,True,116d6520584868b62f4f7687e24e8dd133d7f90b5bdd1135564fdee82f46df0e,Tests_passed,af6222d6abee98f4a8744d2daf07fa3360d61c59321e0930640f1ab496b9f9c0,Tests_passed,True,True,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,7f6df8fb5f01030f2e429885cd84e8ab36ae8f140399dff2a3497286b8df619f,Merge_failed,7f6df8fb5f01030f2e429885cd84e8ab36ae8f140399dff2a3497286b8df619f,Merge_failed,7f6df8fb5f01030f2e429885cd84e8ab36ae8f140399dff2a3497286b8df619f,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,30be88a47e8a8b8ccd3e9856261d02b04131dde574a8f4b4bacc2bb42a145e1a,Merge_failed,b5f6d319bbfd94a985ff30d8b58549cef9872bebcdfb506921326dd98e126a89,Merge_failed,1be7e876813c478066c0cf2507deaf6842f5b78d3c265a47810c870025b51d1e,Merge_failed,1be7e876813c478066c0cf2507deaf6842f5b78d3c265a47810c870025b51d1e,Merge_failed,d03d84d75b478a1d966a0fa830a8b13700c36f6314d4519b0349adec1df8f83d,Merge_failed,df73568f22e587d0e55e24bc45c5921bf36fb63ff17927793a9bee89d10ef633,Merge_failed,5946af71a74baeba6caf025cbb47a50a762e713e15e57a13c170556696698af9,0.044617652893066406,0.04093766212463379,0.03664231300354004,0.044622182846069336,0.04131793975830078,0.04255843162536621,0.04135847091674805,0.18261218070983887,0.07683134078979492,0.08317208290100098,0.06844282150268555,0.12122583389282227,0.629514217376709,0.2656893730163574 diff --git a/results/combined/merges_timed/afranken/jmeter-analysis-maven-plugin.csv b/results/combined/merges_timed/afranken/jmeter-analysis-maven-plugin.csv index 42b7ebf26a..375d0f6d66 100644 --- a/results/combined/merges_timed/afranken/jmeter-analysis-maven-plugin.csv +++ b/results/combined/merges_timed/afranken/jmeter-analysis-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,b5d8d8fc2b75beaa9fa6265208204639dc084991,a8efde4deeb7c6826c64e4e4656c99511ee5df11,7ce5946f318da235038f01f43c3566d8f34b3bc5,,7b3c674776f4d8f8ab18c29f7e304225ace2138b54558f968612c557541dccfd,Tests_passed,5025ee670c84f99302eeaece879ea4b137795a40f904569bc0023892bc174d5d,Tests_passed,True,True,True,True,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,0.025925159454345703,0.0280914306640625,0.02650761604309082,0.028182268142700195,0.029128313064575195,0.033614397048950195,0.02679157257080078,0.11139464378356934,0.031675100326538086,0.15679931640625,0.15686464309692383,0.10037803649902344,0.7550044059753418,0.1969592571258545 +11,refs/heads/master,b5d8d8fc2b75beaa9fa6265208204639dc084991,a8efde4deeb7c6826c64e4e4656c99511ee5df11,7ce5946f318da235038f01f43c3566d8f34b3bc5,,7b3c674776f4d8f8ab18c29f7e304225ace2138b54558f968612c557541dccfd,Tests_passed,5025ee670c84f99302eeaece879ea4b137795a40f904569bc0023892bc174d5d,Tests_passed,True,True,True,True,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,0.025925159454345703,0.0280914306640625,0.02650761604309082,0.028182268142700195,0.029128313064575195,0.033614397048950195,0.02679157257080078,0.11139464378356934,0.031675100326538086,0.15503382682800293,0.15498995780944824,0.10037803649902344,0.7550044059753418,0.1969592571258545 diff --git a/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv b/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv index 63412607c9..873335aa48 100644 --- a/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv +++ b/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,dcf5bee7e969cb5716d5f3490e2ca5722690e318,837e0ae272fc50670019de5dcf6453b2207c2ee5,1796bb4a2081cedb2c82ca81a2205640e9de26bf,,True,True,95ace073d911d2a7ae61404c02199f1fb81d116d47bd044a5460e18e2ff2b52e,Tests_passed,ed814382591eb25113a1995f80dee9b3ab804db58b06090d0e40e5b236180326,Tests_passed,True,True,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,0.04303336143493652,0.04474186897277832,0.0574038028717041,0.05401277542114258,0.04700636863708496,0.05389547348022461,0.04616212844848633,0.1728227138519287,0.04077768325805664,0.16448736190795898,0.16480588912963867,0.06926488876342773,0.9574501514434814,0.32030630111694336 +24,refs/heads/master,dcf5bee7e969cb5716d5f3490e2ca5722690e318,837e0ae272fc50670019de5dcf6453b2207c2ee5,1796bb4a2081cedb2c82ca81a2205640e9de26bf,,True,True,95ace073d911d2a7ae61404c02199f1fb81d116d47bd044a5460e18e2ff2b52e,Tests_passed,ed814382591eb25113a1995f80dee9b3ab804db58b06090d0e40e5b236180326,Tests_passed,True,True,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,0.04303336143493652,0.04474186897277832,0.0574038028717041,0.05401277542114258,0.04700636863708496,0.05389547348022461,0.04616212844848633,0.1728227138519287,0.04077768325805664,0.15980768203735352,0.20792698860168457,0.06926488876342773,0.9574501514434814,0.32030630111694336 diff --git a/results/combined/merges_timed/ahome-it/lienzo-core.csv b/results/combined/merges_timed/ahome-it/lienzo-core.csv index d42f9366f5..19f00709af 100644 --- a/results/combined/merges_timed/ahome-it/lienzo-core.csv +++ b/results/combined/merges_timed/ahome-it/lienzo-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/2.0,bf4b253816bc316cd6dc5437f7ca25f35f591863,9c20b62e512757f686df15a748caa633ccf0cd88,c4be5cb68537dd419f2524786e41404f422ee8fb,,ce70921e19a3f1dffaa9a4963a8dcdddacf62da1c4e8cd21687762c526a66be6,Tests_passed,b07213c428a3ced1d96428b0b5994a5a8e6fae59332b29e48d1937e72f556e2f,Tests_passed,True,True,True,True,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,0.04841494560241699,0.04838371276855469,0.04666256904602051,0.02518463134765625,0.06575679779052734,0.054121971130371094,0.06087636947631836,0.2000596523284912,0.06461882591247559,0.16709327697753906,0.17803215980529785,0.1323394775390625,0.8441038131713867,0.30913329124450684 +31,refs/heads/2.0,bf4b253816bc316cd6dc5437f7ca25f35f591863,9c20b62e512757f686df15a748caa633ccf0cd88,c4be5cb68537dd419f2524786e41404f422ee8fb,,ce70921e19a3f1dffaa9a4963a8dcdddacf62da1c4e8cd21687762c526a66be6,Tests_passed,b07213c428a3ced1d96428b0b5994a5a8e6fae59332b29e48d1937e72f556e2f,Tests_passed,True,True,True,True,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,0.04841494560241699,0.04838371276855469,0.04666256904602051,0.02518463134765625,0.06575679779052734,0.054121971130371094,0.06087636947631836,0.2000596523284912,0.06461882591247559,0.17985963821411133,0.16700959205627441,0.1323394775390625,0.8441038131713867,0.30913329124450684 diff --git a/results/combined/merges_timed/aleksandr-m/gitflow-maven-plugin.csv b/results/combined/merges_timed/aleksandr-m/gitflow-maven-plugin.csv index 7b91f1e9dd..26a299e495 100644 --- a/results/combined/merges_timed/aleksandr-m/gitflow-maven-plugin.csv +++ b/results/combined/merges_timed/aleksandr-m/gitflow-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -42,refs/remotes/origin/pull/126,21e89d1e201502c297cc8d03fae44c05bc51dfc4,98dd7f98f7ada6fbf3763e72a5c8498170ddab97,e5b220f1dff09d41d67719194b026555c620c592,,429bb16fbb9c0e92ec28a971961e9100ff0eec66077fce7d1b811561d230582b,Tests_passed,3691f73dc9c649ed52d230ac8d41ab2d3bfa5c0f997db0fa205fe13ca2f0d976,Tests_passed,True,True,True,True,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,fee3937243723c51628c52a21dc7b5e4ab26a2c800369bdc9c04535c292f9940,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,d002321eec6646fb7c349fb668ba4b93aa499aac9f694880053c6a6c47f33034,Merge_failed,d002321eec6646fb7c349fb668ba4b93aa499aac9f694880053c6a6c47f33034,Merge_failed,1b77c8d8242d095cf523c6de06672a54bbcc6b7a710e5da359c045bcf9c0e9ae,Merge_failed,1d5606d138ff14b72de767d989e01c8cf55060c1a3ca5a5c009ed7e86512004e,Merge_failed,1d5606d138ff14b72de767d989e01c8cf55060c1a3ca5a5c009ed7e86512004e,0.04816436767578125,0.05373859405517578,0.05527544021606445,0.05713939666748047,0.05809640884399414,0.04759621620178223,0.05447554588317871,0.2222135066986084,0.08879303932189941,0.1430654525756836,0.14210104942321777,0.18268680572509766,0.035893917083740234,0.2222750186920166 +42,refs/remotes/origin/pull/126,21e89d1e201502c297cc8d03fae44c05bc51dfc4,98dd7f98f7ada6fbf3763e72a5c8498170ddab97,e5b220f1dff09d41d67719194b026555c620c592,,429bb16fbb9c0e92ec28a971961e9100ff0eec66077fce7d1b811561d230582b,Tests_passed,3691f73dc9c649ed52d230ac8d41ab2d3bfa5c0f997db0fa205fe13ca2f0d976,Tests_passed,True,True,True,True,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,fee3937243723c51628c52a21dc7b5e4ab26a2c800369bdc9c04535c292f9940,Merge_failed,2b537589b89f0997224cd300b42174dc272209e37cd7709856833cfb49687289,Merge_failed,d002321eec6646fb7c349fb668ba4b93aa499aac9f694880053c6a6c47f33034,Merge_failed,d002321eec6646fb7c349fb668ba4b93aa499aac9f694880053c6a6c47f33034,Merge_failed,1b77c8d8242d095cf523c6de06672a54bbcc6b7a710e5da359c045bcf9c0e9ae,Merge_failed,1d5606d138ff14b72de767d989e01c8cf55060c1a3ca5a5c009ed7e86512004e,Merge_failed,1d5606d138ff14b72de767d989e01c8cf55060c1a3ca5a5c009ed7e86512004e,0.04816436767578125,0.05373859405517578,0.05527544021606445,0.05713939666748047,0.05809640884399414,0.04759621620178223,0.05447554588317871,0.2222135066986084,0.08879303932189941,0.14252185821533203,0.143021821975708,0.18268680572509766,0.035893917083740234,0.2222750186920166 diff --git a/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv b/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv index e75b486762..86751af59e 100644 --- a/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv +++ b/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,feb36bfc8ee3a9e0d4394ef8e845a97c8c489840,daf63b4a8f05792b6c0f530445dc9238b83ed136,f9c2d45541a4c000039e68f8f4cf23dec19efc8d,,829c333d86eab04b07bdb6004aff20a4904992aedaca3f8e2a60b1b86ef5b14a,Tests_passed,52bd5a2eeca2dc99be68d4cc0639a7878f053159cb66dedff9a978108a9aa6ae,Tests_passed,True,True,True,True,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,c3d9818d3f67baca386ac62aaa083c3fbff9e8ef9864aed44adff7f9e50ed891,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,f9bae20ea794f7fe4b94bb50ff3e9f51d4bcfcbe06b5bb186c7eb20986151ac3,Merge_failed,f9bae20ea794f7fe4b94bb50ff3e9f51d4bcfcbe06b5bb186c7eb20986151ac3,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,26edef49b09c33360a2bc727f60a6c2147771e4b44de3eecb15528a30e6e7f32,0.008359432220458984,0.008524656295776367,0.00841379165649414,0.008128881454467773,0.008086919784545898,0.008294820785522461,0.00823211669921875,0.031957149505615234,0.012768268585205078,0.06209087371826172,0.06256365776062012,0.06733465194702148,0.41270971298217773,0.15501046180725098 +1,refs/heads/master,feb36bfc8ee3a9e0d4394ef8e845a97c8c489840,daf63b4a8f05792b6c0f530445dc9238b83ed136,f9c2d45541a4c000039e68f8f4cf23dec19efc8d,,829c333d86eab04b07bdb6004aff20a4904992aedaca3f8e2a60b1b86ef5b14a,Tests_passed,52bd5a2eeca2dc99be68d4cc0639a7878f053159cb66dedff9a978108a9aa6ae,Tests_passed,True,True,True,True,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,c3d9818d3f67baca386ac62aaa083c3fbff9e8ef9864aed44adff7f9e50ed891,Merge_failed,7027a5204e9602062fce09230acbdeecf9c6641ee005888a197a7d37ae145162,Merge_failed,f9bae20ea794f7fe4b94bb50ff3e9f51d4bcfcbe06b5bb186c7eb20986151ac3,Merge_failed,f9bae20ea794f7fe4b94bb50ff3e9f51d4bcfcbe06b5bb186c7eb20986151ac3,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,26edef49b09c33360a2bc727f60a6c2147771e4b44de3eecb15528a30e6e7f32,0.008359432220458984,0.008524656295776367,0.00841379165649414,0.008128881454467773,0.008086919784545898,0.008294820785522461,0.00823211669921875,0.031957149505615234,0.012768268585205078,0.0626826286315918,0.06231546401977539,0.06733465194702148,0.41270971298217773,0.15501046180725098 diff --git a/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv b/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv index 7ac09133b1..6140d4343d 100644 --- a/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv +++ b/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -54,refs/heads/master,690d8dcc2e2b230c9aa4c5484f74ee56fd7ba029,56a03c07946d9e1137c25c34b561f269a85682b7,f9c65f30b453deaa676db4d2f40a43a61f237a16,,True,True,53fc56880a65ecfc2ddafcc027eb7040a993b64fdf36ca0154d26697fb8cb7b6,Tests_passed,f67be7c2def7ff51b5a974e2670e3afc7250b6f25a0daa39f159acbc3674f211,Tests_passed,True,True,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,00262d6a1175719ca07ada0e73c3b36f084a42365b61696d0d9c0fd607d9f86e,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,23ecea7eb3fabf3a8ce9c5c62521f9d8efb94ad79b6103ad609c528197a51846,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,c89501900b6cbd0f1219843732848511f0ed9eb5f5e5233616047cfda61a9daf,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,8ebee0b03ab4d3659aaad9986f2fe75b3885b15972020301848fa53b34ee06de,Merge_failed,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,0.012655258178710938,0.012688636779785156,0.013115406036376953,0.01305842399597168,0.013622760772705078,0.01370096206665039,0.013699769973754883,0.051129817962646484,0.01775956153869629,0.010726213455200195,0.010911703109741211,0.07194709777832031,0.01580023765563965,0.1978449821472168 +54,refs/heads/master,690d8dcc2e2b230c9aa4c5484f74ee56fd7ba029,56a03c07946d9e1137c25c34b561f269a85682b7,f9c65f30b453deaa676db4d2f40a43a61f237a16,,True,True,53fc56880a65ecfc2ddafcc027eb7040a993b64fdf36ca0154d26697fb8cb7b6,Tests_passed,f67be7c2def7ff51b5a974e2670e3afc7250b6f25a0daa39f159acbc3674f211,Tests_passed,True,True,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,00262d6a1175719ca07ada0e73c3b36f084a42365b61696d0d9c0fd607d9f86e,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,23ecea7eb3fabf3a8ce9c5c62521f9d8efb94ad79b6103ad609c528197a51846,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,c89501900b6cbd0f1219843732848511f0ed9eb5f5e5233616047cfda61a9daf,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,8ebee0b03ab4d3659aaad9986f2fe75b3885b15972020301848fa53b34ee06de,Merge_failed,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,0.012655258178710938,0.012688636779785156,0.013115406036376953,0.01305842399597168,0.013622760772705078,0.01370096206665039,0.013699769973754883,0.051129817962646484,0.01775956153869629,0.010499715805053711,0.010535955429077148,0.07194709777832031,0.01580023765563965,0.1978449821472168 diff --git a/results/combined/merges_timed/alexruiz/fest-util.csv b/results/combined/merges_timed/alexruiz/fest-util.csv index 8cb398d877..15aa7b508e 100644 --- a/results/combined/merges_timed/alexruiz/fest-util.csv +++ b/results/combined/merges_timed/alexruiz/fest-util.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,3c3d01351f4149a749f8278423ca5d8112b18102,06f36741ee79cc5ed52de5ff4abd7ba2e676a40a,e95a95aac15a74c43627ec042c7a87bdb6852b9b,,f9eca1f111e34587fdbf9e205daa8b08deb0dd575e934f26ac783e2561d1e199,Tests_passed,ca81b0f754f0d863f9395ed9304d5a041f5337275d61814628ccaa0719226661,Tests_passed,True,True,True,True,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,3718cc6b0f38a1b20728c584984cb8f38a1f9419f841efc7035e3eb3dc67fc47,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,9473c23548c9422912b5e1fc1c2436a7692fd9efa67c23e788bfc0b3a780c3ae,0.041092872619628906,0.04371070861816406,0.042133331298828125,0.03902173042297363,0.011235713958740234,0.036446332931518555,0.04188203811645508,0.17110371589660645,0.07063102722167969,0.16498589515686035,0.16477060317993164,0.12440967559814453,0.5714268684387207,0.2170422077178955 +10,refs/heads/master,3c3d01351f4149a749f8278423ca5d8112b18102,06f36741ee79cc5ed52de5ff4abd7ba2e676a40a,e95a95aac15a74c43627ec042c7a87bdb6852b9b,,f9eca1f111e34587fdbf9e205daa8b08deb0dd575e934f26ac783e2561d1e199,Tests_passed,ca81b0f754f0d863f9395ed9304d5a041f5337275d61814628ccaa0719226661,Tests_passed,True,True,True,True,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,3718cc6b0f38a1b20728c584984cb8f38a1f9419f841efc7035e3eb3dc67fc47,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,9473c23548c9422912b5e1fc1c2436a7692fd9efa67c23e788bfc0b3a780c3ae,0.041092872619628906,0.04371070861816406,0.042133331298828125,0.03902173042297363,0.011235713958740234,0.036446332931518555,0.04188203811645508,0.17110371589660645,0.07063102722167969,0.1621561050415039,0.16280388832092285,0.12440967559814453,0.5714268684387207,0.2170422077178955 diff --git a/results/combined/merges_timed/alexxiyang/shiro-redis.csv b/results/combined/merges_timed/alexxiyang/shiro-redis.csv index 61079d6466..7c8857bfaa 100644 --- a/results/combined/merges_timed/alexxiyang/shiro-redis.csv +++ b/results/combined/merges_timed/alexxiyang/shiro-redis.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,234a7ec09972609aaf89da8c78aa677add3c55ff,fd8a94fde3f6f4ca24d848ec013f71865ce9218d,ebd16b97867db297230fc5b3e5dd08c559144e6a,,79ee8e9a29237c205e7ffdf1c7260b3c64450bde5940a840c0258afd36f51fae,Tests_passed,d70087d389678cee0425fd419227cca89280f1c07fe7727fdaa2a1a55ef1b8f0,Tests_passed,True,True,True,True,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,0.05762004852294922,0.04317760467529297,0.049735069274902344,0.06088876724243164,0.06081414222717285,0.04341006278991699,0.044286489486694336,0.2510559558868408,0.048790931701660156,0.30013561248779297,0.30087924003601074,0.18559026718139648,1.3062961101531982,0.19341683387756348 +20,refs/heads/master,234a7ec09972609aaf89da8c78aa677add3c55ff,fd8a94fde3f6f4ca24d848ec013f71865ce9218d,ebd16b97867db297230fc5b3e5dd08c559144e6a,,79ee8e9a29237c205e7ffdf1c7260b3c64450bde5940a840c0258afd36f51fae,Tests_passed,d70087d389678cee0425fd419227cca89280f1c07fe7727fdaa2a1a55ef1b8f0,Tests_passed,True,True,True,True,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,0.05762004852294922,0.04317760467529297,0.049735069274902344,0.06088876724243164,0.06081414222717285,0.04341006278991699,0.044286489486694336,0.2510559558868408,0.048790931701660156,0.2964746952056885,0.29773592948913574,0.18559026718139648,1.3062961101531982,0.19341683387756348 diff --git a/results/combined/merges_timed/alibaba/canal.csv b/results/combined/merges_timed/alibaba/canal.csv index 21b46dfd26..848d228584 100644 --- a/results/combined/merges_timed/alibaba/canal.csv +++ b/results/combined/merges_timed/alibaba/canal.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -327,refs/heads/master,69a7e6d08380bf36b1c4d3e2febb91a9f87e9b55,a5d6c3b7478c882e24d3f891b006113685f75c9e,96454d4387695459236ed988c88a453c61334e5b,,True,True,f1cddea9b809e8a8ed10df98f6997908631f8c89f548ac352c6e120638056645,Tests_passed,4fc2d7db2d9c3dbf2779cf476ad6158e653bad23cb5e4f67511c1d63b4319840,Tests_passed,True,True,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_passed,2bc54fa15a0bb061bae245d46f5d9265fceca1a2d416ab852ee99ef569940995,Tests_passed,2bc54fa15a0bb061bae245d46f5d9265fceca1a2d416ab852ee99ef569940995,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_passed,1901c47c282dd3b1d6f6e42478ae1725f742a152778504b3a1048efba3588dde,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,0.04437422752380371,0.04248237609863281,0.04226970672607422,0.0442352294921875,0.015264749526977539,0.037465810775756836,0.015923261642456055,0.18293309211730957,0.04769611358642578,0.1702122688293457,0.18413400650024414,0.12026858329772949,1.124190330505371,0.2623295783996582 +327,refs/heads/master,69a7e6d08380bf36b1c4d3e2febb91a9f87e9b55,a5d6c3b7478c882e24d3f891b006113685f75c9e,96454d4387695459236ed988c88a453c61334e5b,,True,True,f1cddea9b809e8a8ed10df98f6997908631f8c89f548ac352c6e120638056645,Tests_passed,4fc2d7db2d9c3dbf2779cf476ad6158e653bad23cb5e4f67511c1d63b4319840,Tests_passed,True,True,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_passed,2bc54fa15a0bb061bae245d46f5d9265fceca1a2d416ab852ee99ef569940995,Tests_passed,2bc54fa15a0bb061bae245d46f5d9265fceca1a2d416ab852ee99ef569940995,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_passed,1901c47c282dd3b1d6f6e42478ae1725f742a152778504b3a1048efba3588dde,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,0.04437422752380371,0.04248237609863281,0.04226970672607422,0.0442352294921875,0.015264749526977539,0.037465810775756836,0.015923261642456055,0.18293309211730957,0.04769611358642578,0.18039226531982422,0.16637635231018066,0.12026858329772949,1.124190330505371,0.2623295783996582 diff --git a/results/combined/merges_timed/alibaba/easyexcel.csv b/results/combined/merges_timed/alibaba/easyexcel.csv index 0d85e0007d..50f3d326fa 100644 --- a/results/combined/merges_timed/alibaba/easyexcel.csv +++ b/results/combined/merges_timed/alibaba/easyexcel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -285,refs/remotes/origin/pull/3015,832839a0296ee45e265ad920c48a5cbca050282c,ccdc73f2329cfe9c71f271b1f6bd6a99277bb658,4766634105fd11b03905f7efff7fc0aea53e7df4,,True,True,97a7c8257ac7a0bc1e482f3dca29f5167778b894d6163fd26ae2d246a459f77b,Tests_passed,843c01cf35ba0377f974bacb5c413c8130b8493964435454f382bd1d3da34e3e,Tests_passed,True,True,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,9d44d947a727dc1bb6874f63bf1115fafe54a2d02941f81914c079f408a022fa,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,bff0b86910ec1970b3110bf2c1548bb562a323620c4d235d9c9e97f4de8e72ab,Merge_failed,bff0b86910ec1970b3110bf2c1548bb562a323620c4d235d9c9e97f4de8e72ab,Merge_failed,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Tests_passed,9238bd70ab886821a38275085f4acb97986138471f58c0ead9723a72d6440dfa,Merge_failed,e59bf13469ff7b17ad570bd7283b6e4be19bba20ffe06029548c73c87395919c,0.025098800659179688,0.024544477462768555,0.026726245880126953,0.026868343353271484,0.027071714401245117,0.026689529418945312,0.027362346649169922,0.0856165885925293,0.060959577560424805,0.1029047966003418,0.10305118560791016,0.08147931098937988,1.1937737464904785,0.5900821685791016 +285,refs/remotes/origin/pull/3015,832839a0296ee45e265ad920c48a5cbca050282c,ccdc73f2329cfe9c71f271b1f6bd6a99277bb658,4766634105fd11b03905f7efff7fc0aea53e7df4,,True,True,97a7c8257ac7a0bc1e482f3dca29f5167778b894d6163fd26ae2d246a459f77b,Tests_passed,843c01cf35ba0377f974bacb5c413c8130b8493964435454f382bd1d3da34e3e,Tests_passed,True,True,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,9d44d947a727dc1bb6874f63bf1115fafe54a2d02941f81914c079f408a022fa,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,bff0b86910ec1970b3110bf2c1548bb562a323620c4d235d9c9e97f4de8e72ab,Merge_failed,bff0b86910ec1970b3110bf2c1548bb562a323620c4d235d9c9e97f4de8e72ab,Merge_failed,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Tests_passed,9238bd70ab886821a38275085f4acb97986138471f58c0ead9723a72d6440dfa,Merge_failed,e59bf13469ff7b17ad570bd7283b6e4be19bba20ffe06029548c73c87395919c,0.025098800659179688,0.024544477462768555,0.026726245880126953,0.026868343353271484,0.027071714401245117,0.026689529418945312,0.027362346649169922,0.0856165885925293,0.060959577560424805,0.10370755195617676,0.10469722747802734,0.08147931098937988,1.1937737464904785,0.5900821685791016 diff --git a/results/combined/merges_timed/allan-huang/remote-procedure-call.csv b/results/combined/merges_timed/allan-huang/remote-procedure-call.csv index 75d3152c57..d5eb04c9ff 100644 --- a/results/combined/merges_timed/allan-huang/remote-procedure-call.csv +++ b/results/combined/merges_timed/allan-huang/remote-procedure-call.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,d616ff21adfb6b2525ca6fc9a5c945053a5fd627,bf0b95ed01f0d3b31e4b6357312e7a20366b58f7,74f5edf2cceec3806b69fe157a58de99d5e36cc2,,True,True,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,21bf856f56036bbd34a06c75561d85e998d0fca8ed980a3d13b8dd68b4c5de46,Tests_passed,True,True,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,0.009243249893188477,0.009147167205810547,0.009952545166015625,0.010413885116577148,0.010038614273071289,0.010265350341796875,0.010042667388916016,0.033628225326538086,0.00911712646484375,0.007796049118041992,0.008002758026123047,0.010112762451171875,0.013350725173950195,0.17635369300842285 +2,refs/heads/master,d616ff21adfb6b2525ca6fc9a5c945053a5fd627,bf0b95ed01f0d3b31e4b6357312e7a20366b58f7,74f5edf2cceec3806b69fe157a58de99d5e36cc2,,True,True,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,21bf856f56036bbd34a06c75561d85e998d0fca8ed980a3d13b8dd68b4c5de46,Tests_passed,True,True,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,0.009243249893188477,0.009147167205810547,0.009952545166015625,0.010413885116577148,0.010038614273071289,0.010265350341796875,0.010042667388916016,0.033628225326538086,0.00911712646484375,0.0074155330657958984,0.007431745529174805,0.010112762451171875,0.013350725173950195,0.17635369300842285 diff --git a/results/combined/merges_timed/allanbank/mongodb-async-driver.csv b/results/combined/merges_timed/allanbank/mongodb-async-driver.csv index 15988a9577..8c695c90ff 100644 --- a/results/combined/merges_timed/allanbank/mongodb-async-driver.csv +++ b/results/combined/merges_timed/allanbank/mongodb-async-driver.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,81bedcbc10519b605deb41ef5b29ca78d17d4544,baf4acb3db8ea9d40b142d14a5342d3e81e9104f,d60feb648a010c457b811122bde1eccd800dc3cf,,True,True,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,61800cedd2f345380aa7104c8c5df70b18762f4d942ae8fcf9527ebce00d6ee7,Tests_passed,True,True,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,0.024473905563354492,0.12476921081542969,0.09948611259460449,0.15168237686157227,0.09874820709228516,0.15170955657958984,0.10056066513061523,0.14546489715576172,0.09828758239746094,0.48826003074645996,0.586362361907959,0.18889570236206055,2.9220919609069824,0.38771605491638184 +4,refs/heads/master,81bedcbc10519b605deb41ef5b29ca78d17d4544,baf4acb3db8ea9d40b142d14a5342d3e81e9104f,d60feb648a010c457b811122bde1eccd800dc3cf,,True,True,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,61800cedd2f345380aa7104c8c5df70b18762f4d942ae8fcf9527ebce00d6ee7,Tests_passed,True,True,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,0.024473905563354492,0.12476921081542969,0.09948611259460449,0.15168237686157227,0.09874820709228516,0.15170955657958984,0.10056066513061523,0.14546489715576172,0.09828758239746094,0.4832489490509033,0.49333953857421875,0.18889570236206055,2.9220919609069824,0.38771605491638184 diff --git a/results/combined/merges_timed/amplafi/htmlcleaner.csv b/results/combined/merges_timed/amplafi/htmlcleaner.csv index f36e705885..43469567d0 100644 --- a/results/combined/merges_timed/amplafi/htmlcleaner.csv +++ b/results/combined/merges_timed/amplafi/htmlcleaner.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,5b1e2bd095894b31df3f14834a1d2df1da8bd203,70ed05ffd628822930987f1d43ca03ea2cd0881d,75a6251aac4918ccbbb59b52d5b85de3620bd3f6,,ca82ed754a52ebf432c9efa52fa4081a4310558a7b810a9fabd437157ada203b,Tests_passed,92d0ab5408293c8bdd89f456643bab91aa2fadde5626be494648cc103d31c3c2,Tests_passed,True,True,True,True,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,0.05621814727783203,0.07178449630737305,0.052436113357543945,0.06075692176818848,0.04867362976074219,0.04696011543273926,0.04081106185913086,0.1931743621826172,0.04483938217163086,0.1749553680419922,0.17467856407165527,0.12928199768066406,1.2498857975006104,0.23634815216064453 +9,refs/heads/master,5b1e2bd095894b31df3f14834a1d2df1da8bd203,70ed05ffd628822930987f1d43ca03ea2cd0881d,75a6251aac4918ccbbb59b52d5b85de3620bd3f6,,ca82ed754a52ebf432c9efa52fa4081a4310558a7b810a9fabd437157ada203b,Tests_passed,92d0ab5408293c8bdd89f456643bab91aa2fadde5626be494648cc103d31c3c2,Tests_passed,True,True,True,True,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,0.05621814727783203,0.07178449630737305,0.052436113357543945,0.06075692176818848,0.04867362976074219,0.04696011543273926,0.04081106185913086,0.1931743621826172,0.04483938217163086,0.17372393608093262,0.17412424087524414,0.12928199768066406,1.2498857975006104,0.23634815216064453 diff --git a/results/combined/merges_timed/andreaskl/springboot-angular-atmosphere-quickstart.csv b/results/combined/merges_timed/andreaskl/springboot-angular-atmosphere-quickstart.csv index 044191c348..ce72eea582 100644 --- a/results/combined/merges_timed/andreaskl/springboot-angular-atmosphere-quickstart.csv +++ b/results/combined/merges_timed/andreaskl/springboot-angular-atmosphere-quickstart.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,cadddbad17de1526cd54f53de4a0c633acb328e9,c5438560f54b525d3e1a8afb9fc4efbc6db9806c,ca84722195aac40f62ec2db5eed3eea4273a6ff8,,afc2fb1335920e6cf399aaf2bddc8abb09b870393caefeccc2b2f792a343923e,Tests_passed,681deceb3f1d91429c54cf81c807c924f7e374d6e2351e0aaf9c95a4d614ff95,Tests_passed,True,True,True,True,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,730cb046e9e44120e84db1332236234524c79f5a63b7ebad996db2273eca2002,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,b96251168b32194265fc3bd3e90d6dc8d994e29aff5d86a5ea3fba87d628ddd9,Merge_failed,b96251168b32194265fc3bd3e90d6dc8d994e29aff5d86a5ea3fba87d628ddd9,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,1396adb50125b234604d4843012ded79f250975391afab4676df25472af57aa6,Merge_failed,aa769c067b9a1d5a4da3386fe8911ddbaa6bc622ca43e1d22919b83e71ce296f,0.009391546249389648,0.009483814239501953,0.00881505012512207,0.008926630020141602,0.008917808532714844,0.00906515121459961,0.00924539566040039,0.08899831771850586,0.022115468978881836,0.06828045845031738,0.06836414337158203,0.23643279075622559,0.5392460823059082,0.1543135643005371 +2,refs/heads/master,cadddbad17de1526cd54f53de4a0c633acb328e9,c5438560f54b525d3e1a8afb9fc4efbc6db9806c,ca84722195aac40f62ec2db5eed3eea4273a6ff8,,afc2fb1335920e6cf399aaf2bddc8abb09b870393caefeccc2b2f792a343923e,Tests_passed,681deceb3f1d91429c54cf81c807c924f7e374d6e2351e0aaf9c95a4d614ff95,Tests_passed,True,True,True,True,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,730cb046e9e44120e84db1332236234524c79f5a63b7ebad996db2273eca2002,Merge_failed,5385617fc9fdb1b335e4292e8c6f34f167cce5d7e5fe6a8ddc72492456e2c9f5,Merge_failed,b96251168b32194265fc3bd3e90d6dc8d994e29aff5d86a5ea3fba87d628ddd9,Merge_failed,b96251168b32194265fc3bd3e90d6dc8d994e29aff5d86a5ea3fba87d628ddd9,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,1396adb50125b234604d4843012ded79f250975391afab4676df25472af57aa6,Merge_failed,aa769c067b9a1d5a4da3386fe8911ddbaa6bc622ca43e1d22919b83e71ce296f,0.009391546249389648,0.009483814239501953,0.00881505012512207,0.008926630020141602,0.008917808532714844,0.00906515121459961,0.00924539566040039,0.08899831771850586,0.022115468978881836,0.0769038200378418,0.07861757278442383,0.23643279075622559,0.5392460823059082,0.1543135643005371 diff --git a/results/combined/merges_timed/andresoviedo/google-drive-ftp-adapter.csv b/results/combined/merges_timed/andresoviedo/google-drive-ftp-adapter.csv index a7cd0443dc..4a8ae3c213 100644 --- a/results/combined/merges_timed/andresoviedo/google-drive-ftp-adapter.csv +++ b/results/combined/merges_timed/andresoviedo/google-drive-ftp-adapter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/remotes/origin/pull/45,7046a248be867a7bfadbd2c29fd9ef86c3cca54b,d0a2be254d0cac3cac7f989fa63614219ebee200,0193b2d43121b281e79b77bac820b46f6619de3c,,True,True,ba31b3912bd8f0e88cc8896ab18c819ba2333f1b10d99c7cd38c3ca981213529,Tests_passed,247d93dc036dfbee14662705e443c88af623211c07b229f29d7a61c7de33d927,Tests_passed,True,True,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,1f7376b2850508e577ccdee2b9bfa713005b5e0992ad72194bbd04a57e878458,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,1f7376b2850508e577ccdee2b9bfa713005b5e0992ad72194bbd04a57e878458,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,b6380682305ea479e218e8758a25f740013e795baa39e4cb2411a048492a5fb9,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,0c28d36eb9f69ac6c35b9c40ce8f1c724445afb6eaa6d9bda3738402556f702d,Merge_failed,0c28d36eb9f69ac6c35b9c40ce8f1c724445afb6eaa6d9bda3738402556f702d,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,0ceab100f5bc1fb0502923b0880f011e844f65f5ff4f8b01c55e69d9d5cf2c1a,Merge_failed,fa419cb44a7652398c4700fda6edb72273d7dedd818148845f73908b6b8de2b0,0.08356785774230957,0.03633999824523926,0.03760123252868652,0.09991264343261719,0.035610198974609375,0.10135698318481445,0.09868884086608887,0.2962057590484619,0.1279773712158203,0.13419222831726074,0.13370370864868164,0.20772552490234375,0.613436222076416,0.29931116104125977 +7,refs/remotes/origin/pull/45,7046a248be867a7bfadbd2c29fd9ef86c3cca54b,d0a2be254d0cac3cac7f989fa63614219ebee200,0193b2d43121b281e79b77bac820b46f6619de3c,,True,True,ba31b3912bd8f0e88cc8896ab18c819ba2333f1b10d99c7cd38c3ca981213529,Tests_passed,247d93dc036dfbee14662705e443c88af623211c07b229f29d7a61c7de33d927,Tests_passed,True,True,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,1f7376b2850508e577ccdee2b9bfa713005b5e0992ad72194bbd04a57e878458,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,1f7376b2850508e577ccdee2b9bfa713005b5e0992ad72194bbd04a57e878458,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,b6380682305ea479e218e8758a25f740013e795baa39e4cb2411a048492a5fb9,Merge_failed,f0d50307c1246188d1c752405d4b7a738c2a0176dca4edee87b10fb380ac3b26,Merge_failed,0c28d36eb9f69ac6c35b9c40ce8f1c724445afb6eaa6d9bda3738402556f702d,Merge_failed,0c28d36eb9f69ac6c35b9c40ce8f1c724445afb6eaa6d9bda3738402556f702d,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,0ceab100f5bc1fb0502923b0880f011e844f65f5ff4f8b01c55e69d9d5cf2c1a,Merge_failed,fa419cb44a7652398c4700fda6edb72273d7dedd818148845f73908b6b8de2b0,0.08356785774230957,0.03633999824523926,0.03760123252868652,0.09991264343261719,0.035610198974609375,0.10135698318481445,0.09868884086608887,0.2962057590484619,0.1279773712158203,0.1322956085205078,0.13251614570617676,0.20772552490234375,0.613436222076416,0.29931116104125977 diff --git a/results/combined/merges_timed/andrewphorn/classicube-client.csv b/results/combined/merges_timed/andrewphorn/classicube-client.csv index 442672e58e..f479a19e69 100644 --- a/results/combined/merges_timed/andrewphorn/classicube-client.csv +++ b/results/combined/merges_timed/andrewphorn/classicube-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,cc32a2554eb5fac5492e7eaa7dcf1ca121b35012,84bf151168576bfa61dc0cee6bd09ced1f10b9f5,9f682a7ed6759e77374a0beb40e3182fd7cf7e83,,True,True,857bf5f828f870e83eae7ce2249622e8b8a97d1dd242e4aeb75a75da30bb8e6b,Tests_passed,1dd16ab12f1a1f179b47341ec4b5ad6a6baefa51257f01a3e0ea3f2d3bf5b241,Tests_passed,True,True,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,0.0552675724029541,0.04412388801574707,0.04626107215881348,0.04636430740356445,0.06342291831970215,0.056456565856933594,0.05805253982543945,0.20055794715881348,0.04029989242553711,0.20525670051574707,0.20167803764343262,0.11186337471008301,2.668989419937134,0.24576067924499512 +2,refs/heads/master,cc32a2554eb5fac5492e7eaa7dcf1ca121b35012,84bf151168576bfa61dc0cee6bd09ced1f10b9f5,9f682a7ed6759e77374a0beb40e3182fd7cf7e83,,True,True,857bf5f828f870e83eae7ce2249622e8b8a97d1dd242e4aeb75a75da30bb8e6b,Tests_passed,1dd16ab12f1a1f179b47341ec4b5ad6a6baefa51257f01a3e0ea3f2d3bf5b241,Tests_passed,True,True,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,0.0552675724029541,0.04412388801574707,0.04626107215881348,0.04636430740356445,0.06342291831970215,0.056456565856933594,0.05805253982543945,0.20055794715881348,0.04029989242553711,0.20455694198608398,0.20630645751953125,0.11186337471008301,2.668989419937134,0.24576067924499512 diff --git a/results/combined/merges_timed/andygibson/datafactory.csv b/results/combined/merges_timed/andygibson/datafactory.csv index 1b6aed2058..248275a65c 100644 --- a/results/combined/merges_timed/andygibson/datafactory.csv +++ b/results/combined/merges_timed/andygibson/datafactory.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,1d4a47b045ee2c13820416dd60773690f6093e62,9ce0ce8f79c37a97461cf79d032471b5183e0d34,11f6613d23702cf7280d66129478bcd917d561ab,,True,True,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,e97a2256dfe1f376dfb6e7b30f61157af83de4f3295bffae65a5a3f51bb3880b,Tests_passed,True,True,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,cf763347426cbbb118b031afbfffbbba71cbb44a4928e0ad1196b785e3b985e4,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,910d2e87cdd3e2c7ee3dd6cb2ff5e6493c55293feb0ab973994f26f06fb4ac5b,Merge_failed,910d2e87cdd3e2c7ee3dd6cb2ff5e6493c55293feb0ab973994f26f06fb4ac5b,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Merge_failed,2fc84a2efcc0ff2652885440ec1016c40b66ddcade7cee6e377265a38f04c14f,0.0393064022064209,0.0382235050201416,0.0402829647064209,0.04081583023071289,0.04092812538146973,0.03896450996398926,0.0423121452331543,0.22737479209899902,0.06050467491149902,0.30312180519104004,0.30583667755126953,0.17236018180847168,1.4844064712524414,0.21185874938964844 +2,refs/heads/master,1d4a47b045ee2c13820416dd60773690f6093e62,9ce0ce8f79c37a97461cf79d032471b5183e0d34,11f6613d23702cf7280d66129478bcd917d561ab,,True,True,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,e97a2256dfe1f376dfb6e7b30f61157af83de4f3295bffae65a5a3f51bb3880b,Tests_passed,True,True,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,cf763347426cbbb118b031afbfffbbba71cbb44a4928e0ad1196b785e3b985e4,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,910d2e87cdd3e2c7ee3dd6cb2ff5e6493c55293feb0ab973994f26f06fb4ac5b,Merge_failed,910d2e87cdd3e2c7ee3dd6cb2ff5e6493c55293feb0ab973994f26f06fb4ac5b,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Merge_failed,2fc84a2efcc0ff2652885440ec1016c40b66ddcade7cee6e377265a38f04c14f,0.0393064022064209,0.0382235050201416,0.0402829647064209,0.04081583023071289,0.04092812538146973,0.03896450996398926,0.0423121452331543,0.22737479209899902,0.06050467491149902,0.2839968204498291,0.2855682373046875,0.17236018180847168,1.4844064712524414,0.21185874938964844 diff --git a/results/combined/merges_timed/anjuke/hwi.csv b/results/combined/merges_timed/anjuke/hwi.csv index 532d1cf444..76249c99ef 100644 --- a/results/combined/merges_timed/anjuke/hwi.csv +++ b/results/combined/merges_timed/anjuke/hwi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,94766cb0d37279e1842a9bff4769c366bf43e699,73c71cfc99f805ee178b5930e5d8a8adef6c3a1c,9340c5c00c8e261f1660113ef522e13229b39db1,,5fd1fa7875970aae4d57cda371e1eae1cdbc124db213a7378d069062a7267607,Tests_passed,5e5a2dd5029029038841e7e40b11809075b3e6a536020abfce013374dcd5a817,Tests_passed,True,True,True,True,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,0.011649370193481445,0.011630535125732422,0.013501644134521484,0.01334071159362793,0.014083147048950195,0.014062881469726562,0.014121055603027344,0.03943634033203125,0.012113332748413086,0.16468143463134766,0.16442131996154785,0.06658172607421875,0.8354017734527588,0.16501164436340332 +5,refs/heads/master,94766cb0d37279e1842a9bff4769c366bf43e699,73c71cfc99f805ee178b5930e5d8a8adef6c3a1c,9340c5c00c8e261f1660113ef522e13229b39db1,,5fd1fa7875970aae4d57cda371e1eae1cdbc124db213a7378d069062a7267607,Tests_passed,5e5a2dd5029029038841e7e40b11809075b3e6a536020abfce013374dcd5a817,Tests_passed,True,True,True,True,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,0.011649370193481445,0.011630535125732422,0.013501644134521484,0.01334071159362793,0.014083147048950195,0.014062881469726562,0.014121055603027344,0.03943634033203125,0.012113332748413086,0.1617264747619629,0.16259002685546875,0.06658172607421875,0.8354017734527588,0.16501164436340332 diff --git a/results/combined/merges_timed/antlr/grammars-v4.csv b/results/combined/merges_timed/antlr/grammars-v4.csv index 0e4a7b5f33..16a4864ab5 100644 --- a/results/combined/merges_timed/antlr/grammars-v4.csv +++ b/results/combined/merges_timed/antlr/grammars-v4.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -45,refs/heads/master,5212cd6321d56712c4eb42eccc72f751c9213171,9ee31e3908dcb06559b6178643c0d412f3516e09,3fabd952aa101b5211dbed3c60af17e8a8ea6968,,True,True,027d0f560b7f7c275eafb6a62c1a7db137c964fd116410112dfd2a1c638b4df4,Tests_passed,2813b7fa35905d6dc9b8e31130447f9a31785e93d3f57a217a8379c43374f92b,Tests_passed,True,True,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,0.06370854377746582,0.07728075981140137,0.09058952331542969,0.08777666091918945,0.07585310935974121,0.09036922454833984,0.06801939010620117,0.24136710166931152,0.07813191413879395,0.17477107048034668,0.17484354972839355,0.20019221305847168,0.06107497215270996,0.4077873229980469 +45,refs/heads/master,5212cd6321d56712c4eb42eccc72f751c9213171,9ee31e3908dcb06559b6178643c0d412f3516e09,3fabd952aa101b5211dbed3c60af17e8a8ea6968,,True,True,027d0f560b7f7c275eafb6a62c1a7db137c964fd116410112dfd2a1c638b4df4,Tests_passed,2813b7fa35905d6dc9b8e31130447f9a31785e93d3f57a217a8379c43374f92b,Tests_passed,True,True,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,0.06370854377746582,0.07728075981140137,0.09058952331542969,0.08777666091918945,0.07585310935974121,0.09036922454833984,0.06801939010620117,0.24136710166931152,0.07813191413879395,0.17360353469848633,0.17362236976623535,0.20019221305847168,0.06107497215270996,0.4077873229980469 diff --git a/results/combined/merges_timed/apache/accumulo.csv b/results/combined/merges_timed/apache/accumulo.csv index 4623756b1a..d2ecfea879 100644 --- a/results/combined/merges_timed/apache/accumulo.csv +++ b/results/combined/merges_timed/apache/accumulo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -66,refs/heads/main,ce3a886c1cf90ff764edd872159cf3c036ff182a,1415599a5b744df3f79d05f9cd49b4fe0e458c1b,1fd1f797ca70f043992fd90485c9dcb33641e928,,21fca3ca9ee1354b5475c6e1033702af05e963b80a3b2c0dbdf8be99c25b811c,Tests_passed,745d863e7f0c6c4f8b5f0a6d6e0fef73da8c920dea5eb4c7ed2eb2bc574ef41b,Tests_passed,True,True,True,True,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,05a6056efedf5074fd4e9095f4ee64d1aa44b26cc1e4644ece644e70a9561a41,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Tests_failed,ac5f9249492aadef5a820994692f11813a1b863b9e3aea39aac6e0ca06c18ac9,Tests_failed,ac5f9249492aadef5a820994692f11813a1b863b9e3aea39aac6e0ca06c18ac9,Merge_failed,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,0.1207878589630127,0.12068510055541992,0.19636869430541992,0.1964702606201172,0.19556069374084473,0.1944572925567627,0.1965503692626953,0.2829322814941406,0.21528983116149902,0.3276216983795166,0.325624942779541,0.18050026893615723,0.1253185272216797,4.5338404178619385 +66,refs/heads/main,ce3a886c1cf90ff764edd872159cf3c036ff182a,1415599a5b744df3f79d05f9cd49b4fe0e458c1b,1fd1f797ca70f043992fd90485c9dcb33641e928,,21fca3ca9ee1354b5475c6e1033702af05e963b80a3b2c0dbdf8be99c25b811c,Tests_passed,745d863e7f0c6c4f8b5f0a6d6e0fef73da8c920dea5eb4c7ed2eb2bc574ef41b,Tests_passed,True,True,True,True,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,05a6056efedf5074fd4e9095f4ee64d1aa44b26cc1e4644ece644e70a9561a41,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Tests_failed,ac5f9249492aadef5a820994692f11813a1b863b9e3aea39aac6e0ca06c18ac9,Tests_failed,ac5f9249492aadef5a820994692f11813a1b863b9e3aea39aac6e0ca06c18ac9,Merge_failed,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,0.1207878589630127,0.12068510055541992,0.19636869430541992,0.1964702606201172,0.19556069374084473,0.1944572925567627,0.1965503692626953,0.2829322814941406,0.21528983116149902,0.32741451263427734,0.32558584213256836,0.18050026893615723,0.1253185272216797,4.5338404178619385 diff --git a/results/combined/merges_timed/apache/avro.csv b/results/combined/merges_timed/apache/avro.csv index fe15d0574e..5020f601f7 100644 --- a/results/combined/merges_timed/apache/avro.csv +++ b/results/combined/merges_timed/apache/avro.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -55,refs/heads/main,c299da64ee53de57ea34e589b858d7fe8ada72fd,fd6c4228fbecc6eff3e3ecd5ee27d2ceb46339ff,57bea12e3a0860958b2060cab4f1193391584839,,True,True,fc9f0dd415a77e7ddd310c2a82e63988afcff970e9d2fec8964c376cf791db8f,Tests_passed,dcc74ea3e9de72e816ade67ddc36b2ade7155232fd2539e5edd0a13345273875,Tests_passed,True,True,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,82f29fd33e1281e2436c430c196b58f84584436f7096a71772fa5a84d0732082,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,644741ebb1e1beb591813431c06616a1afaf3d832275d46796d6914893b2d5fc,Merge_failed,644741ebb1e1beb591813431c06616a1afaf3d832275d46796d6914893b2d5fc,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,ccbb6f579b792e1ff663b4151a39339017951cd1513d147981a48ea9d6c354f1,0.034218788146972656,0.027122020721435547,0.05997204780578613,0.05303215980529785,0.054755210876464844,0.06560945510864258,0.050069332122802734,0.2211301326751709,0.09472990036010742,0.09288239479064941,0.0929713249206543,0.12684416770935059,1.2738161087036133,0.4592461585998535 +55,refs/heads/main,c299da64ee53de57ea34e589b858d7fe8ada72fd,fd6c4228fbecc6eff3e3ecd5ee27d2ceb46339ff,57bea12e3a0860958b2060cab4f1193391584839,,True,True,fc9f0dd415a77e7ddd310c2a82e63988afcff970e9d2fec8964c376cf791db8f,Tests_passed,dcc74ea3e9de72e816ade67ddc36b2ade7155232fd2539e5edd0a13345273875,Tests_passed,True,True,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,82f29fd33e1281e2436c430c196b58f84584436f7096a71772fa5a84d0732082,Merge_failed,948c00eb44921e48c4c862415b401f75642d0c9a0273640bfc9b1b73d0995f44,Merge_failed,644741ebb1e1beb591813431c06616a1afaf3d832275d46796d6914893b2d5fc,Merge_failed,644741ebb1e1beb591813431c06616a1afaf3d832275d46796d6914893b2d5fc,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,ccbb6f579b792e1ff663b4151a39339017951cd1513d147981a48ea9d6c354f1,0.034218788146972656,0.027122020721435547,0.05997204780578613,0.05303215980529785,0.054755210876464844,0.06560945510864258,0.050069332122802734,0.2211301326751709,0.09472990036010742,0.09252810478210449,0.0930933952331543,0.12684416770935059,1.2738161087036133,0.4592461585998535 diff --git a/results/combined/merges_timed/apache/cayenne.csv b/results/combined/merges_timed/apache/cayenne.csv index e8f316b284..8fe57a5377 100644 --- a/results/combined/merges_timed/apache/cayenne.csv +++ b/results/combined/merges_timed/apache/cayenne.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -22,refs/heads/master,40eed24a3ffad2197e216fef06227809c84c1e75,8725b265832a6c2d03ca5d866d5751cc1f35167f,ea1d6913bc80229783ec5842ec50b4b5252e322a,,True,True,ca8ba6a6a4b949254d71541d85b75399eb829fe655fbd8dfe977867e3b9eda70,Tests_passed,1e31891107170cffd80248e6c4ad4ec32bb012e8c6594b7d971c04397c2a05e8,Tests_passed,True,True,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,0.08471107482910156,0.09049034118652344,0.09269452095031738,0.0782012939453125,0.09391093254089355,0.09704351425170898,0.09974336624145508,0.21252989768981934,0.08325815200805664,0.1788923740386963,0.1788928508758545,0.1510906219482422,1.2483057975769043,0.458651065826416 +22,refs/heads/master,40eed24a3ffad2197e216fef06227809c84c1e75,8725b265832a6c2d03ca5d866d5751cc1f35167f,ea1d6913bc80229783ec5842ec50b4b5252e322a,,True,True,ca8ba6a6a4b949254d71541d85b75399eb829fe655fbd8dfe977867e3b9eda70,Tests_passed,1e31891107170cffd80248e6c4ad4ec32bb012e8c6594b7d971c04397c2a05e8,Tests_passed,True,True,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,0.08471107482910156,0.09049034118652344,0.09269452095031738,0.0782012939453125,0.09391093254089355,0.09704351425170898,0.09974336624145508,0.21252989768981934,0.08325815200805664,0.17587518692016602,0.17839336395263672,0.1510906219482422,1.2483057975769043,0.458651065826416 diff --git a/results/combined/merges_timed/apache/commons-bcel.csv b/results/combined/merges_timed/apache/commons-bcel.csv index 083d449df1..07ce2309f6 100644 --- a/results/combined/merges_timed/apache/commons-bcel.csv +++ b/results/combined/merges_timed/apache/commons-bcel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -73,refs/remotes/origin/pull/27,38d50ba679622dbbfcbc835fbd4652d2bbde4f56,fdae273276026590f67009c7119db47a98b7153a,7cfc47ce577a43719617164f2234c5253638035b,,True,True,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,f605eb87ad553734dee8608c3558e60d82a26f1e8494bb8884fd3a10a1612ec7,Tests_passed,True,True,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,ffad47b543c0b651abf758b2a881d414797792340b3a5597c7dd82bafa87fe85,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,0.037090301513671875,0.04035687446594238,0.053708791732788086,0.05162501335144043,0.06043076515197754,0.062462806701660156,0.058457136154174805,0.23001742362976074,0.03950858116149902,0.34183335304260254,0.34471774101257324,0.15451407432556152,1.248809576034546,0.9439775943756104 +73,refs/remotes/origin/pull/27,38d50ba679622dbbfcbc835fbd4652d2bbde4f56,fdae273276026590f67009c7119db47a98b7153a,7cfc47ce577a43719617164f2234c5253638035b,,True,True,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,f605eb87ad553734dee8608c3558e60d82a26f1e8494bb8884fd3a10a1612ec7,Tests_passed,True,True,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,ffad47b543c0b651abf758b2a881d414797792340b3a5597c7dd82bafa87fe85,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,0.037090301513671875,0.04035687446594238,0.053708791732788086,0.05162501335144043,0.06043076515197754,0.062462806701660156,0.058457136154174805,0.23001742362976074,0.03950858116149902,0.4258267879486084,0.3392176628112793,0.15451407432556152,1.248809576034546,0.9439775943756104 diff --git a/results/combined/merges_timed/apache/commons-beanutils.csv b/results/combined/merges_timed/apache/commons-beanutils.csv index 1ac55277e2..7f5bd6c881 100644 --- a/results/combined/merges_timed/apache/commons-beanutils.csv +++ b/results/combined/merges_timed/apache/commons-beanutils.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,Tests_passed,True,True,True,True,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,e2677df89c318a2f8ad3d61c52c09dfa8d6a7a7b89cf2499609d392b4345121a,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,a7c9f22ca59dafacef10834a0cb86e1e5ca868b8dc707f2e73abf028db9dc2da,Merge_failed,a7c9f22ca59dafacef10834a0cb86e1e5ca868b8dc707f2e73abf028db9dc2da,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,0.04119420051574707,0.038867950439453125,0.05074286460876465,0.048506975173950195,0.061835289001464844,0.05843353271484375,0.04860401153564453,0.17496037483215332,0.06635451316833496,0.10192465782165527,0.1019432544708252,0.10025286674499512,1.359971046447754,0.5116639137268066 +17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,Tests_passed,True,True,True,True,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,e2677df89c318a2f8ad3d61c52c09dfa8d6a7a7b89cf2499609d392b4345121a,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,a7c9f22ca59dafacef10834a0cb86e1e5ca868b8dc707f2e73abf028db9dc2da,Merge_failed,a7c9f22ca59dafacef10834a0cb86e1e5ca868b8dc707f2e73abf028db9dc2da,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,0.04119420051574707,0.038867950439453125,0.05074286460876465,0.048506975173950195,0.061835289001464844,0.05843353271484375,0.04860401153564453,0.17496037483215332,0.06635451316833496,0.10295796394348145,0.10009312629699707,0.10025286674499512,1.359971046447754,0.5116639137268066 diff --git a/results/combined/merges_timed/apache/commons-codec.csv b/results/combined/merges_timed/apache/commons-codec.csv index 4d4e11e51e..1db5fddb23 100644 --- a/results/combined/merges_timed/apache/commons-codec.csv +++ b/results/combined/merges_timed/apache/commons-codec.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,True,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,Tests_passed,True,True,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,0.011223793029785156,0.05660247802734375,0.07021260261535645,0.06999087333679199,0.07027578353881836,0.07046747207641602,0.0693049430847168,0.0973362922668457,0.05755352973937988,0.2334730625152588,0.18708300590515137,0.11384201049804688,0.02704334259033203,0.2145400047302246 +26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,True,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,Tests_passed,True,True,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,0.011223793029785156,0.05660247802734375,0.07021260261535645,0.06999087333679199,0.07027578353881836,0.07046747207641602,0.0693049430847168,0.0973362922668457,0.05755352973937988,0.23027753829956055,0.23080730438232422,0.11384201049804688,0.02704334259033203,0.2145400047302246 diff --git a/results/combined/merges_timed/apache/commons-collections.csv b/results/combined/merges_timed/apache/commons-collections.csv index b30b7b29fb..ad5b0bcae5 100644 --- a/results/combined/merges_timed/apache/commons-collections.csv +++ b/results/combined/merges_timed/apache/commons-collections.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,True,True,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,Tests_passed,True,True,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,0.047721147537231445,0.059247493743896484,0.021946191787719727,0.018861055374145508,0.057532548904418945,0.04597210884094238,0.032208919525146484,0.1586017608642578,0.019196033477783203,0.17276263236999512,0.1705031394958496,0.09604549407958984,0.7446160316467285,0.3463258743286133 +8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,True,True,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,Tests_passed,True,True,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,0.047721147537231445,0.059247493743896484,0.021946191787719727,0.018861055374145508,0.057532548904418945,0.04597210884094238,0.032208919525146484,0.1586017608642578,0.019196033477783203,0.16158270835876465,0.16003799438476562,0.09604549407958984,0.7446160316467285,0.3463258743286133 diff --git a/results/combined/merges_timed/apache/commons-csv.csv b/results/combined/merges_timed/apache/commons-csv.csv index 2941a07fc8..03bc9e1766 100644 --- a/results/combined/merges_timed/apache/commons-csv.csv +++ b/results/combined/merges_timed/apache/commons-csv.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -108,refs/remotes/origin/pull/54,d950da2f49827211f4b72089eea80a6750d5019a,dd9b3ccf0f21719ed273f820eec8724ef405953e,a35797bea9bd7f7affa7ae94576bd471d822b01b,,True,True,93656b7ff65108f7946c646ff6937e2fb506d30319c923143c515d3c4857fc0b,Tests_passed,0cd091656353c0aecf43288f074c7a0349f28159fc988f2458e36b86460891c8,Tests_passed,True,True,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,e76459f34c589bf03010b37ca594b0f0cce9af621333f567dbf66c5891c2ca23,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Tests_failed,bc5da5aa24d273ccaf8f7f3d92018fe953cfcafb45e81b8e24e28fd44035ea51,Tests_failed,bc5da5aa24d273ccaf8f7f3d92018fe953cfcafb45e81b8e24e28fd44035ea51,Merge_failed,dcf33a8baf2688e7733233b294938c9b7b1b95c4b61a28218783fc4f1bce111c,Tests_passed,697b2b6a37b7b23bc3e84ff184b2428bdefb3d82857d3cb1f5e4139714db577a,Merge_failed,708fcec10e8110e8e67f17f3036a13034e53ff4be636e611d2d8f7c07c5a300b,0.13837242126464844,0.13656282424926758,0.017828941345214844,0.13660907745361328,0.13665127754211426,0.13709402084350586,0.13437390327453613,0.1320650577545166,0.16881442070007324,0.35479116439819336,0.2945549488067627,0.1937577724456787,1.0840263366699219,0.2654736042022705 +108,refs/remotes/origin/pull/54,d950da2f49827211f4b72089eea80a6750d5019a,dd9b3ccf0f21719ed273f820eec8724ef405953e,a35797bea9bd7f7affa7ae94576bd471d822b01b,,True,True,93656b7ff65108f7946c646ff6937e2fb506d30319c923143c515d3c4857fc0b,Tests_passed,0cd091656353c0aecf43288f074c7a0349f28159fc988f2458e36b86460891c8,Tests_passed,True,True,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,e76459f34c589bf03010b37ca594b0f0cce9af621333f567dbf66c5891c2ca23,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Tests_failed,bc5da5aa24d273ccaf8f7f3d92018fe953cfcafb45e81b8e24e28fd44035ea51,Tests_failed,bc5da5aa24d273ccaf8f7f3d92018fe953cfcafb45e81b8e24e28fd44035ea51,Merge_failed,dcf33a8baf2688e7733233b294938c9b7b1b95c4b61a28218783fc4f1bce111c,Tests_passed,697b2b6a37b7b23bc3e84ff184b2428bdefb3d82857d3cb1f5e4139714db577a,Merge_failed,708fcec10e8110e8e67f17f3036a13034e53ff4be636e611d2d8f7c07c5a300b,0.13837242126464844,0.13656282424926758,0.017828941345214844,0.13660907745361328,0.13665127754211426,0.13709402084350586,0.13437390327453613,0.1320650577545166,0.16881442070007324,0.28888750076293945,0.34891271591186523,0.1937577724456787,1.0840263366699219,0.2654736042022705 diff --git a/results/combined/merges_timed/apache/commons-dbcp.csv b/results/combined/merges_timed/apache/commons-dbcp.csv index 4ff56466eb..8a63f9cd50 100644 --- a/results/combined/merges_timed/apache/commons-dbcp.csv +++ b/results/combined/merges_timed/apache/commons-dbcp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,True,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,0.03132486343383789,0.030832529067993164,0.037041664123535156,0.037801504135131836,0.038179636001586914,0.03787517547607422,0.03798103332519531,0.07374691963195801,0.0305635929107666,0.17935466766357422,0.17950987815856934,0.0892486572265625,1.0309994220733643,0.25501060485839844 +5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,True,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,0.03132486343383789,0.030832529067993164,0.037041664123535156,0.037801504135131836,0.038179636001586914,0.03787517547607422,0.03798103332519531,0.07374691963195801,0.0305635929107666,0.1773829460144043,0.1688539981842041,0.0892486572265625,1.0309994220733643,0.25501060485839844 diff --git a/results/combined/merges_timed/apache/commons-email.csv b/results/combined/merges_timed/apache/commons-email.csv index c28b0887c5..c60d029961 100644 --- a/results/combined/merges_timed/apache/commons-email.csv +++ b/results/combined/merges_timed/apache/commons-email.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -104,refs/remotes/origin/pull/101,37e4c8a68fc8e68091a6b07bcd2fc62edba038c2,234aef759f76f4a4de53d2d311cd37806de9f361,2410f4bf5ffacb559984f7584e12cad802b7805c,,True,True,e61be0a8f3eb18ea0261adba74391c43135a450c6b81d61969017e30bad7e18d,Tests_passed,41b28dfe3eba4c482094d558d2c80fb0c7925bd33c6793c95934e06add2c4f3e,Tests_passed,True,True,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,0.035453081130981445,0.03744840621948242,0.03160905838012695,0.044489383697509766,0.040972232818603516,0.03978538513183594,0.046854257583618164,0.14773988723754883,0.04654431343078613,0.1655125617980957,0.16588497161865234,0.11493301391601562,0.9342150688171387,0.18877553939819336 +104,refs/remotes/origin/pull/101,37e4c8a68fc8e68091a6b07bcd2fc62edba038c2,234aef759f76f4a4de53d2d311cd37806de9f361,2410f4bf5ffacb559984f7584e12cad802b7805c,,True,True,e61be0a8f3eb18ea0261adba74391c43135a450c6b81d61969017e30bad7e18d,Tests_passed,41b28dfe3eba4c482094d558d2c80fb0c7925bd33c6793c95934e06add2c4f3e,Tests_passed,True,True,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,0.035453081130981445,0.03744840621948242,0.03160905838012695,0.044489383697509766,0.040972232818603516,0.03978538513183594,0.046854257583618164,0.14773988723754883,0.04654431343078613,0.1627213954925537,0.16176104545593262,0.11493301391601562,0.9342150688171387,0.18877553939819336 diff --git a/results/combined/merges_timed/apache/commons-fileupload.csv b/results/combined/merges_timed/apache/commons-fileupload.csv index da7372585e..c86dcaed01 100644 --- a/results/combined/merges_timed/apache/commons-fileupload.csv +++ b/results/combined/merges_timed/apache/commons-fileupload.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -33,refs/heads/master,5d3e1d8f4eafd654dec3e0ece71940597239a5e9,e25b70889f2f0d8563f90f50bdc388d2536b3cc8,1b10014dddf12527f8dbad24169e4f6a9434e8c5,,True,True,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,5736c3cc1b8062325082bf12feedafa77b5e37d3b23174926a613d2b9a543ac3,Tests_passed,True,True,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,0.042112112045288086,0.05453085899353027,0.048302412033081055,0.05439138412475586,0.04271388053894043,0.06250882148742676,0.055606842041015625,0.16533446311950684,0.05634570121765137,0.16765594482421875,0.16602826118469238,0.1304466724395752,0.8443593978881836,0.21717238426208496 +33,refs/heads/master,5d3e1d8f4eafd654dec3e0ece71940597239a5e9,e25b70889f2f0d8563f90f50bdc388d2536b3cc8,1b10014dddf12527f8dbad24169e4f6a9434e8c5,,True,True,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,5736c3cc1b8062325082bf12feedafa77b5e37d3b23174926a613d2b9a543ac3,Tests_passed,True,True,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,0.042112112045288086,0.05453085899353027,0.048302412033081055,0.05439138412475586,0.04271388053894043,0.06250882148742676,0.055606842041015625,0.16533446311950684,0.05634570121765137,0.15855908393859863,0.15945124626159668,0.1304466724395752,0.8443593978881836,0.21717238426208496 diff --git a/results/combined/merges_timed/apache/commons-imaging.csv b/results/combined/merges_timed/apache/commons-imaging.csv index 17a25cc6c2..db10e18465 100644 --- a/results/combined/merges_timed/apache/commons-imaging.csv +++ b/results/combined/merges_timed/apache/commons-imaging.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,888d6faf62dbb06004f2eae2cb889565ab044def,df36623d1826a43031e01af20783c9df4674c3d8,c0c98466358cedbd78ba91b238bb2cc1a4718f53,,True,True,0d05ffbf27bc75c717c2fe0cf23ca003c37065bf54ab2f76d8e76e1b7b83e450,Tests_passed,a2a6ed14001f03ef10a083edace01b168e5876c281b69c0b082a2f518b86baac,Tests_passed,True,True,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,0.2947847843170166,0.3325920104980469,0.48436713218688965,0.4855968952178955,0.4823265075683594,0.47649359703063965,0.4805295467376709,0.7423384189605713,0.33095669746398926,0.6739933490753174,0.6599853038787842,0.4356272220611572,2.357090473175049,1.615602970123291 +2,refs/heads/master,888d6faf62dbb06004f2eae2cb889565ab044def,df36623d1826a43031e01af20783c9df4674c3d8,c0c98466358cedbd78ba91b238bb2cc1a4718f53,,True,True,0d05ffbf27bc75c717c2fe0cf23ca003c37065bf54ab2f76d8e76e1b7b83e450,Tests_passed,a2a6ed14001f03ef10a083edace01b168e5876c281b69c0b082a2f518b86baac,Tests_passed,True,True,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,0.2947847843170166,0.3325920104980469,0.48436713218688965,0.4855968952178955,0.4823265075683594,0.47649359703063965,0.4805295467376709,0.7423384189605713,0.33095669746398926,0.659787654876709,0.6630284786224365,0.4356272220611572,2.357090473175049,1.615602970123291 diff --git a/results/combined/merges_timed/apache/commons-io.csv b/results/combined/merges_timed/apache/commons-io.csv index 4e299e4711..5b5bac02c0 100644 --- a/results/combined/merges_timed/apache/commons-io.csv +++ b/results/combined/merges_timed/apache/commons-io.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -87,refs/remotes/origin/pull/377,2d0ad5c65cce8775c486edf607726612b856d2c8,081e43c49bd6377b731b2fe7ad45a4cf8940254b,c8e7b467794a0173409752933085ae20e15bf1ef,,True,True,59b84830ef201b2c480ac6d9889976664fa5efb36a9a5142c86748edc15e689e,Tests_passed,417b73bf6549d5a143b9d13842ccf8333cda6a1cfdaa3c6f3cdc0e0dc1516004,Tests_passed,True,True,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,0.047354698181152344,0.02198958396911621,0.03225851058959961,0.04009127616882324,0.04873847961425781,0.021117448806762695,0.023444652557373047,0.12804293632507324,0.026005983352661133,0.2263946533203125,0.22678899765014648,0.09441828727722168,0.045067787170410156,0.243316650390625 +87,refs/remotes/origin/pull/377,2d0ad5c65cce8775c486edf607726612b856d2c8,081e43c49bd6377b731b2fe7ad45a4cf8940254b,c8e7b467794a0173409752933085ae20e15bf1ef,,True,True,59b84830ef201b2c480ac6d9889976664fa5efb36a9a5142c86748edc15e689e,Tests_passed,417b73bf6549d5a143b9d13842ccf8333cda6a1cfdaa3c6f3cdc0e0dc1516004,Tests_passed,True,True,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,0.047354698181152344,0.02198958396911621,0.03225851058959961,0.04009127616882324,0.04873847961425781,0.021117448806762695,0.023444652557373047,0.12804293632507324,0.026005983352661133,0.23812007904052734,0.20760607719421387,0.09441828727722168,0.045067787170410156,0.243316650390625 diff --git a/results/combined/merges_timed/apache/commons-jexl.csv b/results/combined/merges_timed/apache/commons-jexl.csv index a238105ff3..fbe052db9b 100644 --- a/results/combined/merges_timed/apache/commons-jexl.csv +++ b/results/combined/merges_timed/apache/commons-jexl.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -168,refs/heads/master,153f1545226f1bcd238202853cc9584f11970e67,b54b3c9a912a3d96e584655f1ffd9564f28942ca,36a7f8da6676f4bdd8a1597189610aa4e55cb4d9,,True,True,360017be1eb12be61ac6a2717dacad2d172e4bf0b84759eab830b82cf96c76cf,Tests_passed,8212f8fffad184fc8cff696d8e58a304bc8cb71dc9d8af134b8375743113b415,Tests_passed,True,True,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,9ecc62d247798615a22de171432fd17b460d407ad4ee9c016ee3e408d4dd8228,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,0.03750467300415039,0.05520319938659668,0.029537677764892578,0.05254864692687988,0.041976213455200195,0.028053998947143555,0.041548967361450195,0.17161798477172852,0.04309535026550293,0.17541766166687012,0.1748523712158203,0.11366891860961914,0.9441494941711426,0.2680492401123047 +168,refs/heads/master,153f1545226f1bcd238202853cc9584f11970e67,b54b3c9a912a3d96e584655f1ffd9564f28942ca,36a7f8da6676f4bdd8a1597189610aa4e55cb4d9,,True,True,360017be1eb12be61ac6a2717dacad2d172e4bf0b84759eab830b82cf96c76cf,Tests_passed,8212f8fffad184fc8cff696d8e58a304bc8cb71dc9d8af134b8375743113b415,Tests_passed,True,True,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,9ecc62d247798615a22de171432fd17b460d407ad4ee9c016ee3e408d4dd8228,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,0.03750467300415039,0.05520319938659668,0.029537677764892578,0.05254864692687988,0.041976213455200195,0.028053998947143555,0.041548967361450195,0.17161798477172852,0.04309535026550293,0.17394638061523438,0.17315125465393066,0.11366891860961914,0.9441494941711426,0.2680492401123047 diff --git a/results/combined/merges_timed/apache/commons-lang.csv b/results/combined/merges_timed/apache/commons-lang.csv index eb3b5f5677..9b2bd50dfc 100644 --- a/results/combined/merges_timed/apache/commons-lang.csv +++ b/results/combined/merges_timed/apache/commons-lang.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -265,refs/remotes/origin/pull/533,62f744a7f25bc456354f23fb3e1b7455a4c53f7a,7efeb41b0af70d104e6431c48e74bf9557b65945,3d4ed4a8ac63db1e51601ffc31fed44dccbb276c,,True,True,0d08e2a4f5e5e921e2ad0ad6b1b80feeecbb8b0e20d68e69945b4b9188bf71e6,Tests_passed,e63b0db615d9362451c87441119d9c191de3ec3274fbb1cad823e6fe85e78665,Tests_passed,True,True,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,1cc72622ca9d77ddb424a96ec2eca55983fdad79946761fcd7e4d686e0d8fd0f,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,1dd768934b96b7a48f7ceb3594e8028335e14043b7238047b8e8a04f8f612b1d,Merge_failed,1dd768934b96b7a48f7ceb3594e8028335e14043b7238047b8e8a04f8f612b1d,Merge_failed,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,0.03367948532104492,0.0354154109954834,0.06110715866088867,0.051660776138305664,0.04875802993774414,0.03947019577026367,0.05798006057739258,0.23211932182312012,0.06293272972106934,0.24850988388061523,0.24681472778320312,0.16912579536437988,0.05789828300476074,0.4196500778198242 +265,refs/remotes/origin/pull/533,62f744a7f25bc456354f23fb3e1b7455a4c53f7a,7efeb41b0af70d104e6431c48e74bf9557b65945,3d4ed4a8ac63db1e51601ffc31fed44dccbb276c,,True,True,0d08e2a4f5e5e921e2ad0ad6b1b80feeecbb8b0e20d68e69945b4b9188bf71e6,Tests_passed,e63b0db615d9362451c87441119d9c191de3ec3274fbb1cad823e6fe85e78665,Tests_passed,True,True,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,1cc72622ca9d77ddb424a96ec2eca55983fdad79946761fcd7e4d686e0d8fd0f,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,1dd768934b96b7a48f7ceb3594e8028335e14043b7238047b8e8a04f8f612b1d,Merge_failed,1dd768934b96b7a48f7ceb3594e8028335e14043b7238047b8e8a04f8f612b1d,Merge_failed,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,0.03367948532104492,0.0354154109954834,0.06110715866088867,0.051660776138305664,0.04875802993774414,0.03947019577026367,0.05798006057739258,0.23211932182312012,0.06293272972106934,0.24442577362060547,0.24461936950683594,0.16912579536437988,0.05789828300476074,0.4196500778198242 diff --git a/results/combined/merges_timed/apache/commons-math.csv b/results/combined/merges_timed/apache/commons-math.csv index ef941c7441..ab5c2c373f 100644 --- a/results/combined/merges_timed/apache/commons-math.csv +++ b/results/combined/merges_timed/apache/commons-math.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -48,refs/heads/master,c4c288a3e0e610ed02801b17ed26016b0e734032,a8c6d43b5a61d8da784f0ac188d40b88a15dad50,a3677db89ef3863e8ac7cf578df499f85d970b76,,True,True,3d100917289ba2dc011dec4a4ff16170fd7c3e5679094ee328b85c9f21d18b47,Tests_passed,6b3fef96cee086a368ec7970f8305409ccb4cdf55ddefccb5cf958248542cbb9,Tests_passed,True,True,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,0.05518198013305664,0.05426836013793945,0.0834505558013916,0.08368778228759766,0.08269381523132324,0.0839986801147461,0.08271622657775879,0.12947344779968262,0.053517818450927734,0.2100381851196289,0.2097482681274414,0.10870695114135742,1.0606262683868408,1.4468107223510742 +48,refs/heads/master,c4c288a3e0e610ed02801b17ed26016b0e734032,a8c6d43b5a61d8da784f0ac188d40b88a15dad50,a3677db89ef3863e8ac7cf578df499f85d970b76,,True,True,3d100917289ba2dc011dec4a4ff16170fd7c3e5679094ee328b85c9f21d18b47,Tests_passed,6b3fef96cee086a368ec7970f8305409ccb4cdf55ddefccb5cf958248542cbb9,Tests_passed,True,True,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,0.05518198013305664,0.05426836013793945,0.0834505558013916,0.08368778228759766,0.08269381523132324,0.0839986801147461,0.08271622657775879,0.12947344779968262,0.053517818450927734,0.20779657363891602,0.2073526382446289,0.10870695114135742,1.0606262683868408,1.4468107223510742 diff --git a/results/combined/merges_timed/apache/commons-net.csv b/results/combined/merges_timed/apache/commons-net.csv index 2ddad643bd..1aab6d5877 100644 --- a/results/combined/merges_timed/apache/commons-net.csv +++ b/results/combined/merges_timed/apache/commons-net.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/heads/master,e3013d784b0b6c93a7624a36870f2dd73e6ecc41,2d0e6ece9df028b11b4592fce2d1c761f570533b,cd0aa01783cc7c0459f24ac9139b952f144c110b,,0e60b717d0b4708350b767069f2a58a7b80e7a91839ea474d86f50b786df605b,Tests_passed,6974d633c93ae3afcd6d7e82f6250dc718697b6613bdb8921807495ea703ca7f,Tests_passed,True,True,True,True,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,a2999352b1213272dd1edcefbd298fadc2fcaa759cf4cf6b6d12cf590c6bb49e,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,97fd645d7345daca91ad45ac0fc908f8f13efa587291ff195dc5801575b11eb9,Merge_failed,97fd645d7345daca91ad45ac0fc908f8f13efa587291ff195dc5801575b11eb9,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,784c54f9f2db2df21a5a2de5d19cad4f3fe2e80815dce82ba80f54e27caf692b,0.056407928466796875,0.05790519714355469,0.04941606521606445,0.05551886558532715,0.039900779724121094,0.06534934043884277,0.07602667808532715,0.19331598281860352,0.06969356536865234,0.3039834499359131,0.31731414794921875,0.17734718322753906,1.9663341045379639,0.33638954162597656 +19,refs/heads/master,e3013d784b0b6c93a7624a36870f2dd73e6ecc41,2d0e6ece9df028b11b4592fce2d1c761f570533b,cd0aa01783cc7c0459f24ac9139b952f144c110b,,0e60b717d0b4708350b767069f2a58a7b80e7a91839ea474d86f50b786df605b,Tests_passed,6974d633c93ae3afcd6d7e82f6250dc718697b6613bdb8921807495ea703ca7f,Tests_passed,True,True,True,True,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,a2999352b1213272dd1edcefbd298fadc2fcaa759cf4cf6b6d12cf590c6bb49e,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,97fd645d7345daca91ad45ac0fc908f8f13efa587291ff195dc5801575b11eb9,Merge_failed,97fd645d7345daca91ad45ac0fc908f8f13efa587291ff195dc5801575b11eb9,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,784c54f9f2db2df21a5a2de5d19cad4f3fe2e80815dce82ba80f54e27caf692b,0.056407928466796875,0.05790519714355469,0.04941606521606445,0.05551886558532715,0.039900779724121094,0.06534934043884277,0.07602667808532715,0.19331598281860352,0.06969356536865234,0.3433985710144043,0.31377577781677246,0.17734718322753906,1.9663341045379639,0.33638954162597656 diff --git a/results/combined/merges_timed/apache/commons-ognl.csv b/results/combined/merges_timed/apache/commons-ognl.csv index a7171c013d..6a0ae622ed 100644 --- a/results/combined/merges_timed/apache/commons-ognl.csv +++ b/results/combined/merges_timed/apache/commons-ognl.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -89,refs/heads/master,c1132d8fb32b81da8b9192ad1ee4e61dfa890665,812a35eb7f400aa93b2e60cf84151b1787a79cfd,5165bddec796a1e2278c01412e06f44de52c911a,,01ccd28af5b5560f840e671640c614e7de2c0034fa319201f2701b016a5ebb48,Tests_passed,d04c3968e492f8063f94e925e78e31a108e85a0ad86a24b69babd6fce558531b,Tests_passed,True,True,True,True,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,0.05082416534423828,0.047019004821777344,0.041263580322265625,0.03610682487487793,0.03685617446899414,0.05785393714904785,0.04591941833496094,0.17160606384277344,0.05340909957885742,0.1689612865447998,0.16431570053100586,0.12070584297180176,0.8282818794250488,0.24584412574768066 +89,refs/heads/master,c1132d8fb32b81da8b9192ad1ee4e61dfa890665,812a35eb7f400aa93b2e60cf84151b1787a79cfd,5165bddec796a1e2278c01412e06f44de52c911a,,01ccd28af5b5560f840e671640c614e7de2c0034fa319201f2701b016a5ebb48,Tests_passed,d04c3968e492f8063f94e925e78e31a108e85a0ad86a24b69babd6fce558531b,Tests_passed,True,True,True,True,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,0.05082416534423828,0.047019004821777344,0.041263580322265625,0.03610682487487793,0.03685617446899414,0.05785393714904785,0.04591941833496094,0.17160606384277344,0.05340909957885742,0.16784906387329102,0.16838884353637695,0.12070584297180176,0.8282818794250488,0.24584412574768066 diff --git a/results/combined/merges_timed/apache/commons-pool.csv b/results/combined/merges_timed/apache/commons-pool.csv index 32af6ecca7..e47a37fd8a 100644 --- a/results/combined/merges_timed/apache/commons-pool.csv +++ b/results/combined/merges_timed/apache/commons-pool.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -36,refs/remotes/origin/1_5_RELEASE,14d3779529102d835672c5bad513d859e5e1deea,dc7faf6d8ccfc4e960bc7af6633c25329d8d3f3d,81e055707a4ef6da311fd88a07b891bcd8a576ed,,True,True,5ff845cf1883dbc6aa84287a20f41923443e4d202a6fccc6943623677c763d8a,Tests_passed,a9b859e5b94d1097e80b39d44f7536499f73a024ea81409747dfcd12064a239e,Tests_passed,True,True,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,75c327e247d6975c4791934e0eb10255109b455280e48c8e1d4e98d2d51c2a92,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,315765c793ad891258959cd29dcdb9b56fe73de718a9658b8b829b50cf39674f,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,cac00aba5868707bde79c501b6d38fa4749b1dc3e3669aea42cb403f3d111735,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,4f22368917375593354d87f86f083899ff64e7d9f7f3be7c1e7aff7b19d12558,Merge_failed,4f22368917375593354d87f86f083899ff64e7d9f7f3be7c1e7aff7b19d12558,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,a8c414bc061f720ac53f6c7b7bf705a8bb8a0642cc290166bf4ce1678c5889d9,Merge_failed,aad768e89a333d52cf91ff5cdea265c54e144670c099dbfdd5cc898f6f9fcea2,0.06531000137329102,0.06485414505004883,0.07683515548706055,0.07419729232788086,0.07098650932312012,0.07061195373535156,0.062270164489746094,0.5534019470214844,0.12769341468811035,0.6275088787078857,0.6248657703399658,0.49430203437805176,8.04391884803772,0.29984211921691895 +36,refs/remotes/origin/1_5_RELEASE,14d3779529102d835672c5bad513d859e5e1deea,dc7faf6d8ccfc4e960bc7af6633c25329d8d3f3d,81e055707a4ef6da311fd88a07b891bcd8a576ed,,True,True,5ff845cf1883dbc6aa84287a20f41923443e4d202a6fccc6943623677c763d8a,Tests_passed,a9b859e5b94d1097e80b39d44f7536499f73a024ea81409747dfcd12064a239e,Tests_passed,True,True,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,75c327e247d6975c4791934e0eb10255109b455280e48c8e1d4e98d2d51c2a92,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,315765c793ad891258959cd29dcdb9b56fe73de718a9658b8b829b50cf39674f,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,cac00aba5868707bde79c501b6d38fa4749b1dc3e3669aea42cb403f3d111735,Merge_failed,a5fef153261319297e059ed66b5220222e6ccc31d82d7519c970d5e87f197b5e,Merge_failed,4f22368917375593354d87f86f083899ff64e7d9f7f3be7c1e7aff7b19d12558,Merge_failed,4f22368917375593354d87f86f083899ff64e7d9f7f3be7c1e7aff7b19d12558,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,a8c414bc061f720ac53f6c7b7bf705a8bb8a0642cc290166bf4ce1678c5889d9,Merge_failed,aad768e89a333d52cf91ff5cdea265c54e144670c099dbfdd5cc898f6f9fcea2,0.06531000137329102,0.06485414505004883,0.07683515548706055,0.07419729232788086,0.07098650932312012,0.07061195373535156,0.062270164489746094,0.5534019470214844,0.12769341468811035,0.607494592666626,0.6112117767333984,0.49430203437805176,8.04391884803772,0.29984211921691895 diff --git a/results/combined/merges_timed/apache/commons-validator.csv b/results/combined/merges_timed/apache/commons-validator.csv index aea38f055f..84771438af 100644 --- a/results/combined/merges_timed/apache/commons-validator.csv +++ b/results/combined/merges_timed/apache/commons-validator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -42,refs/heads/master,3d8f2df479e5b0884bb8d58b6a194e0f8163102c,cf76af0ad3ba123eb9337c46a60a60623db7129d,79293404604cf443236e859df057962ff28676c4,,True,True,aee43ad24650e76057f1b884617cc35c9fec55edeaa2d07a9c9940bba7990d19,Tests_passed,078eaeaee7cc75875773b14c0fc6502d07c2e526d0e7fd04d50d86e67f45297d,Tests_passed,True,True,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_failed,50d288fdffddf03479c5adf2facc843088c191e7d2a2e6edf8bf6a71e3335c52,Tests_failed,50d288fdffddf03479c5adf2facc843088c191e7d2a2e6edf8bf6a71e3335c52,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,0.05489754676818848,0.03796744346618652,0.04816913604736328,0.043924808502197266,0.0699460506439209,0.051720380783081055,0.0608978271484375,0.2087235450744629,0.05116415023803711,0.1787879467010498,0.17761683464050293,0.12534284591674805,1.0217041969299316,0.3079061508178711 +42,refs/heads/master,3d8f2df479e5b0884bb8d58b6a194e0f8163102c,cf76af0ad3ba123eb9337c46a60a60623db7129d,79293404604cf443236e859df057962ff28676c4,,True,True,aee43ad24650e76057f1b884617cc35c9fec55edeaa2d07a9c9940bba7990d19,Tests_passed,078eaeaee7cc75875773b14c0fc6502d07c2e526d0e7fd04d50d86e67f45297d,Tests_passed,True,True,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_failed,50d288fdffddf03479c5adf2facc843088c191e7d2a2e6edf8bf6a71e3335c52,Tests_failed,50d288fdffddf03479c5adf2facc843088c191e7d2a2e6edf8bf6a71e3335c52,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,0.05489754676818848,0.03796744346618652,0.04816913604736328,0.043924808502197266,0.0699460506439209,0.051720380783081055,0.0608978271484375,0.2087235450744629,0.05116415023803711,0.17617440223693848,0.17147564888000488,0.12534284591674805,1.0217041969299316,0.3079061508178711 diff --git a/results/combined/merges_timed/apache/directory-kerby.csv b/results/combined/merges_timed/apache/directory-kerby.csv index 3a5b105cb7..072cadace9 100644 --- a/results/combined/merges_timed/apache/directory-kerby.csv +++ b/results/combined/merges_timed/apache/directory-kerby.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -226,refs/heads/trunk,2daee238dbcf01170a01936f0feddb65e7dd0726,df2539bed1b4fc59642979ade83abfd8809b53bd,44f40d11d8cf2d9017278d92aec5d9f48d3fb88d,,True,True,66b814d0497c94eb54c444f56e9e953dc3ea268ac6cc1a203bced908cc5f0d84,Tests_passed,27352618feac3c7caa18496734a060a137f8bda57cdc3bdf06ff2a4e5427d130,Tests_passed,True,True,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,d5a54451ae15627b70efa617d0d9ab135d1d8f8e24e64ca39b3b5936aa1ac9dc,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,7a3dc2b63b6a9b3d8880f40dc6d39e14153c9f9801c5e217cba1c7dacc9282a8,Merge_failed,7a3dc2b63b6a9b3d8880f40dc6d39e14153c9f9801c5e217cba1c7dacc9282a8,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,df34eed536cdf56d42f9c1eaf0b1937ea23ab8e65c390913a57f258617d3cb4e,0.04034304618835449,0.04445600509643555,0.04687094688415527,0.041261911392211914,0.05078601837158203,0.04318356513977051,0.05274796485900879,0.18733787536621094,0.0867013931274414,0.06538820266723633,0.06705188751220703,0.08249640464782715,0.9878690242767334,0.25421810150146484 +226,refs/heads/trunk,2daee238dbcf01170a01936f0feddb65e7dd0726,df2539bed1b4fc59642979ade83abfd8809b53bd,44f40d11d8cf2d9017278d92aec5d9f48d3fb88d,,True,True,66b814d0497c94eb54c444f56e9e953dc3ea268ac6cc1a203bced908cc5f0d84,Tests_passed,27352618feac3c7caa18496734a060a137f8bda57cdc3bdf06ff2a4e5427d130,Tests_passed,True,True,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,d5a54451ae15627b70efa617d0d9ab135d1d8f8e24e64ca39b3b5936aa1ac9dc,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,7a3dc2b63b6a9b3d8880f40dc6d39e14153c9f9801c5e217cba1c7dacc9282a8,Merge_failed,7a3dc2b63b6a9b3d8880f40dc6d39e14153c9f9801c5e217cba1c7dacc9282a8,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,df34eed536cdf56d42f9c1eaf0b1937ea23ab8e65c390913a57f258617d3cb4e,0.04034304618835449,0.04445600509643555,0.04687094688415527,0.041261911392211914,0.05078601837158203,0.04318356513977051,0.05274796485900879,0.18733787536621094,0.0867013931274414,0.08689284324645996,0.06619811058044434,0.08249640464782715,0.9878690242767334,0.25421810150146484 diff --git a/results/combined/merges_timed/apache/fop.csv b/results/combined/merges_timed/apache/fop.csv index abae826016..bad262bd53 100644 --- a/results/combined/merges_timed/apache/fop.csv +++ b/results/combined/merges_timed/apache/fop.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -175,refs/remotes/origin/pull/3,7403425be8d6fe84d9ebd9614109629fadc8a752,7cae529cc4d2b6f3e8084d1950fefd630f29ccfd,9978ac1d3a99a429627198759affdedd2b10cd1d,,cd1ff9e568e7f297b54ff98013502d203e3a67096b2503f6db7c2da6e438eeb5,Tests_passed,292361e45e7524ae9746da64b485aeda42d21a864bb8e63435c970d82863268e,Tests_passed,True,True,True,True,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,1bf457ed34cb24c60b5e6807182c983abdc7ad606ff364e7aa5c1327e156bbd2,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,9fabf2e352e60066a50538bcbf4d0d7e7ec362fcbe41dc2010deb416197b2813,Tests_passed,9fabf2e352e60066a50538bcbf4d0d7e7ec362fcbe41dc2010deb416197b2813,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,06d8ee6440cde442becf271f50cf589c8bb97cc24bb663acbb097dfe52cfde7d,0.10559368133544922,0.10694169998168945,0.13389873504638672,0.13581204414367676,0.1354825496673584,0.13524770736694336,0.1648256778717041,0.5192890167236328,0.255199670791626,1.806565761566162,1.8064086437225342,0.6908278465270996,10.537936210632324,3.361409902572632 +175,refs/remotes/origin/pull/3,7403425be8d6fe84d9ebd9614109629fadc8a752,7cae529cc4d2b6f3e8084d1950fefd630f29ccfd,9978ac1d3a99a429627198759affdedd2b10cd1d,,cd1ff9e568e7f297b54ff98013502d203e3a67096b2503f6db7c2da6e438eeb5,Tests_passed,292361e45e7524ae9746da64b485aeda42d21a864bb8e63435c970d82863268e,Tests_passed,True,True,True,True,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,1bf457ed34cb24c60b5e6807182c983abdc7ad606ff364e7aa5c1327e156bbd2,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,9fabf2e352e60066a50538bcbf4d0d7e7ec362fcbe41dc2010deb416197b2813,Tests_passed,9fabf2e352e60066a50538bcbf4d0d7e7ec362fcbe41dc2010deb416197b2813,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,06d8ee6440cde442becf271f50cf589c8bb97cc24bb663acbb097dfe52cfde7d,0.10559368133544922,0.10694169998168945,0.13389873504638672,0.13581204414367676,0.1354825496673584,0.13524770736694336,0.1648256778717041,0.5192890167236328,0.255199670791626,1.7241809368133545,1.7278270721435547,0.6908278465270996,10.537936210632324,3.361409902572632 diff --git a/results/combined/merges_timed/apache/geronimo-specs.csv b/results/combined/merges_timed/apache/geronimo-specs.csv index c25ddb98ed..1ea77497c7 100644 --- a/results/combined/merges_timed/apache/geronimo-specs.csv +++ b/results/combined/merges_timed/apache/geronimo-specs.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -88,refs/remotes/origin/pull/17,229a0222332567f69c53b4bdac713238935e840c,8d5bb7178205a4171b69d0d352cff74a4f221439,8f32fef5f3dbd5c1f577d967fcfb41bbb8af497d,,True,True,e8dcaa08c37afb37d4f0640e9083832b641b41a8d8191236b19ab68978d00182,Tests_passed,7147bed0aea305357e81b689c9f37b551abbc487a5304ac965f6391301784b31,Tests_passed,True,True,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,ba81daa75793e344e06b35da561afddfceda700dfc9370a9e4ba754d4a10604b,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,a5f270f6422fae88cdb13ad665bcbbb3acc5096d32252a18750b51047ac82c10,Merge_failed,a5f270f6422fae88cdb13ad665bcbbb3acc5096d32252a18750b51047ac82c10,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,db3fadc461b96d53f4aa7d2974be7e96a62d5104282125b510e4287846e2e36b,0.0780034065246582,0.07769227027893066,0.07170677185058594,0.07686567306518555,0.07898068428039551,0.09959554672241211,0.04746842384338379,0.2645907402038574,0.11127161979675293,0.07384014129638672,0.07422566413879395,0.1489276885986328,0.4882168769836426,0.34552693367004395 +88,refs/remotes/origin/pull/17,229a0222332567f69c53b4bdac713238935e840c,8d5bb7178205a4171b69d0d352cff74a4f221439,8f32fef5f3dbd5c1f577d967fcfb41bbb8af497d,,True,True,e8dcaa08c37afb37d4f0640e9083832b641b41a8d8191236b19ab68978d00182,Tests_passed,7147bed0aea305357e81b689c9f37b551abbc487a5304ac965f6391301784b31,Tests_passed,True,True,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,ba81daa75793e344e06b35da561afddfceda700dfc9370a9e4ba754d4a10604b,Merge_failed,f524b27d54466c9dfdb9fa6ab651d2c39e9cbc418b6c292aadb4b58f13f44697,Merge_failed,a5f270f6422fae88cdb13ad665bcbbb3acc5096d32252a18750b51047ac82c10,Merge_failed,a5f270f6422fae88cdb13ad665bcbbb3acc5096d32252a18750b51047ac82c10,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,db3fadc461b96d53f4aa7d2974be7e96a62d5104282125b510e4287846e2e36b,0.0780034065246582,0.07769227027893066,0.07170677185058594,0.07686567306518555,0.07898068428039551,0.09959554672241211,0.04746842384338379,0.2645907402038574,0.11127161979675293,0.0757598876953125,0.0745999813079834,0.1489276885986328,0.4882168769836426,0.34552693367004395 diff --git a/results/combined/merges_timed/apache/incubator-tamaya.csv b/results/combined/merges_timed/apache/incubator-tamaya.csv index 56b4a078f1..24e966e4e8 100644 --- a/results/combined/merges_timed/apache/incubator-tamaya.csv +++ b/results/combined/merges_timed/apache/incubator-tamaya.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/master,74a73954a03c9854e80b7bafd46332a5a034a2fe,3a50d2e6eb06b7463e85a6f872463c28bc1142b0,45f5bb90bb48e1dc083e6e67138c140112f1dcab,,True,True,cd2b85b49101b8714f817a3d58806b56b1b37f418d85d6a300fe45b7db783b38,Tests_passed,56d347327d56a0d41a3b4d4b8005abe2d37de34f11b2506284a72f6ac2503a13,Tests_passed,True,True,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,0.04412198066711426,0.02231454849243164,0.06458353996276855,0.057370662689208984,0.056798458099365234,0.06700420379638672,0.06505393981933594,0.9765169620513916,0.04212331771850586,1.7833929061889648,1.7778267860412598,0.7697136402130127,6.760615110397339,0.35983920097351074 +31,refs/heads/master,74a73954a03c9854e80b7bafd46332a5a034a2fe,3a50d2e6eb06b7463e85a6f872463c28bc1142b0,45f5bb90bb48e1dc083e6e67138c140112f1dcab,,True,True,cd2b85b49101b8714f817a3d58806b56b1b37f418d85d6a300fe45b7db783b38,Tests_passed,56d347327d56a0d41a3b4d4b8005abe2d37de34f11b2506284a72f6ac2503a13,Tests_passed,True,True,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,0.04412198066711426,0.02231454849243164,0.06458353996276855,0.057370662689208984,0.056798458099365234,0.06700420379638672,0.06505393981933594,0.9765169620513916,0.04212331771850586,1.790571689605713,1.7886784076690674,0.7697136402130127,6.760615110397339,0.35983920097351074 diff --git a/results/combined/merges_timed/apache/jackrabbit-filevault.csv b/results/combined/merges_timed/apache/jackrabbit-filevault.csv index 13ae8dc1d6..b3cdcce773 100644 --- a/results/combined/merges_timed/apache/jackrabbit-filevault.csv +++ b/results/combined/merges_timed/apache/jackrabbit-filevault.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -38,refs/remotes/origin/pull/318,c4842868060884add8b7232d8d30224ad6bd2952,d4140d0987608e07f0b0b0d718ea1abfb892d5c1,d462b815ba9cca13721e6f36e40251e2b74244f4,,True,True,1d98f63ca51c4c0e6f13357dfbce768de31ab86bb198a047741f894789083255,Tests_passed,d3cf4a0af32f12478d370f5264340ba5314244ae695cbc869a90e2a2e8774b65,Tests_passed,True,True,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,32ed74f8ae96fcedc2b142ae340606bcb4955583c0229937ff8403d8d99bee5a,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,595821fb467ad3f6b84093447fcb1b6172adf674e8c59801faa58bdbe1949891,Merge_failed,595821fb467ad3f6b84093447fcb1b6172adf674e8c59801faa58bdbe1949891,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,68f6934f63fbf7fbb2ee3b35de099fec76fbc219bf8be406f5d20af05408ac11,Merge_failed,68f6934f63fbf7fbb2ee3b35de099fec76fbc219bf8be406f5d20af05408ac11,0.0649416446685791,0.061627864837646484,0.06561279296875,0.05686664581298828,0.06662702560424805,0.06759762763977051,0.06993365287780762,0.2211289405822754,0.09668445587158203,0.08704113960266113,0.08689355850219727,0.14115285873413086,0.041666269302368164,0.27040886878967285 +38,refs/remotes/origin/pull/318,c4842868060884add8b7232d8d30224ad6bd2952,d4140d0987608e07f0b0b0d718ea1abfb892d5c1,d462b815ba9cca13721e6f36e40251e2b74244f4,,True,True,1d98f63ca51c4c0e6f13357dfbce768de31ab86bb198a047741f894789083255,Tests_passed,d3cf4a0af32f12478d370f5264340ba5314244ae695cbc869a90e2a2e8774b65,Tests_passed,True,True,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,32ed74f8ae96fcedc2b142ae340606bcb4955583c0229937ff8403d8d99bee5a,Merge_failed,2c421dfd67add09d7de5a2af7fa8c5850d37dc75aff93f528a139092dff16f80,Merge_failed,595821fb467ad3f6b84093447fcb1b6172adf674e8c59801faa58bdbe1949891,Merge_failed,595821fb467ad3f6b84093447fcb1b6172adf674e8c59801faa58bdbe1949891,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,68f6934f63fbf7fbb2ee3b35de099fec76fbc219bf8be406f5d20af05408ac11,Merge_failed,68f6934f63fbf7fbb2ee3b35de099fec76fbc219bf8be406f5d20af05408ac11,0.0649416446685791,0.061627864837646484,0.06561279296875,0.05686664581298828,0.06662702560424805,0.06759762763977051,0.06993365287780762,0.2211289405822754,0.09668445587158203,0.08625435829162598,0.08738517761230469,0.14115285873413086,0.041666269302368164,0.27040886878967285 diff --git a/results/combined/merges_timed/apache/jackrabbit.csv b/results/combined/merges_timed/apache/jackrabbit.csv index ee6cab626f..fa969d4b48 100644 --- a/results/combined/merges_timed/apache/jackrabbit.csv +++ b/results/combined/merges_timed/apache/jackrabbit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -78,refs/remotes/origin/pull/88,c980ab851ddaac027ad4237151e416167682a71b,df833def60f7ddaeb3388043b7617155a03faa0f,e0e0f4592be8d34c442b466bf94184cedf3b7437,,True,True,2664596db516481df6480497e04bd6aaf6d460bdab6d08bf8ac19073971127b8,Tests_passed,982a484a16a3d6f5605f8cfb51395ed490fd1d9531ab41c635d7168e1be24ed5,Tests_passed,True,True,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,0.02766704559326172,0.027326583862304688,0.032826900482177734,0.03347325325012207,0.032861948013305664,0.032878875732421875,0.03300070762634277,0.07567787170410156,0.026997089385986328,0.24422192573547363,0.24493408203125,0.08365535736083984,3.3357787132263184,0.43381738662719727 +78,refs/remotes/origin/pull/88,c980ab851ddaac027ad4237151e416167682a71b,df833def60f7ddaeb3388043b7617155a03faa0f,e0e0f4592be8d34c442b466bf94184cedf3b7437,,True,True,2664596db516481df6480497e04bd6aaf6d460bdab6d08bf8ac19073971127b8,Tests_passed,982a484a16a3d6f5605f8cfb51395ed490fd1d9531ab41c635d7168e1be24ed5,Tests_passed,True,True,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,0.02766704559326172,0.027326583862304688,0.032826900482177734,0.03347325325012207,0.032861948013305664,0.032878875732421875,0.03300070762634277,0.07567787170410156,0.026997089385986328,0.2399430274963379,0.2372455596923828,0.08365535736083984,3.3357787132263184,0.43381738662719727 diff --git a/results/combined/merges_timed/apache/james-mime4j.csv b/results/combined/merges_timed/apache/james-mime4j.csv index bfb2b9b56f..a5bb6bb4af 100644 --- a/results/combined/merges_timed/apache/james-mime4j.csv +++ b/results/combined/merges_timed/apache/james-mime4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,0a0733fb6b0fac6ebab2a2bf2aea32a387a889ed,e5a2caca4d3b5b2694d7156cd42cb8e3f96541c4,293714fe2c91fed2b5c6a7fb351fa79c80e867e2,,4938610b1e2de86cc71e85b0b31ca4c521bafc4aa24b3469a3af7aeca0edce90,Tests_passed,c8f1e41ffc2c675e72bacb41dd025c2073a095a729ec1f7fcc02094a7f5359e2,Tests_passed,True,True,True,True,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,0.014119148254394531,0.013367176055908203,0.013558149337768555,0.014026641845703125,0.013826608657836914,0.014172792434692383,0.014788389205932617,0.044965267181396484,0.012690305709838867,0.16408801078796387,0.16077899932861328,0.07074785232543945,0.8709399700164795,0.22560811042785645 +2,refs/heads/master,0a0733fb6b0fac6ebab2a2bf2aea32a387a889ed,e5a2caca4d3b5b2694d7156cd42cb8e3f96541c4,293714fe2c91fed2b5c6a7fb351fa79c80e867e2,,4938610b1e2de86cc71e85b0b31ca4c521bafc4aa24b3469a3af7aeca0edce90,Tests_passed,c8f1e41ffc2c675e72bacb41dd025c2073a095a729ec1f7fcc02094a7f5359e2,Tests_passed,True,True,True,True,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,0.014119148254394531,0.013367176055908203,0.013558149337768555,0.014026641845703125,0.013826608657836914,0.014172792434692383,0.014788389205932617,0.044965267181396484,0.012690305709838867,0.15457510948181152,0.15480279922485352,0.07074785232543945,0.8709399700164795,0.22560811042785645 diff --git a/results/combined/merges_timed/apache/maven-enforcer.csv b/results/combined/merges_timed/apache/maven-enforcer.csv index 262c3b76da..accf4d7e7d 100644 --- a/results/combined/merges_timed/apache/maven-enforcer.csv +++ b/results/combined/merges_timed/apache/maven-enforcer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,0f3207ac28155bce317658f813c6fb4022c1ce19,3c192e174a09cb3a4cb4793d4bc7a9b4b8ae6ddd,e48ef741173c57fa1b43a960db107b40cff49536,,True,True,fca3e8aef5e88c65527ec6264547c226d8c481941fee173efb3b173fa64f9007,Tests_passed,dc8fc476507683e6bb9244dd9409d5b317b4fd0e6abef96a1e43a1d964ad851d,Tests_passed,True,True,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,0.04601097106933594,0.039258718490600586,0.057570695877075195,0.027928829193115234,0.04933357238769531,0.05317401885986328,0.05611753463745117,0.18208980560302734,0.04443502426147461,0.16733217239379883,0.1647186279296875,0.11168527603149414,0.9930119514465332,0.25812411308288574 +2,refs/heads/master,0f3207ac28155bce317658f813c6fb4022c1ce19,3c192e174a09cb3a4cb4793d4bc7a9b4b8ae6ddd,e48ef741173c57fa1b43a960db107b40cff49536,,True,True,fca3e8aef5e88c65527ec6264547c226d8c481941fee173efb3b173fa64f9007,Tests_passed,dc8fc476507683e6bb9244dd9409d5b317b4fd0e6abef96a1e43a1d964ad851d,Tests_passed,True,True,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,0.04601097106933594,0.039258718490600586,0.057570695877075195,0.027928829193115234,0.04933357238769531,0.05317401885986328,0.05611753463745117,0.18208980560302734,0.04443502426147461,0.16707253456115723,0.16848349571228027,0.11168527603149414,0.9930119514465332,0.25812411308288574 diff --git a/results/combined/merges_timed/apache/maven-plugin-tools.csv b/results/combined/merges_timed/apache/maven-plugin-tools.csv index 2bd0ec90a6..b1dfd2b831 100644 --- a/results/combined/merges_timed/apache/maven-plugin-tools.csv +++ b/results/combined/merges_timed/apache/maven-plugin-tools.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/remotes/origin/pull/46,5fe527d2614d39b64e81881e52ff4fb88a0c6111,0b0daeeeada60052ab663d9b08122826c1e130d1,8f9ee789d272cf702aaf390004b78b73b78db4f1,,c2da2b9f750344257c06e4d547aa76e8678bc43746be03e970b70c2d338602a7,Tests_passed,ec94dfb2d3ee664add509e4980d203c3bb86f42f604c133eafc5cc8e14d4d87c,Tests_passed,True,True,True,True,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,9e6088178393a0fa09cb761f4edfeb0cf3048cfc289e2e25db02a520a6efbfd0,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,61f18ff054c2f302eb5564ca6697d5e21abadf251925656309149895a8ce2e55,Merge_failed,61f18ff054c2f302eb5564ca6697d5e21abadf251925656309149895a8ce2e55,Merge_failed,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_failed,920af23ba392b5c02f6229ad9825d73e0eed383ff27eb447c7be3d2ad6d8be68,0.027008056640625,0.03358650207519531,0.02932453155517578,0.036153316497802734,0.03667092323303223,0.036715030670166016,0.03673863410949707,0.1335277557373047,0.04340553283691406,0.582892656326294,0.5884730815887451,0.3613150119781494,5.063374757766724,0.34696340560913086 +16,refs/remotes/origin/pull/46,5fe527d2614d39b64e81881e52ff4fb88a0c6111,0b0daeeeada60052ab663d9b08122826c1e130d1,8f9ee789d272cf702aaf390004b78b73b78db4f1,,c2da2b9f750344257c06e4d547aa76e8678bc43746be03e970b70c2d338602a7,Tests_passed,ec94dfb2d3ee664add509e4980d203c3bb86f42f604c133eafc5cc8e14d4d87c,Tests_passed,True,True,True,True,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,9e6088178393a0fa09cb761f4edfeb0cf3048cfc289e2e25db02a520a6efbfd0,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,61f18ff054c2f302eb5564ca6697d5e21abadf251925656309149895a8ce2e55,Merge_failed,61f18ff054c2f302eb5564ca6697d5e21abadf251925656309149895a8ce2e55,Merge_failed,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_failed,920af23ba392b5c02f6229ad9825d73e0eed383ff27eb447c7be3d2ad6d8be68,0.027008056640625,0.03358650207519531,0.02932453155517578,0.036153316497802734,0.03667092323303223,0.036715030670166016,0.03673863410949707,0.1335277557373047,0.04340553283691406,0.5859241485595703,0.5867595672607422,0.3613150119781494,5.063374757766724,0.34696340560913086 diff --git a/results/combined/merges_timed/apache/metamodel.csv b/results/combined/merges_timed/apache/metamodel.csv index 24d0956719..5fc2472f18 100644 --- a/results/combined/merges_timed/apache/metamodel.csv +++ b/results/combined/merges_timed/apache/metamodel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,292b40b8e2832d36c1cb78c845b6497211992518,56dd99fc519f8db5bf03906e01f4a89c3169df10,7e60c6066d3784efacc240e9a8dbfbff391eb172,,True,True,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,c1313624f5dafeb981796b2d8f7e96066fc00087decd626f4acf269564448775,Tests_passed,True,True,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,0.06082725524902344,0.06186628341674805,0.06110119819641113,0.05752921104431152,0.061901092529296875,0.06868672370910645,0.05989837646484375,0.20444822311401367,0.056638240814208984,0.16227245330810547,0.1641552448272705,0.12329316139221191,0.05340123176574707,0.26120591163635254 +3,refs/heads/master,292b40b8e2832d36c1cb78c845b6497211992518,56dd99fc519f8db5bf03906e01f4a89c3169df10,7e60c6066d3784efacc240e9a8dbfbff391eb172,,True,True,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,c1313624f5dafeb981796b2d8f7e96066fc00087decd626f4acf269564448775,Tests_passed,True,True,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,0.06082725524902344,0.06186628341674805,0.06110119819641113,0.05752921104431152,0.061901092529296875,0.06868672370910645,0.05989837646484375,0.20444822311401367,0.056638240814208984,0.16163110733032227,0.16401433944702148,0.12329316139221191,0.05340123176574707,0.26120591163635254 diff --git a/results/combined/merges_timed/apache/olingo-odata2.csv b/results/combined/merges_timed/apache/olingo-odata2.csv index cea5e6250b..b507955a41 100644 --- a/results/combined/merges_timed/apache/olingo-odata2.csv +++ b/results/combined/merges_timed/apache/olingo-odata2.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,843fba1449b367d5eef6fa69f4606bbd7232a9d9,352a82c3ccfd91ab45e21f83309c675886332bd3,21dfed3b6b399e4629729e35cc300104b74cb153,,True,True,89082f64daa0c2b0bb5c32a9d370927326bad450c8c788a072bcb6fdf78bf04b,Tests_passed,9df2bfc43c74ccd58819140a1fc0c0dbd696f603f3f7ac2c121ada075f985e8c,Tests_passed,True,True,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,9affd642979b11a191f5db1c9baf8d439bc3dd86dc397ad2b4ed084d5053a323,Tests_passed,9affd642979b11a191f5db1c9baf8d439bc3dd86dc397ad2b4ed084d5053a323,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,0.0696265697479248,0.06908702850341797,0.07357001304626465,0.06858325004577637,0.0803532600402832,0.055985212326049805,0.06085944175720215,0.19208192825317383,0.0658423900604248,0.20697951316833496,0.20154929161071777,0.13961410522460938,0.04734063148498535,0.3251819610595703 +8,refs/heads/master,843fba1449b367d5eef6fa69f4606bbd7232a9d9,352a82c3ccfd91ab45e21f83309c675886332bd3,21dfed3b6b399e4629729e35cc300104b74cb153,,True,True,89082f64daa0c2b0bb5c32a9d370927326bad450c8c788a072bcb6fdf78bf04b,Tests_passed,9df2bfc43c74ccd58819140a1fc0c0dbd696f603f3f7ac2c121ada075f985e8c,Tests_passed,True,True,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,9affd642979b11a191f5db1c9baf8d439bc3dd86dc397ad2b4ed084d5053a323,Tests_passed,9affd642979b11a191f5db1c9baf8d439bc3dd86dc397ad2b4ed084d5053a323,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,0.0696265697479248,0.06908702850341797,0.07357001304626465,0.06858325004577637,0.0803532600402832,0.055985212326049805,0.06085944175720215,0.19208192825317383,0.0658423900604248,0.19829058647155762,0.19934654235839844,0.13961410522460938,0.04734063148498535,0.3251819610595703 diff --git a/results/combined/merges_timed/apache/olingo-odata4.csv b/results/combined/merges_timed/apache/olingo-odata4.csv index be4d8fa246..0deb8157b5 100644 --- a/results/combined/merges_timed/apache/olingo-odata4.csv +++ b/results/combined/merges_timed/apache/olingo-odata4.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -40,refs/heads/master,483ee9de15cf8bbcc18e2560496724b06be76cf2,0ce0a88be2766261c6d30665b9b9a2576b546c08,3584e1d71d260a44f9aa685503bdde2d62ad322f,,True,True,40e26605249c22baf44606775b5cab512d21cd2e2d5dcc38090482c62f4d6f64,Tests_passed,5f04cdc200f8d8b71ca7db68494fd6760d45d046fba443849104cf69a68677ac,Tests_passed,True,True,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,3bdbbdf211beae95b9eb8aae1770ff89cc83cfa6aad24e8f28b93c9dafb2d86f,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,f0d82b25c7369e1ecf860520a3ea5395d3e37cac10d1c5cc36e911db27685f84,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,7c09f12f63c227628b5985e7725e64fc15423839dd7d4e31bef7c0b1aa8cdf32,Merge_failed,7c09f12f63c227628b5985e7725e64fc15423839dd7d4e31bef7c0b1aa8cdf32,Merge_failed,9acbf21858a22f43d416d30a3e7a73cfbaa92d9e17a8bb7793bd093418b748c8,Merge_failed,88ea6ac834183152fb6c47d0afcfb9cdcf22ce31b60c2dee5fe499a4f3e787ed,Merge_failed,0ec71aec798ca78d86fc017abb7d859350a2492ce902eef0a1f25535fb2b605f,0.0724339485168457,0.06787967681884766,0.07810664176940918,0.08780741691589355,0.0795741081237793,0.08736896514892578,0.07506895065307617,0.4585099220275879,0.10393357276916504,0.4352741241455078,0.44826173782348633,0.31332993507385254,10.227067470550537,2.350505828857422 +40,refs/heads/master,483ee9de15cf8bbcc18e2560496724b06be76cf2,0ce0a88be2766261c6d30665b9b9a2576b546c08,3584e1d71d260a44f9aa685503bdde2d62ad322f,,True,True,40e26605249c22baf44606775b5cab512d21cd2e2d5dcc38090482c62f4d6f64,Tests_passed,5f04cdc200f8d8b71ca7db68494fd6760d45d046fba443849104cf69a68677ac,Tests_passed,True,True,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,3bdbbdf211beae95b9eb8aae1770ff89cc83cfa6aad24e8f28b93c9dafb2d86f,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,f0d82b25c7369e1ecf860520a3ea5395d3e37cac10d1c5cc36e911db27685f84,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,7c09f12f63c227628b5985e7725e64fc15423839dd7d4e31bef7c0b1aa8cdf32,Merge_failed,7c09f12f63c227628b5985e7725e64fc15423839dd7d4e31bef7c0b1aa8cdf32,Merge_failed,9acbf21858a22f43d416d30a3e7a73cfbaa92d9e17a8bb7793bd093418b748c8,Merge_failed,88ea6ac834183152fb6c47d0afcfb9cdcf22ce31b60c2dee5fe499a4f3e787ed,Merge_failed,0ec71aec798ca78d86fc017abb7d859350a2492ce902eef0a1f25535fb2b605f,0.0724339485168457,0.06787967681884766,0.07810664176940918,0.08780741691589355,0.0795741081237793,0.08736896514892578,0.07506895065307617,0.4585099220275879,0.10393357276916504,0.44967222213745117,0.4467160701751709,0.31332993507385254,10.227067470550537,2.350505828857422 diff --git a/results/combined/merges_timed/apache/opennlp.csv b/results/combined/merges_timed/apache/opennlp.csv index 861924a0d9..e4fd772c3f 100644 --- a/results/combined/merges_timed/apache/opennlp.csv +++ b/results/combined/merges_timed/apache/opennlp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/remotes/origin/pull/101,6fceb69a6af56b3ccf80b333b25f884a20ef224e,62e6242804e4167f5c476ae34acc784009a1af0f,9a0d208129c66ce13e90edb9765e3ba3684d7b80,,True,True,a86ef3da5c32de2e3b8da7f9fbdede66282481f54c61b66a51d37831045e3118,Tests_passed,8518d304966701bf30996be17b0430c6da27b4ae062d0f0847b09dd30bda240d,Tests_passed,True,True,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,fb9bac3e2e1303ef046f35ec431fa4bfe11e4dfd950eb069607633f631bb2f0d,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,fb9bac3e2e1303ef046f35ec431fa4bfe11e4dfd950eb069607633f631bb2f0d,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,1f4acab7d852d1df2021d27455f3ddc9fb9a23e62ece721b6f1149d2f9efdc35,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,71d07e94523658af8519f33271423dc610a4f0a93b90d22c817f338e1055168c,Merge_failed,71d07e94523658af8519f33271423dc610a4f0a93b90d22c817f338e1055168c,Merge_failed,cbbce31659829ca4eee79a747b67e122babf0ce8e2b3a94a7d36b082aba114ef,Merge_failed,37fc1da6794fa3ad3fc52f3d83e466065669b99eec149838529a320911449527,Merge_failed,08384497073f7555589a741d7a0f1b1a2bc2c5143e7c706b4548afb8457db29f,0.043224334716796875,0.04328656196594238,0.05259299278259277,0.052694082260131836,0.052680015563964844,0.05230832099914551,0.0525975227355957,0.11643195152282715,0.06389713287353516,0.2573254108428955,0.25624847412109375,0.15274500846862793,1.4514250755310059,1.345475435256958 +8,refs/remotes/origin/pull/101,6fceb69a6af56b3ccf80b333b25f884a20ef224e,62e6242804e4167f5c476ae34acc784009a1af0f,9a0d208129c66ce13e90edb9765e3ba3684d7b80,,True,True,a86ef3da5c32de2e3b8da7f9fbdede66282481f54c61b66a51d37831045e3118,Tests_passed,8518d304966701bf30996be17b0430c6da27b4ae062d0f0847b09dd30bda240d,Tests_passed,True,True,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,fb9bac3e2e1303ef046f35ec431fa4bfe11e4dfd950eb069607633f631bb2f0d,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,fb9bac3e2e1303ef046f35ec431fa4bfe11e4dfd950eb069607633f631bb2f0d,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,1f4acab7d852d1df2021d27455f3ddc9fb9a23e62ece721b6f1149d2f9efdc35,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,71d07e94523658af8519f33271423dc610a4f0a93b90d22c817f338e1055168c,Merge_failed,71d07e94523658af8519f33271423dc610a4f0a93b90d22c817f338e1055168c,Merge_failed,cbbce31659829ca4eee79a747b67e122babf0ce8e2b3a94a7d36b082aba114ef,Merge_failed,37fc1da6794fa3ad3fc52f3d83e466065669b99eec149838529a320911449527,Merge_failed,08384497073f7555589a741d7a0f1b1a2bc2c5143e7c706b4548afb8457db29f,0.043224334716796875,0.04328656196594238,0.05259299278259277,0.052694082260131836,0.052680015563964844,0.05230832099914551,0.0525975227355957,0.11643195152282715,0.06389713287353516,0.256439208984375,0.25684309005737305,0.15274500846862793,1.4514250755310059,1.345475435256958 diff --git a/results/combined/merges_timed/apache/roller.csv b/results/combined/merges_timed/apache/roller.csv index 619480e894..8a4aa6aa7f 100644 --- a/results/combined/merges_timed/apache/roller.csv +++ b/results/combined/merges_timed/apache/roller.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -93,refs/heads/master,4e955ce4618ef1484eaeb42e5aa42650f5abc616,ed48b479acea0fbee79c5ac1fcc0380d150cd06d,d456d54200e7c747ef0312ca190c2a15433b6b3d,,True,True,f74899072cafc24f821746c0aa5ed3980e86333f30290af9ca8bb204ac9469b8,Tests_passed,9bcfedea1bd9dacee52ea37b0461cac41da9dbff90ed51947b1035988fc61c4b,Tests_passed,True,True,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,d9a4b57c9b8a24e529821351a33b089685ae929086e1c76e7e726e0464a47780,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,a98c310e3ea146c021fc18308e40192893542aab049bfd3f113a529f31e93e1f,Merge_failed,a98c310e3ea146c021fc18308e40192893542aab049bfd3f113a529f31e93e1f,Merge_failed,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,8349cc1020073a479dfde08dbae7aae4d3cfc8c34ed86f307c3ebe713eda7fd5,Merge_failed,1a92293bfb4ef9fbc3cc3f11d72353081af158bafecd909109ecec864a08b078,0.085540771484375,0.08616828918457031,0.15108203887939453,0.1514887809753418,0.1502377986907959,0.15017032623291016,0.14823031425476074,0.25634098052978516,0.19559621810913086,0.23876667022705078,0.2496814727783203,0.2529897689819336,0.7700095176696777,0.6889259815216064 +93,refs/heads/master,4e955ce4618ef1484eaeb42e5aa42650f5abc616,ed48b479acea0fbee79c5ac1fcc0380d150cd06d,d456d54200e7c747ef0312ca190c2a15433b6b3d,,True,True,f74899072cafc24f821746c0aa5ed3980e86333f30290af9ca8bb204ac9469b8,Tests_passed,9bcfedea1bd9dacee52ea37b0461cac41da9dbff90ed51947b1035988fc61c4b,Tests_passed,True,True,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,d9a4b57c9b8a24e529821351a33b089685ae929086e1c76e7e726e0464a47780,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,a98c310e3ea146c021fc18308e40192893542aab049bfd3f113a529f31e93e1f,Merge_failed,a98c310e3ea146c021fc18308e40192893542aab049bfd3f113a529f31e93e1f,Merge_failed,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,8349cc1020073a479dfde08dbae7aae4d3cfc8c34ed86f307c3ebe713eda7fd5,Merge_failed,1a92293bfb4ef9fbc3cc3f11d72353081af158bafecd909109ecec864a08b078,0.085540771484375,0.08616828918457031,0.15108203887939453,0.1514887809753418,0.1502377986907959,0.15017032623291016,0.14823031425476074,0.25634098052978516,0.19559621810913086,0.23808026313781738,0.2371203899383545,0.2529897689819336,0.7700095176696777,0.6889259815216064 diff --git a/results/combined/merges_timed/apache/shiro.csv b/results/combined/merges_timed/apache/shiro.csv index ca548495f2..f62623c959 100644 --- a/results/combined/merges_timed/apache/shiro.csv +++ b/results/combined/merges_timed/apache/shiro.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,Tests_passed,True,True,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,0.06206202507019043,0.04825615882873535,0.06627464294433594,0.06613874435424805,0.06657147407531738,0.06125378608703613,0.06211209297180176,0.16224884986877441,0.05630850791931152,0.17105388641357422,0.17084097862243652,0.12031435966491699,0.795459508895874,0.3329942226409912 +439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,Tests_passed,True,True,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,0.06206202507019043,0.04825615882873535,0.06627464294433594,0.06613874435424805,0.06657147407531738,0.06125378608703613,0.06211209297180176,0.16224884986877441,0.05630850791931152,0.16827678680419922,0.16873383522033691,0.12031435966491699,0.795459508895874,0.3329942226409912 diff --git a/results/combined/merges_timed/apache/tomcat-maven-plugin.csv b/results/combined/merges_timed/apache/tomcat-maven-plugin.csv index 3833249820..c4b5797369 100644 --- a/results/combined/merges_timed/apache/tomcat-maven-plugin.csv +++ b/results/combined/merges_timed/apache/tomcat-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,Tests_passed,True,True,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,0.04308342933654785,0.043390512466430664,0.05500459671020508,0.05586647987365723,0.05513334274291992,0.05595898628234863,0.05487871170043945,0.10307192802429199,0.04319477081298828,0.3303372859954834,0.35357069969177246,0.15503835678100586,2.104686975479126,0.2927074432373047 +4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,Tests_passed,True,True,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,0.04308342933654785,0.043390512466430664,0.05500459671020508,0.05586647987365723,0.05513334274291992,0.05595898628234863,0.05487871170043945,0.10307192802429199,0.04319477081298828,0.34964632987976074,0.35091614723205566,0.15503835678100586,2.104686975479126,0.2927074432373047 diff --git a/results/combined/merges_timed/appendium/flatpack.csv b/results/combined/merges_timed/appendium/flatpack.csv index b3b0abd1f9..dcf3a0ae36 100644 --- a/results/combined/merges_timed/appendium/flatpack.csv +++ b/results/combined/merges_timed/appendium/flatpack.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/master,5e09875d97db7038e3ba6af9468f5313d99b0082,4958463e5a0d1008a43fa9e44b8b4e653ca9c719,b9c4bd89e021b980bbb4809d0a7749ab4d12001f,,True,True,8e935556279de81bdfb886820671c62a430cc8c315cead24cc588765449921ac,Tests_passed,101ca456068e58cebf4d2543931c88e218c292ee4e8550ae9d87c8cac4b85558,Tests_passed,True,True,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,0.011675596237182617,0.011746644973754883,0.04848337173461914,0.04585409164428711,0.010799646377563477,0.04702186584472656,0.011513948440551758,0.08601665496826172,0.04746270179748535,0.21724224090576172,0.21922039985656738,0.10047125816345215,1.2385060787200928,0.23341798782348633 +21,refs/heads/master,5e09875d97db7038e3ba6af9468f5313d99b0082,4958463e5a0d1008a43fa9e44b8b4e653ca9c719,b9c4bd89e021b980bbb4809d0a7749ab4d12001f,,True,True,8e935556279de81bdfb886820671c62a430cc8c315cead24cc588765449921ac,Tests_passed,101ca456068e58cebf4d2543931c88e218c292ee4e8550ae9d87c8cac4b85558,Tests_passed,True,True,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,0.011675596237182617,0.011746644973754883,0.04848337173461914,0.04585409164428711,0.010799646377563477,0.04702186584472656,0.011513948440551758,0.08601665496826172,0.04746270179748535,0.21593403816223145,0.21619510650634766,0.10047125816345215,1.2385060787200928,0.23341798782348633 diff --git a/results/combined/merges_timed/appstatus/appstatus.csv b/results/combined/merges_timed/appstatus/appstatus.csv index 8c9df8fe50..d4febfec44 100644 --- a/results/combined/merges_timed/appstatus/appstatus.csv +++ b/results/combined/merges_timed/appstatus/appstatus.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -70,refs/heads/master,c76bf77dfdbd3f235a7ab6dc304504a19e0947ae,b5f911a83e5319df2ff47603d24ab84b5c1cd930,08282fb20f2be3845592118435b9ae6f750ba2c4,,True,True,0068eb6e8c396c3450fe57ff8866d29d5db0b689e6cbd8b31b007f9fdcf3cd84,Tests_passed,565af7ec27ba0172cfe94036b85cff7412f1e8a005516deb3094b8af9590442a,Tests_passed,True,True,Merge_failed,8c7cf82ed22174c5f2bc138145a98877a8abf0502843618457965bd3ff50ce8b,Merge_failed,bc0380beae46cb3f65763c24220d1eeb08cc31377b62a39f65b1169208596dad,Merge_failed,60891c4e953a416a7cc6b96e0be9b0ffe805455ac63da8fe4f993cbe008672cb,Merge_failed,0c1ef40ba8aa86fe916952924f75d638ae711cc2b8970695a9e392cb3a26a69c,Merge_failed,979c1d855e985b06ae84528c3c5598e5d94609e5ec9fd79deddcc29f6ab8e038,Merge_failed,979c1d855e985b06ae84528c3c5598e5d94609e5ec9fd79deddcc29f6ab8e038,Merge_failed,704d0dad2f668e474d17f09d2d448b3f76534037c5f69dfab74b6246b4ae75b7,Merge_failed,182afe6d45219d8322a4756d149a84b6c67948b7209aaa311bc37655688562ee,Merge_failed,8c7cf82ed22174c5f2bc138145a98877a8abf0502843618457965bd3ff50ce8b,Merge_failed,92dbb2516ec7433627b36d1d3ad21f00515ae109171b5decf150829685572106,Merge_failed,92dbb2516ec7433627b36d1d3ad21f00515ae109171b5decf150829685572106,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,b6be2f65453bfd1f1b96f17e65e75a2e6315f80399aa5aa0db2f977fecdc16f9,0.0669708251953125,0.05449390411376953,0.05269598960876465,0.06030845642089844,0.06444764137268066,0.0467219352722168,0.06419539451599121,0.43190956115722656,0.07024598121643066,0.64302659034729,0.6458878517150879,0.3472769260406494,3.497061014175415,0.3135077953338623 +70,refs/heads/master,c76bf77dfdbd3f235a7ab6dc304504a19e0947ae,b5f911a83e5319df2ff47603d24ab84b5c1cd930,08282fb20f2be3845592118435b9ae6f750ba2c4,,True,True,0068eb6e8c396c3450fe57ff8866d29d5db0b689e6cbd8b31b007f9fdcf3cd84,Tests_passed,565af7ec27ba0172cfe94036b85cff7412f1e8a005516deb3094b8af9590442a,Tests_passed,True,True,Merge_failed,8c7cf82ed22174c5f2bc138145a98877a8abf0502843618457965bd3ff50ce8b,Merge_failed,bc0380beae46cb3f65763c24220d1eeb08cc31377b62a39f65b1169208596dad,Merge_failed,60891c4e953a416a7cc6b96e0be9b0ffe805455ac63da8fe4f993cbe008672cb,Merge_failed,0c1ef40ba8aa86fe916952924f75d638ae711cc2b8970695a9e392cb3a26a69c,Merge_failed,979c1d855e985b06ae84528c3c5598e5d94609e5ec9fd79deddcc29f6ab8e038,Merge_failed,979c1d855e985b06ae84528c3c5598e5d94609e5ec9fd79deddcc29f6ab8e038,Merge_failed,704d0dad2f668e474d17f09d2d448b3f76534037c5f69dfab74b6246b4ae75b7,Merge_failed,182afe6d45219d8322a4756d149a84b6c67948b7209aaa311bc37655688562ee,Merge_failed,8c7cf82ed22174c5f2bc138145a98877a8abf0502843618457965bd3ff50ce8b,Merge_failed,92dbb2516ec7433627b36d1d3ad21f00515ae109171b5decf150829685572106,Merge_failed,92dbb2516ec7433627b36d1d3ad21f00515ae109171b5decf150829685572106,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,b6be2f65453bfd1f1b96f17e65e75a2e6315f80399aa5aa0db2f977fecdc16f9,0.0669708251953125,0.05449390411376953,0.05269598960876465,0.06030845642089844,0.06444764137268066,0.0467219352722168,0.06419539451599121,0.43190956115722656,0.07024598121643066,0.6525964736938477,0.6491661071777344,0.3472769260406494,3.497061014175415,0.3135077953338623 diff --git a/results/combined/merges_timed/arcbees/arcbees-archetypes.csv b/results/combined/merges_timed/arcbees/arcbees-archetypes.csv index 2b3642ddcf..602a8e5bff 100644 --- a/results/combined/merges_timed/arcbees/arcbees-archetypes.csv +++ b/results/combined/merges_timed/arcbees/arcbees-archetypes.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/master,084676165de5efceeb6002f5fef9ab28411531ea,a28fc80a9d07b9eeb2eae944f59478c949983df1,e39e7ff7e6e62409ea54d2e9b6f5b05c209d3ebe,,True,True,a92a1512f34dbf008ec12ced0cb44d2023b17e44fff1157adecc8c16e92ad0e2,Tests_passed,b36afc048802b58eb2bdafc8d28d8dee3ed0541678481f3a55a08d2573c14462,Tests_passed,True,True,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,0.02028942108154297,0.020314455032348633,0.03157997131347656,0.030567646026611328,0.02295207977294922,0.025414705276489258,0.03133535385131836,0.06444048881530762,0.020453691482543945,0.2891957759857178,0.2839810848236084,0.12803959846496582,0.6241278648376465,0.41602277755737305 +26,refs/heads/master,084676165de5efceeb6002f5fef9ab28411531ea,a28fc80a9d07b9eeb2eae944f59478c949983df1,e39e7ff7e6e62409ea54d2e9b6f5b05c209d3ebe,,True,True,a92a1512f34dbf008ec12ced0cb44d2023b17e44fff1157adecc8c16e92ad0e2,Tests_passed,b36afc048802b58eb2bdafc8d28d8dee3ed0541678481f3a55a08d2573c14462,Tests_passed,True,True,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,0.02028942108154297,0.020314455032348633,0.03157997131347656,0.030567646026611328,0.02295207977294922,0.025414705276489258,0.03133535385131836,0.06444048881530762,0.020453691482543945,0.28563523292541504,0.2835216522216797,0.12803959846496582,0.6241278648376465,0.41602277755737305 diff --git a/results/combined/merges_timed/arcbees/gwtchosen.csv b/results/combined/merges_timed/arcbees/gwtchosen.csv index b471579f09..ed87e8710a 100644 --- a/results/combined/merges_timed/arcbees/gwtchosen.csv +++ b/results/combined/merges_timed/arcbees/gwtchosen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -106,refs/heads/master,d5d56191cde632b6ce9f22b6853ca259916891ae,b59b3895a44f81599ae677d9844ba74307c9d976,ae85f4e58a75ad64e4d2b1634f151f153a2b9f77,,True,True,49a9f21dcee43a001f2555df84bfa40e6c854efa884329346627830df8eac79d,Tests_passed,7c15d3cc4a12da563d7905dc2e5378d38b82dd90fcb9b459ec1abbcb5cf78daf,Tests_passed,True,True,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,0.015401601791381836,0.015916109085083008,0.017220735549926758,0.017998218536376953,0.017483949661254883,0.017423391342163086,0.01749277114868164,0.04494524002075195,0.014994621276855469,0.1919543743133545,0.19531011581420898,0.0709989070892334,0.01885056495666504,0.19416475296020508 +106,refs/heads/master,d5d56191cde632b6ce9f22b6853ca259916891ae,b59b3895a44f81599ae677d9844ba74307c9d976,ae85f4e58a75ad64e4d2b1634f151f153a2b9f77,,True,True,49a9f21dcee43a001f2555df84bfa40e6c854efa884329346627830df8eac79d,Tests_passed,7c15d3cc4a12da563d7905dc2e5378d38b82dd90fcb9b459ec1abbcb5cf78daf,Tests_passed,True,True,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,0.015401601791381836,0.015916109085083008,0.017220735549926758,0.017998218536376953,0.017483949661254883,0.017423391342163086,0.01749277114868164,0.04494524002075195,0.014994621276855469,0.1894068717956543,0.18955683708190918,0.0709989070892334,0.01885056495666504,0.19416475296020508 diff --git a/results/combined/merges_timed/arcbees/universal-analytics.csv b/results/combined/merges_timed/arcbees/universal-analytics.csv index b51afd4f86..620faa58c5 100644 --- a/results/combined/merges_timed/arcbees/universal-analytics.csv +++ b/results/combined/merges_timed/arcbees/universal-analytics.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,d4259d6249da0e00f06f46da5c68e12a89dc7f80,94a02010f5d77d4472e4a618af3c5d74da5207b6,6621d617e75f83815f297d2e734b4f6952d1615f,,True,True,c7ce74e29e8e7352afd4c31fc2bfd7c332d2dcb12d76e6e88acd8bbca83f67ac,Tests_passed,5ca1de52e35b6501158fe73bceb17c0364a2ef6981074eaad08286c416d28f17,Tests_passed,True,True,Merge_failed,a00d510b2af454ff7412bc68a86435429163ccbd1ca9a318f6877683e4628706,Merge_failed,a00d510b2af454ff7412bc68a86435429163ccbd1ca9a318f6877683e4628706,Merge_failed,de7aadf43c0f5d21ea2ed5aece7bc22a93df9f48e4b54530b87ffed43d6e756b,Merge_failed,f43e25822f822eba754834ba10f15c2d1c465fe4a2be2cc011df37293a2abd5d,Merge_failed,f43e25822f822eba754834ba10f15c2d1c465fe4a2be2cc011df37293a2abd5d,Merge_failed,f43e25822f822eba754834ba10f15c2d1c465fe4a2be2cc011df37293a2abd5d,Merge_failed,2787996033cfb31864b8c7cd80bdec0f8c3f1910d1d882227e8b6dae93ea7891,Merge_failed,362e2fc8e56585ddc8c9f782394a64a9fee67254f30f279f1593ce08fcabf1f3,Merge_failed,a00d510b2af454ff7412bc68a86435429163ccbd1ca9a318f6877683e4628706,Merge_failed,3ba1fe78ebd34728e3525c6710fba8f1a7b93523375b6c30e084856be78fb790,Merge_failed,3ba1fe78ebd34728e3525c6710fba8f1a7b93523375b6c30e084856be78fb790,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,1b8ed382758bb730d09b76f819445a82cd80d72729328375794ed0a453f3fb1f,0.038987159729003906,0.03702735900878906,0.04109454154968262,0.037982940673828125,0.043276071548461914,0.04789113998413086,0.046625375747680664,0.5518481731414795,0.11086177825927734,0.8286998271942139,0.8264973163604736,0.45903682708740234,3.4041261672973633,0.22311902046203613 +9,refs/heads/master,d4259d6249da0e00f06f46da5c68e12a89dc7f80,94a02010f5d77d4472e4a618af3c5d74da5207b6,6621d617e75f83815f297d2e734b4f6952d1615f,,True,True,c7ce74e29e8e7352afd4c31fc2bfd7c332d2dcb12d76e6e88acd8bbca83f67ac,Tests_passed,5ca1de52e35b6501158fe73bceb17c0364a2ef6981074eaad08286c416d28f17,Tests_passed,True,True,Merge_failed,a00d510b2af454ff7412bc68a86435429163ccbd1ca9a318f6877683e4628706,Merge_failed,a00d510b2af454ff7412bc68a86435429163ccbd1ca9a318f6877683e4628706,Merge_failed,de7aadf43c0f5d21ea2ed5aece7bc22a93df9f48e4b54530b87ffed43d6e756b,Merge_failed,f43e25822f822eba754834ba10f15c2d1c465fe4a2be2cc011df37293a2abd5d,Merge_failed,f43e25822f822eba754834ba10f15c2d1c465fe4a2be2cc011df37293a2abd5d,Merge_failed,f43e25822f822eba754834ba10f15c2d1c465fe4a2be2cc011df37293a2abd5d,Merge_failed,2787996033cfb31864b8c7cd80bdec0f8c3f1910d1d882227e8b6dae93ea7891,Merge_failed,362e2fc8e56585ddc8c9f782394a64a9fee67254f30f279f1593ce08fcabf1f3,Merge_failed,a00d510b2af454ff7412bc68a86435429163ccbd1ca9a318f6877683e4628706,Merge_failed,3ba1fe78ebd34728e3525c6710fba8f1a7b93523375b6c30e084856be78fb790,Merge_failed,3ba1fe78ebd34728e3525c6710fba8f1a7b93523375b6c30e084856be78fb790,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,1b8ed382758bb730d09b76f819445a82cd80d72729328375794ed0a453f3fb1f,0.038987159729003906,0.03702735900878906,0.04109454154968262,0.037982940673828125,0.043276071548461914,0.04789113998413086,0.046625375747680664,0.5518481731414795,0.11086177825927734,0.8240244388580322,0.820589542388916,0.45903682708740234,3.4041261672973633,0.22311902046203613 diff --git a/results/combined/merges_timed/ardesco/selenium-standalone-server-plugin.csv b/results/combined/merges_timed/ardesco/selenium-standalone-server-plugin.csv index 17857c7f79..fb54e78bbb 100644 --- a/results/combined/merges_timed/ardesco/selenium-standalone-server-plugin.csv +++ b/results/combined/merges_timed/ardesco/selenium-standalone-server-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,957d978135279c122dcfaf9d72ed5a89f487b0ae,2fbb7e4f756f0288d11b2cf4bf2ca6e25cbafc07,c14176511dd6db04b8b175f5c3cb30abd9929449,,True,True,33de56f17f9a862cf5be309b20f7dac23da7a8121ac3bd88510a53417b0391d7,Tests_passed,506a90dc93cd6f4f00ce7df0c39bee07cb8eb9a14f493a3c3e0a1036a900fb56,Tests_passed,True,True,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,9851f5b1e8a39aa126a579557b022b04931ddd9d4f7a859002a56f0f2ccf913d,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,154d4c3d033b95ca8ccd8d24b428e0aa9f2d82a0548446ebbe2a759120442e34,Merge_failed,154d4c3d033b95ca8ccd8d24b428e0aa9f2d82a0548446ebbe2a759120442e34,Merge_failed,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,673377ed588ca1778189c5e347c0cd48242902be5aa73156c70fcc23060f3f6e,0.04118752479553223,0.039116859436035156,0.05435538291931152,0.03207087516784668,0.04249978065490723,0.05347084999084473,0.03549695014953613,0.2882046699523926,0.062077999114990234,0.1233985424041748,0.12370014190673828,0.23501873016357422,1.321315050125122,0.21292400360107422 +3,refs/heads/master,957d978135279c122dcfaf9d72ed5a89f487b0ae,2fbb7e4f756f0288d11b2cf4bf2ca6e25cbafc07,c14176511dd6db04b8b175f5c3cb30abd9929449,,True,True,33de56f17f9a862cf5be309b20f7dac23da7a8121ac3bd88510a53417b0391d7,Tests_passed,506a90dc93cd6f4f00ce7df0c39bee07cb8eb9a14f493a3c3e0a1036a900fb56,Tests_passed,True,True,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,9851f5b1e8a39aa126a579557b022b04931ddd9d4f7a859002a56f0f2ccf913d,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,154d4c3d033b95ca8ccd8d24b428e0aa9f2d82a0548446ebbe2a759120442e34,Merge_failed,154d4c3d033b95ca8ccd8d24b428e0aa9f2d82a0548446ebbe2a759120442e34,Merge_failed,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,673377ed588ca1778189c5e347c0cd48242902be5aa73156c70fcc23060f3f6e,0.04118752479553223,0.039116859436035156,0.05435538291931152,0.03207087516784668,0.04249978065490723,0.05347084999084473,0.03549695014953613,0.2882046699523926,0.062077999114990234,0.12335634231567383,0.1257491111755371,0.23501873016357422,1.321315050125122,0.21292400360107422 diff --git a/results/combined/merges_timed/arimus/jmimemagic.csv b/results/combined/merges_timed/arimus/jmimemagic.csv index 2e18abfc5d..b4a2780dc4 100644 --- a/results/combined/merges_timed/arimus/jmimemagic.csv +++ b/results/combined/merges_timed/arimus/jmimemagic.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,c543655186711a1c141e3af8201ed0f45666dd5a,2f3cb6d930b665edfe70f06eeb03e76cc869bbe1,d2bad1e68bc2871c21c3baa67ac54f88aa7ab4f6,,True,True,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,True,True,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,5acb27313bed518666b923d520ee37d4ff30861f64d6730cb3558ce8ca7e7d0b,Merge_failed,5acb27313bed518666b923d520ee37d4ff30861f64d6730cb3558ce8ca7e7d0b,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,5e5944c26bd6f5f9e04267bd0725070a81060db8c1c2cc268fa7813fc73d2233,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,0.02512812614440918,0.01781487464904785,0.022598743438720703,0.026543855667114258,0.026401758193969727,0.023956775665283203,0.026828289031982422,0.12181258201599121,0.02084827423095703,0.16989517211914062,0.17088961601257324,0.10940170288085938,1.1330008506774902,0.18768930435180664 +5,refs/heads/master,c543655186711a1c141e3af8201ed0f45666dd5a,2f3cb6d930b665edfe70f06eeb03e76cc869bbe1,d2bad1e68bc2871c21c3baa67ac54f88aa7ab4f6,,True,True,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,True,True,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,5acb27313bed518666b923d520ee37d4ff30861f64d6730cb3558ce8ca7e7d0b,Merge_failed,5acb27313bed518666b923d520ee37d4ff30861f64d6730cb3558ce8ca7e7d0b,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,5e5944c26bd6f5f9e04267bd0725070a81060db8c1c2cc268fa7813fc73d2233,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,0.02512812614440918,0.01781487464904785,0.022598743438720703,0.026543855667114258,0.026401758193969727,0.023956775665283203,0.026828289031982422,0.12181258201599121,0.02084827423095703,0.16650176048278809,0.16849303245544434,0.10940170288085938,1.1330008506774902,0.18768930435180664 diff --git a/results/combined/merges_timed/arnim/hdp.csv b/results/combined/merges_timed/arnim/hdp.csv index b5ed458ea8..be29873346 100644 --- a/results/combined/merges_timed/arnim/hdp.csv +++ b/results/combined/merges_timed/arnim/hdp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,57e634d310aa6445d6b27e3262801d235a809357,d47b8c4e62b612f326f1b31c4c0db125b6597622,ea7bd11d56e0b1869ec861ecb011fa7fa309f84b,,7c8982c3e9b5f2cc621b9e64dc0a27347185b827460129b4525347fcd5cc3d6e,Tests_passed,d8919e0a2d04c70dc26597739bc83021437dfba63ff751fd79589df88da8ccb0,Tests_passed,True,True,True,True,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Tests_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Tests_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,0.038593292236328125,0.038393259048461914,0.04069232940673828,0.015495061874389648,0.039173126220703125,0.04268193244934082,0.04114842414855957,0.16840457916259766,0.050101518630981445,0.006257295608520508,0.00643467903137207,0.04257822036743164,0.03862118721008301,0.19488859176635742 +1,refs/heads/master,57e634d310aa6445d6b27e3262801d235a809357,d47b8c4e62b612f326f1b31c4c0db125b6597622,ea7bd11d56e0b1869ec861ecb011fa7fa309f84b,,7c8982c3e9b5f2cc621b9e64dc0a27347185b827460129b4525347fcd5cc3d6e,Tests_passed,d8919e0a2d04c70dc26597739bc83021437dfba63ff751fd79589df88da8ccb0,Tests_passed,True,True,True,True,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Tests_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Tests_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,0.038593292236328125,0.038393259048461914,0.04069232940673828,0.015495061874389648,0.039173126220703125,0.04268193244934082,0.04114842414855957,0.16840457916259766,0.050101518630981445,0.005794525146484375,0.0057642459869384766,0.04257822036743164,0.03862118721008301,0.19488859176635742 diff --git a/results/combined/merges_timed/arnobroekhof/kafka-http-metrics-reporter.csv b/results/combined/merges_timed/arnobroekhof/kafka-http-metrics-reporter.csv index 384d85d3ff..f6809c0e4e 100644 --- a/results/combined/merges_timed/arnobroekhof/kafka-http-metrics-reporter.csv +++ b/results/combined/merges_timed/arnobroekhof/kafka-http-metrics-reporter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,2def1e280114d209ed8a7314a8b236051b4c503b,85631073f159e2f624955db081c5759e6822c6ef,2371e6119d531a6405d6e89d7ec78a2aa4012365,,True,True,df8c858ac71d05013d16bd16d82d10b3256166785586b6b22044608f55e9ff37,Tests_passed,03d8896cd387655bbc4eda5c37ad6f8305487eef241542fb3a87ee7f938714db,Tests_passed,True,True,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,fbf0086d8d826d660e093639659cae4748f177781a8868c16b3c64bd7c39c5f2,Merge_failed,39f730c5f64333a92dcf2e502c274e8be4b14980d5933dd854523c56ad2805f2,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,86fbd610cb6357a0dbc76f4837a50fa62aae6345128f1ddd6d92c7e1056c9b0f,Merge_failed,86fbd610cb6357a0dbc76f4837a50fa62aae6345128f1ddd6d92c7e1056c9b0f,Merge_failed,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,6dcc8b0b29f434e5b85dffdd40538917c2fe0084288ad7b0f04964746938215d,Merge_failed,d0cd89544354f20cce3a5b73b5d30f7bfb7d6d0c6f0828e0dd37185180c92d6a,0.04127216339111328,0.04114794731140137,0.009686946868896484,0.0388035774230957,0.03345441818237305,0.038841962814331055,0.03975033760070801,0.3564941883087158,0.10173964500427246,0.19841980934143066,0.19852852821350098,0.31229376792907715,1.3407800197601318,0.19933295249938965 +3,refs/heads/master,2def1e280114d209ed8a7314a8b236051b4c503b,85631073f159e2f624955db081c5759e6822c6ef,2371e6119d531a6405d6e89d7ec78a2aa4012365,,True,True,df8c858ac71d05013d16bd16d82d10b3256166785586b6b22044608f55e9ff37,Tests_passed,03d8896cd387655bbc4eda5c37ad6f8305487eef241542fb3a87ee7f938714db,Tests_passed,True,True,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,fbf0086d8d826d660e093639659cae4748f177781a8868c16b3c64bd7c39c5f2,Merge_failed,39f730c5f64333a92dcf2e502c274e8be4b14980d5933dd854523c56ad2805f2,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,86fbd610cb6357a0dbc76f4837a50fa62aae6345128f1ddd6d92c7e1056c9b0f,Merge_failed,86fbd610cb6357a0dbc76f4837a50fa62aae6345128f1ddd6d92c7e1056c9b0f,Merge_failed,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,6dcc8b0b29f434e5b85dffdd40538917c2fe0084288ad7b0f04964746938215d,Merge_failed,d0cd89544354f20cce3a5b73b5d30f7bfb7d6d0c6f0828e0dd37185180c92d6a,0.04127216339111328,0.04114794731140137,0.009686946868896484,0.0388035774230957,0.03345441818237305,0.038841962814331055,0.03975033760070801,0.3564941883087158,0.10173964500427246,0.19939064979553223,0.19913291931152344,0.31229376792907715,1.3407800197601318,0.19933295249938965 diff --git a/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv b/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv index 3163653001..5bd5ce2c99 100644 --- a/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv +++ b/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/remotes/origin/pull/87,39bdbff77e89dc772b812683a19a55b7db9ecb6a,38a562379eb854cc31391e754cf0e793fdf8e35a,e9c27acf0fa7891a0fa7b833da552ee7724ad8b1,,True,True,de037d51ccfab8fd713240f1e405e9e0a45b3138f5d859d1519f61536bec14a2,Tests_passed,147af071ad6577bb1dd648880354c0ac645fd3ddfbedd1d03c602bf83635e014,Tests_passed,True,True,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,0.011631011962890625,0.011912107467651367,0.012829780578613281,0.012415885925292969,0.012661457061767578,0.012714624404907227,0.01272439956665039,0.038477420806884766,0.012547492980957031,0.16421079635620117,0.16266322135925293,0.06759476661682129,0.8417479991912842,0.18969035148620605 +18,refs/remotes/origin/pull/87,39bdbff77e89dc772b812683a19a55b7db9ecb6a,38a562379eb854cc31391e754cf0e793fdf8e35a,e9c27acf0fa7891a0fa7b833da552ee7724ad8b1,,True,True,de037d51ccfab8fd713240f1e405e9e0a45b3138f5d859d1519f61536bec14a2,Tests_passed,147af071ad6577bb1dd648880354c0ac645fd3ddfbedd1d03c602bf83635e014,Tests_passed,True,True,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,0.011631011962890625,0.011912107467651367,0.012829780578613281,0.012415885925292969,0.012661457061767578,0.012714624404907227,0.01272439956665039,0.038477420806884766,0.012547492980957031,0.15558910369873047,0.15590572357177734,0.06759476661682129,0.8417479991912842,0.18969035148620605 diff --git a/results/combined/merges_timed/arturmkrtchyan/iban4j.csv b/results/combined/merges_timed/arturmkrtchyan/iban4j.csv index 4cf62a02db..b9449e1fa7 100644 --- a/results/combined/merges_timed/arturmkrtchyan/iban4j.csv +++ b/results/combined/merges_timed/arturmkrtchyan/iban4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,ee807e0a05fc291337dc0b8d5753265f55fed104,9de45a0291792726c86b1d8b843fa6b2fc7fb4f7,d1d3aa59e50447b135594902ef80877e5c852373,,837a88b28f3967640d98a8a0aae019b256ec3aa12d8fef9c8745705e601a3c49,Tests_passed,2d0cbf9c6e73e33221c0a8342ccd3d5d38fa77dca15f10e2fec8590fd7f49006,Tests_passed,True,True,True,True,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,659bfc18ae37beba1af846319ffa59e9e5bc417c11d86f00b5d81a87d47813a8,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,85c3064c35e2f75400142261b1037d575991e803f626e1113b7b709159755ad8,Merge_failed,85c3064c35e2f75400142261b1037d575991e803f626e1113b7b709159755ad8,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Merge_failed,ba8606e5bdd328fa4b40f3800dbf136c82fcdb16cfa6664ff0b1fe69a543fee8,0.04063677787780762,0.043109893798828125,0.03419017791748047,0.03739333152770996,0.046146392822265625,0.03522968292236328,0.0422213077545166,0.17344331741333008,0.07325077056884766,0.07465863227844238,0.07490181922912598,0.12125778198242188,0.9867944717407227,0.18837308883666992 +15,refs/heads/master,ee807e0a05fc291337dc0b8d5753265f55fed104,9de45a0291792726c86b1d8b843fa6b2fc7fb4f7,d1d3aa59e50447b135594902ef80877e5c852373,,837a88b28f3967640d98a8a0aae019b256ec3aa12d8fef9c8745705e601a3c49,Tests_passed,2d0cbf9c6e73e33221c0a8342ccd3d5d38fa77dca15f10e2fec8590fd7f49006,Tests_passed,True,True,True,True,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,659bfc18ae37beba1af846319ffa59e9e5bc417c11d86f00b5d81a87d47813a8,Merge_failed,dc10a9e56e495bb9b17c4b115b8d6ca38b0caab4cb6f14ca1faa836d04122b20,Merge_failed,85c3064c35e2f75400142261b1037d575991e803f626e1113b7b709159755ad8,Merge_failed,85c3064c35e2f75400142261b1037d575991e803f626e1113b7b709159755ad8,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Merge_failed,ba8606e5bdd328fa4b40f3800dbf136c82fcdb16cfa6664ff0b1fe69a543fee8,0.04063677787780762,0.043109893798828125,0.03419017791748047,0.03739333152770996,0.046146392822265625,0.03522968292236328,0.0422213077545166,0.17344331741333008,0.07325077056884766,0.0746455192565918,0.07505679130554199,0.12125778198242188,0.9867944717407227,0.18837308883666992 diff --git a/results/combined/merges_timed/asciidoctor/asciidoclet.csv b/results/combined/merges_timed/asciidoctor/asciidoclet.csv index 1c3f363ca6..eb85456923 100644 --- a/results/combined/merges_timed/asciidoctor/asciidoclet.csv +++ b/results/combined/merges_timed/asciidoctor/asciidoclet.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/master,e31ec7a8acded7cc6ed731a391ddaf86d13329da,4b279a4f9b5f6719ef1d99014d6967eb460488e5,06a32ee38abd15691f802949c797e428c8b9f07b,,True,True,c9f483e06f2176eda62d75ac4205364a082fcfaa36665f886377fc3ed3e7670a,Tests_passed,4aced6fc18d4fe0f7ec8e17b133463eb7d37f8a8f8912c5d285b1b30973d2dd3,Tests_passed,True,True,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,cc4c9076a0a1c22a313d2687b73140cbe8b294f9bd7aaca404dbe4e22a687cca,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,4b17dc8c317482c6f05ee933ab3291509f16890d2a6a82814159a58f6d26eac9,Merge_failed,0b4298d5f78b6e5df813dfbc495477e8d95aabdbd1fba5745f5a3439cfe55e04,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Merge_failed,a7bc1e2162827a2eba35d76037e36e86c61cee9dc64a9f46c70720a642058df7,0.03784441947937012,0.03348207473754883,0.03914976119995117,0.04185056686401367,0.04182934761047363,0.036245107650756836,0.010811805725097656,0.33919525146484375,0.0551910400390625,0.06488323211669922,0.06513214111328125,0.27611827850341797,0.6074743270874023,0.18255901336669922 +21,refs/heads/master,e31ec7a8acded7cc6ed731a391ddaf86d13329da,4b279a4f9b5f6719ef1d99014d6967eb460488e5,06a32ee38abd15691f802949c797e428c8b9f07b,,True,True,c9f483e06f2176eda62d75ac4205364a082fcfaa36665f886377fc3ed3e7670a,Tests_passed,4aced6fc18d4fe0f7ec8e17b133463eb7d37f8a8f8912c5d285b1b30973d2dd3,Tests_passed,True,True,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,cc4c9076a0a1c22a313d2687b73140cbe8b294f9bd7aaca404dbe4e22a687cca,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,4b17dc8c317482c6f05ee933ab3291509f16890d2a6a82814159a58f6d26eac9,Merge_failed,0b4298d5f78b6e5df813dfbc495477e8d95aabdbd1fba5745f5a3439cfe55e04,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Merge_failed,a7bc1e2162827a2eba35d76037e36e86c61cee9dc64a9f46c70720a642058df7,0.03784441947937012,0.03348207473754883,0.03914976119995117,0.04185056686401367,0.04182934761047363,0.036245107650756836,0.010811805725097656,0.33919525146484375,0.0551910400390625,0.0653526782989502,0.06462264060974121,0.27611827850341797,0.6074743270874023,0.18255901336669922 diff --git a/results/combined/merges_timed/aseldawy/spatialhadoop2.csv b/results/combined/merges_timed/aseldawy/spatialhadoop2.csv index 5f779b3583..e0cdb2eb55 100644 --- a/results/combined/merges_timed/aseldawy/spatialhadoop2.csv +++ b/results/combined/merges_timed/aseldawy/spatialhadoop2.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,833f69b3184bfb8781abcacc04859fd8dbb01b0e,24b3b64b0443ce6d49e50ecd52934bddeee319b0,3d060e0c3804c23128a917d51d96876350d203b1,,c92c2e0ffa0f0406331b6b4a7961cbf22ff143475c269aa9dbb022d0a8fc8cb7,Tests_passed,211649ad60b8a7b8ac004a571c67878435aa06379fbeed486874381cfe936cab,Tests_passed,True,True,True,True,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,0.044953107833862305,0.047120094299316406,0.040642738342285156,0.04626178741455078,0.042936086654663086,0.05080223083496094,0.04475045204162598,0.22522401809692383,0.04680013656616211,0.35966038703918457,0.3204681873321533,0.1623845100402832,1.593639612197876,0.23994040489196777 +1,refs/heads/master,833f69b3184bfb8781abcacc04859fd8dbb01b0e,24b3b64b0443ce6d49e50ecd52934bddeee319b0,3d060e0c3804c23128a917d51d96876350d203b1,,c92c2e0ffa0f0406331b6b4a7961cbf22ff143475c269aa9dbb022d0a8fc8cb7,Tests_passed,211649ad60b8a7b8ac004a571c67878435aa06379fbeed486874381cfe936cab,Tests_passed,True,True,True,True,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,0.044953107833862305,0.047120094299316406,0.040642738342285156,0.04626178741455078,0.042936086654663086,0.05080223083496094,0.04475045204162598,0.22522401809692383,0.04680013656616211,0.3164031505584717,0.31932926177978516,0.1623845100402832,1.593639612197876,0.23994040489196777 diff --git a/results/combined/merges_timed/astefanutti/metrics-cdi.csv b/results/combined/merges_timed/astefanutti/metrics-cdi.csv index 7f7cb2a7dc..994fb5b9ce 100644 --- a/results/combined/merges_timed/astefanutti/metrics-cdi.csv +++ b/results/combined/merges_timed/astefanutti/metrics-cdi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,e3afc46398a8f613fbf841984a64a838d7b7898e,29e7bac497513de420543497612180331cc5d1b3,1def8a8aa23211109f40b06e979c0f64045e0bd5,,True,True,ab773b5fd6bfa9d866a6f39016487e6dbed2e3793b9df7cd9d882b17165985aa,Tests_passed,b1c2545045a10b07384a65323023f020131d2b0c1c5cbdd77e843fb473e1637d,Tests_passed,True,True,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,0.04180645942687988,0.059825897216796875,0.04744386672973633,0.05860471725463867,0.06501960754394531,0.06337761878967285,0.07181572914123535,0.45502281188964844,0.04956936836242676,0.8714108467102051,0.87518310546875,0.37776827812194824,3.3867087364196777,0.27547645568847656 +2,refs/heads/master,e3afc46398a8f613fbf841984a64a838d7b7898e,29e7bac497513de420543497612180331cc5d1b3,1def8a8aa23211109f40b06e979c0f64045e0bd5,,True,True,ab773b5fd6bfa9d866a6f39016487e6dbed2e3793b9df7cd9d882b17165985aa,Tests_passed,b1c2545045a10b07384a65323023f020131d2b0c1c5cbdd77e843fb473e1637d,Tests_passed,True,True,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,0.04180645942687988,0.059825897216796875,0.04744386672973633,0.05860471725463867,0.06501960754394531,0.06337761878967285,0.07181572914123535,0.45502281188964844,0.04956936836242676,0.864269495010376,0.8634593486785889,0.37776827812194824,3.3867087364196777,0.27547645568847656 diff --git a/results/combined/merges_timed/astrapi69/jaulp.wicket.csv b/results/combined/merges_timed/astrapi69/jaulp.wicket.csv index f21887a20a..0811b114c4 100644 --- a/results/combined/merges_timed/astrapi69/jaulp.wicket.csv +++ b/results/combined/merges_timed/astrapi69/jaulp.wicket.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -22,refs/heads/develop,f4a6f0e81a16add0005c7da1bc9ccc3188b974d5,b17cf26ca146d4d8eacaadc21b3f314ab1bbf488,ad14308fa5ce7ae64e07a37e30d973da77999c40,,True,True,03679928af45d3cf429d0873a6c95e2f4e51195d4b0cac1ddae51a1e97581b66,Tests_passed,1c8f1af1715d3c95e0720e8dc3c09fd3f28985c6d6b378d2be39be54d32244a0,Tests_passed,True,True,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,c3851ca11310d3269122952fc56e111b789dd6fa909b6eb58a8afcaf5a981e21,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8214e2ab5d2b4fc3577cf655eb8768ed66f08abf64bbf166e5d3bf53fc8a2a45,Merge_failed,90713b9e25bc452f1db4c75bb315af057163e7cdbb8eb32ccf4564dfcbdbb191,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,213c7d6609b3925ae62a5f20196367e1aa13415a1134949143c95b0f528e236c,Merge_failed,3353c85dfd422601c5fbb94dc3cd1e3a20aa5858a937ebfe7f416238ea1fa314,0.02112412452697754,0.02150273323059082,0.023558616638183594,0.02362370491027832,0.023669004440307617,0.0240323543548584,0.0181124210357666,0.17221760749816895,0.06740093231201172,0.16076970100402832,0.17011094093322754,0.5193483829498291,0.5598175525665283,0.29148292541503906 +22,refs/heads/develop,f4a6f0e81a16add0005c7da1bc9ccc3188b974d5,b17cf26ca146d4d8eacaadc21b3f314ab1bbf488,ad14308fa5ce7ae64e07a37e30d973da77999c40,,True,True,03679928af45d3cf429d0873a6c95e2f4e51195d4b0cac1ddae51a1e97581b66,Tests_passed,1c8f1af1715d3c95e0720e8dc3c09fd3f28985c6d6b378d2be39be54d32244a0,Tests_passed,True,True,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,c3851ca11310d3269122952fc56e111b789dd6fa909b6eb58a8afcaf5a981e21,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8214e2ab5d2b4fc3577cf655eb8768ed66f08abf64bbf166e5d3bf53fc8a2a45,Merge_failed,90713b9e25bc452f1db4c75bb315af057163e7cdbb8eb32ccf4564dfcbdbb191,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,213c7d6609b3925ae62a5f20196367e1aa13415a1134949143c95b0f528e236c,Merge_failed,3353c85dfd422601c5fbb94dc3cd1e3a20aa5858a937ebfe7f416238ea1fa314,0.02112412452697754,0.02150273323059082,0.023558616638183594,0.02362370491027832,0.023669004440307617,0.0240323543548584,0.0181124210357666,0.17221760749816895,0.06740093231201172,0.17014288902282715,0.15950894355773926,0.5193483829498291,0.5598175525665283,0.29148292541503906 diff --git a/results/combined/merges_timed/ata4/disunity.csv b/results/combined/merges_timed/ata4/disunity.csv index 783f108026..f9441f9f57 100644 --- a/results/combined/merges_timed/ata4/disunity.csv +++ b/results/combined/merges_timed/ata4/disunity.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,Tests_passed,True,True,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,9fbe906d812c5973cc7445327bbe2d58cfa28b84503895fd2891582dd500598a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,9fbe906d812c5973cc7445327bbe2d58cfa28b84503895fd2891582dd500598a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,3f0f63394add0726664a5d7fdc21be93cbe657fd1ba4ab5fbf13ca4121792461,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,13c85d4a949ecc4839c1e4d29d761375a4c0c6eb74bb2294d79b464541f5077d,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,0.1039888858795166,0.10417532920837402,0.18209600448608398,0.09692573547363281,0.1815509796142578,0.09480071067810059,0.18160700798034668,0.23134541511535645,0.12489891052246094,0.10325884819030762,0.10377192497253418,0.21884918212890625,0.10659098625183105,0.41564035415649414 +3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,Tests_passed,True,True,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,9fbe906d812c5973cc7445327bbe2d58cfa28b84503895fd2891582dd500598a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,9fbe906d812c5973cc7445327bbe2d58cfa28b84503895fd2891582dd500598a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,3f0f63394add0726664a5d7fdc21be93cbe657fd1ba4ab5fbf13ca4121792461,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,13c85d4a949ecc4839c1e4d29d761375a4c0c6eb74bb2294d79b464541f5077d,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,0.1039888858795166,0.10417532920837402,0.18209600448608398,0.09692573547363281,0.1815509796142578,0.09480071067810059,0.18160700798034668,0.23134541511535645,0.12489891052246094,0.1015617847442627,0.10219430923461914,0.21884918212890625,0.10659098625183105,0.41564035415649414 diff --git a/results/combined/merges_timed/atam4j/atam4j.csv b/results/combined/merges_timed/atam4j/atam4j.csv index 307254512f..80cfa5291f 100644 --- a/results/combined/merges_timed/atam4j/atam4j.csv +++ b/results/combined/merges_timed/atam4j/atam4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,71fcecb071270981bc92b14d2cc3b0e56828c011,ac72c93c78397f60ed7d24de967e1fe34a9b36b6,fb6e6e5d5b8dbcbc2679e18f3f491847f6dcc33e,,True,True,205610f2f84c4fc3fe3a162a6cb8f4409067f27af6a1d5840c90980f844b4ea6,Tests_passed,1f646b266f7cb714e05397072ac2744a0b05b86dfef6de5740f8ea203e17e431,Tests_passed,True,True,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,e765739003097850ccc9ac0cef5745cb6e631e2b3bc22d7aaeec90a9a7930f51,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,7f117f28e8cfb2371238e7da262a551675692df5c390df091fcd1c486be8703e,Merge_failed,7f117f28e8cfb2371238e7da262a551675692df5c390df091fcd1c486be8703e,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,e9f1476d364c6c41316bc7ec7456383d731d43a194bb35f76cc6c7904ea92fcf,0.009353876113891602,0.009544610977172852,0.009859323501586914,0.009628057479858398,0.009802818298339844,0.009476423263549805,0.009590864181518555,0.05025458335876465,0.016923189163208008,0.20629644393920898,0.20540714263916016,0.1328134536743164,0.8956389427185059,0.1778416633605957 +8,refs/heads/master,71fcecb071270981bc92b14d2cc3b0e56828c011,ac72c93c78397f60ed7d24de967e1fe34a9b36b6,fb6e6e5d5b8dbcbc2679e18f3f491847f6dcc33e,,True,True,205610f2f84c4fc3fe3a162a6cb8f4409067f27af6a1d5840c90980f844b4ea6,Tests_passed,1f646b266f7cb714e05397072ac2744a0b05b86dfef6de5740f8ea203e17e431,Tests_passed,True,True,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,e765739003097850ccc9ac0cef5745cb6e631e2b3bc22d7aaeec90a9a7930f51,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,7f117f28e8cfb2371238e7da262a551675692df5c390df091fcd1c486be8703e,Merge_failed,7f117f28e8cfb2371238e7da262a551675692df5c390df091fcd1c486be8703e,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,e9f1476d364c6c41316bc7ec7456383d731d43a194bb35f76cc6c7904ea92fcf,0.009353876113891602,0.009544610977172852,0.009859323501586914,0.009628057479858398,0.009802818298339844,0.009476423263549805,0.009590864181518555,0.05025458335876465,0.016923189163208008,0.20662927627563477,0.2124309539794922,0.1328134536743164,0.8956389427185059,0.1778416633605957 diff --git a/results/combined/merges_timed/athou/commafeed.csv b/results/combined/merges_timed/athou/commafeed.csv index d67a9b8a71..67926a2aec 100644 --- a/results/combined/merges_timed/athou/commafeed.csv +++ b/results/combined/merges_timed/athou/commafeed.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -211,refs/heads/master,41344e08f72ae44e694fe561330385c1462709bb,0de19a2d182bca10623b9adf5787ba364edc210e,6f35491ec6a85e76235fdb284932f911163e2b9c,,True,True,eb9f8f4ba0180c5d5314a3dbc04d89eb7e2b135a7cd3116304718afc28ef54c1,Tests_passed,e702bf1a920651a390908ab6f06ccbd4c02dd157f03d71096892f10645d98c3e,Tests_passed,True,True,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,0.04391169548034668,0.02853107452392578,0.05548214912414551,0.03167438507080078,0.05568099021911621,0.03195905685424805,0.05533170700073242,0.15135836601257324,0.0481414794921875,0.1734776496887207,0.15895438194274902,0.0884239673614502,1.131885051727295,0.260056734085083 +211,refs/heads/master,41344e08f72ae44e694fe561330385c1462709bb,0de19a2d182bca10623b9adf5787ba364edc210e,6f35491ec6a85e76235fdb284932f911163e2b9c,,True,True,eb9f8f4ba0180c5d5314a3dbc04d89eb7e2b135a7cd3116304718afc28ef54c1,Tests_passed,e702bf1a920651a390908ab6f06ccbd4c02dd157f03d71096892f10645d98c3e,Tests_passed,True,True,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,0.04391169548034668,0.02853107452392578,0.05548214912414551,0.03167438507080078,0.05568099021911621,0.03195905685424805,0.05533170700073242,0.15135836601257324,0.0481414794921875,0.17188477516174316,0.17274880409240723,0.0884239673614502,1.131885051727295,0.260056734085083 diff --git a/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv b/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv index 4bdcbb8de1..612a08a58b 100644 --- a/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv +++ b/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -77,refs/remotes/origin/extensions-2.4.x,8fd31b3e8717249b185da0e271103a90b760e89b,7b84f67240d1fe92228648acbb9d67e4a0960ba7,3607c69f55516200dd452f86afc2751818f498ee,,True,True,6f27fca37c4d9988982bf676fa9ebb9164f23efa3cfac7b1cd386c15f62c470f,Tests_passed,6031e123e91269536304aba4f3fbf17cb4abb736dfae882ac34014429e7b6cfa,Tests_passed,True,True,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,5eaac6726137e4abcac5af959819ca7117d4cf6c34946ef68887e43f09a1f60b,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,cdfa7e2dd00d7ed72bc49c7b20f7d96e309eae5ac46d478904ed1188c0aefcf6,Merge_failed,66870bc5738a78cf89b5afd0a11edb14a76f607f44455c159a91039a490aeb9b,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,3405b20ce96048e8d3b0cd4cd6d07d136977cc6de986167aed04fd77d9cc5804,Merge_failed,cdfa7e2dd00d7ed72bc49c7b20f7d96e309eae5ac46d478904ed1188c0aefcf6,0.06305408477783203,0.06435751914978027,0.05757951736450195,0.020156383514404297,0.04812788963317871,0.06508135795593262,0.04471278190612793,1.698744297027588,0.28815484046936035,0.16054773330688477,0.16094183921813965,1.5434134006500244,0.5253880023956299,0.2587699890136719 +77,refs/remotes/origin/extensions-2.4.x,8fd31b3e8717249b185da0e271103a90b760e89b,7b84f67240d1fe92228648acbb9d67e4a0960ba7,3607c69f55516200dd452f86afc2751818f498ee,,True,True,6f27fca37c4d9988982bf676fa9ebb9164f23efa3cfac7b1cd386c15f62c470f,Tests_passed,6031e123e91269536304aba4f3fbf17cb4abb736dfae882ac34014429e7b6cfa,Tests_passed,True,True,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,5eaac6726137e4abcac5af959819ca7117d4cf6c34946ef68887e43f09a1f60b,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,cdfa7e2dd00d7ed72bc49c7b20f7d96e309eae5ac46d478904ed1188c0aefcf6,Merge_failed,66870bc5738a78cf89b5afd0a11edb14a76f607f44455c159a91039a490aeb9b,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,3405b20ce96048e8d3b0cd4cd6d07d136977cc6de986167aed04fd77d9cc5804,Merge_failed,cdfa7e2dd00d7ed72bc49c7b20f7d96e309eae5ac46d478904ed1188c0aefcf6,0.06305408477783203,0.06435751914978027,0.05757951736450195,0.020156383514404297,0.04812788963317871,0.06508135795593262,0.04471278190612793,1.698744297027588,0.28815484046936035,0.15426349639892578,0.15441155433654785,1.5434134006500244,0.5253880023956299,0.2587699890136719 diff --git a/results/combined/merges_timed/atorstling/bychan.csv b/results/combined/merges_timed/atorstling/bychan.csv index 854ab06ea8..694e096fa0 100644 --- a/results/combined/merges_timed/atorstling/bychan.csv +++ b/results/combined/merges_timed/atorstling/bychan.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,96d59116bbca17ba5b72e31736f17cb431b19ad1,9783d0571b7a7c006f5c295b536dbfecf5178f12,00e0379193b04458c930e16f42d0870700df6c42,,True,True,771bd4150cc0ef221c8bd7a389faa83049508c489b3b98638b44cf458ddbd6f2,Tests_passed,4c5eacf255995b4c85be64a931da3fd3fc548a32e0a53ea8546a36e066b4a0b1,Tests_passed,True,True,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,0.019611597061157227,0.01961660385131836,0.02458477020263672,0.023757457733154297,0.02486276626586914,0.02481698989868164,0.024790287017822266,0.05363583564758301,0.019038915634155273,0.16801667213439941,0.16782307624816895,0.07502889633178711,0.8054416179656982,0.1934351921081543 +7,refs/heads/master,96d59116bbca17ba5b72e31736f17cb431b19ad1,9783d0571b7a7c006f5c295b536dbfecf5178f12,00e0379193b04458c930e16f42d0870700df6c42,,True,True,771bd4150cc0ef221c8bd7a389faa83049508c489b3b98638b44cf458ddbd6f2,Tests_passed,4c5eacf255995b4c85be64a931da3fd3fc548a32e0a53ea8546a36e066b4a0b1,Tests_passed,True,True,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,0.019611597061157227,0.01961660385131836,0.02458477020263672,0.023757457733154297,0.02486276626586914,0.02481698989868164,0.024790287017822266,0.05363583564758301,0.019038915634155273,0.16951251029968262,0.16822457313537598,0.07502889633178711,0.8054416179656982,0.1934351921081543 diff --git a/results/combined/merges_timed/attoparser/attoparser.csv b/results/combined/merges_timed/attoparser/attoparser.csv index 7611b8bc02..9927cf6ff2 100644 --- a/results/combined/merges_timed/attoparser/attoparser.csv +++ b/results/combined/merges_timed/attoparser/attoparser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,798b83b78f7a4821456d8ec3d36f9f86cbc1d5b0,2c0f34f7637d172a354518387ece1ef19c01fb4c,9ea8984c9828d2f35f6754195a5e23b740c546eb,,True,True,2c12d47073f152e140db1f836dd074f563a67b2df0693a51124a5c5e166749fb,Tests_passed,3bb345124a68f0dfe2c0417135132e6bf662acadd2b2486482b55a30f46df361,Tests_passed,True,True,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,0.04937243461608887,0.04807090759277344,0.041295766830444336,0.06603360176086426,0.048183441162109375,0.04696345329284668,0.04155683517456055,0.17593097686767578,0.05555868148803711,0.19588828086853027,0.18924283981323242,0.12469887733459473,0.05480146408081055,0.24361062049865723 +6,refs/heads/master,798b83b78f7a4821456d8ec3d36f9f86cbc1d5b0,2c0f34f7637d172a354518387ece1ef19c01fb4c,9ea8984c9828d2f35f6754195a5e23b740c546eb,,True,True,2c12d47073f152e140db1f836dd074f563a67b2df0693a51124a5c5e166749fb,Tests_passed,3bb345124a68f0dfe2c0417135132e6bf662acadd2b2486482b55a30f46df361,Tests_passed,True,True,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,0.04937243461608887,0.04807090759277344,0.041295766830444336,0.06603360176086426,0.048183441162109375,0.04696345329284668,0.04155683517456055,0.17593097686767578,0.05555868148803711,0.1872389316558838,0.1836698055267334,0.12469887733459473,0.05480146408081055,0.24361062049865723 diff --git a/results/combined/merges_timed/augustt198/lumen.csv b/results/combined/merges_timed/augustt198/lumen.csv index 00ef231366..0bd62b5aac 100644 --- a/results/combined/merges_timed/augustt198/lumen.csv +++ b/results/combined/merges_timed/augustt198/lumen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,7d97ea8fcd51dbe8b89640b5aa4df71836c06834,f8caae07c25e99ce557f4a4e7c99f17fe15071e3,91bfe976e4de8e35b136285351f8430cb99903be,,True,True,055b804925b7fa8654ec1fe911a72480ecbf1416d03155b8436c1ac4a67b5f2f,Tests_passed,9ef8a67610a72565cf195ce3ee4d0505c784ab9afcbc08a01950b2bd6b89232d,Tests_passed,True,True,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,136052826486c6d1e94544b5d7fb7df698152e159f699bc4ccc4fb5fccad5702,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Tests_passed,b51b80445a8210629a04437af0518a6e2ba28a7c2decd1b7b60485a20cdf24fa,Tests_passed,b51b80445a8210629a04437af0518a6e2ba28a7c2decd1b7b60485a20cdf24fa,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Merge_failed,77599c980afdd40ff0002cda26dacbc175eedfa9aa8f083832087b93004aaa07,0.02411675453186035,0.04845404624938965,0.0438690185546875,0.04414987564086914,0.04652833938598633,0.04970526695251465,0.03866100311279297,0.15722870826721191,0.06579065322875977,0.16270899772644043,0.1626441478729248,0.1176455020904541,0.9991409778594971,0.2329263687133789 +4,refs/heads/master,7d97ea8fcd51dbe8b89640b5aa4df71836c06834,f8caae07c25e99ce557f4a4e7c99f17fe15071e3,91bfe976e4de8e35b136285351f8430cb99903be,,True,True,055b804925b7fa8654ec1fe911a72480ecbf1416d03155b8436c1ac4a67b5f2f,Tests_passed,9ef8a67610a72565cf195ce3ee4d0505c784ab9afcbc08a01950b2bd6b89232d,Tests_passed,True,True,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Merge_failed,136052826486c6d1e94544b5d7fb7df698152e159f699bc4ccc4fb5fccad5702,Merge_failed,732b5549e27fc0c69b208284b5890511323d3b66e0b87eda09c9eac7314e3870,Tests_passed,b51b80445a8210629a04437af0518a6e2ba28a7c2decd1b7b60485a20cdf24fa,Tests_passed,b51b80445a8210629a04437af0518a6e2ba28a7c2decd1b7b60485a20cdf24fa,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Merge_failed,77599c980afdd40ff0002cda26dacbc175eedfa9aa8f083832087b93004aaa07,0.02411675453186035,0.04845404624938965,0.0438690185546875,0.04414987564086914,0.04652833938598633,0.04970526695251465,0.03866100311279297,0.15722870826721191,0.06579065322875977,0.1733536720275879,0.16332221031188965,0.1176455020904541,0.9991409778594971,0.2329263687133789 diff --git a/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv b/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv index a8e9ea4af1..c71e5489ce 100644 --- a/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv +++ b/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/heads/main,7ac65a5f80090b7e18e9280be5ddb3a183d8da66,29a68d4ec812c2a6ca35b52f22f43c3ea4b67c39,8b883513acbe998713abbd743921ca455dc69445,,True,True,ca603698c7f3f52f447d99d19e990cf7bbe01e9921a343c4f9bd25040ce9c5a7,Tests_passed,026bd25b9aa9406dee80143389a5178491827a84f4e277a99f8395b334ceb8bf,Tests_passed,True,True,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,0.022207260131835938,0.02221083641052246,0.03868269920349121,0.03714632987976074,0.03306841850280762,0.03737783432006836,0.022181987762451172,0.11318588256835938,0.027212142944335938,0.15622258186340332,0.15422987937927246,0.10169124603271484,0.7066237926483154,0.19419574737548828 +32,refs/heads/main,7ac65a5f80090b7e18e9280be5ddb3a183d8da66,29a68d4ec812c2a6ca35b52f22f43c3ea4b67c39,8b883513acbe998713abbd743921ca455dc69445,,True,True,ca603698c7f3f52f447d99d19e990cf7bbe01e9921a343c4f9bd25040ce9c5a7,Tests_passed,026bd25b9aa9406dee80143389a5178491827a84f4e277a99f8395b334ceb8bf,Tests_passed,True,True,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,0.022207260131835938,0.02221083641052246,0.03868269920349121,0.03714632987976074,0.03306841850280762,0.03737783432006836,0.022181987762451172,0.11318588256835938,0.027212142944335938,0.1516256332397461,0.1513071060180664,0.10169124603271484,0.7066237926483154,0.19419574737548828 diff --git a/results/combined/merges_timed/auth0/java-jwt.csv b/results/combined/merges_timed/auth0/java-jwt.csv index a27ca49e19..15f0afbd18 100644 --- a/results/combined/merges_timed/auth0/java-jwt.csv +++ b/results/combined/merges_timed/auth0/java-jwt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -219,refs/remotes/origin/pull/564,75ee6a33c14697af6c1b18b10c6a3603f0f8d121,9955599c1fb3db9927ab438356f5ae18118631ae,0333526d9a3d2893b9abb506cc38cc83de091776,,True,True,3955085f8aeba2e69102f70a2bd22de2474b68479b470fff8270ca3c1a3ce25c,Tests_passed,010f6c9866cba61a18d308d217f4881f4886852e000e6c76fb6d878a3d9679c0,Tests_passed,True,True,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,e03fc569b3ce845319eda3807bd63c3d69973e6c7ff1bb7a708f33025805643c,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,b5c206235b1cacccc3b01436cbb3d045c1f21cf88bd91d90695e8df1930b3af0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,b5fd2404497b663b447c40663f38832aa80a7fc78b0bf0ee6811cf3c29bb7f1b,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,3dd3a6ab7aeb1959d1e66c50faf4e20a13e895ce5dae0ad50b0e214680fff4e3,Merge_failed,3dd3a6ab7aeb1959d1e66c50faf4e20a13e895ce5dae0ad50b0e214680fff4e3,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,7696f16f686d7f3c1205c7746ca0a5c243d8436072339a4d59164c5dc5aebb23,0.06605100631713867,0.04931831359863281,0.050232887268066406,0.056230783462524414,0.048090219497680664,0.0627899169921875,0.05784153938293457,0.6624741554260254,0.08639764785766602,1.0270538330078125,1.036566972732544,0.5039567947387695,7.294728994369507,0.2705724239349365 +219,refs/remotes/origin/pull/564,75ee6a33c14697af6c1b18b10c6a3603f0f8d121,9955599c1fb3db9927ab438356f5ae18118631ae,0333526d9a3d2893b9abb506cc38cc83de091776,,True,True,3955085f8aeba2e69102f70a2bd22de2474b68479b470fff8270ca3c1a3ce25c,Tests_passed,010f6c9866cba61a18d308d217f4881f4886852e000e6c76fb6d878a3d9679c0,Tests_passed,True,True,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,e03fc569b3ce845319eda3807bd63c3d69973e6c7ff1bb7a708f33025805643c,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,b5c206235b1cacccc3b01436cbb3d045c1f21cf88bd91d90695e8df1930b3af0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,b5fd2404497b663b447c40663f38832aa80a7fc78b0bf0ee6811cf3c29bb7f1b,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,3dd3a6ab7aeb1959d1e66c50faf4e20a13e895ce5dae0ad50b0e214680fff4e3,Merge_failed,3dd3a6ab7aeb1959d1e66c50faf4e20a13e895ce5dae0ad50b0e214680fff4e3,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,7696f16f686d7f3c1205c7746ca0a5c243d8436072339a4d59164c5dc5aebb23,0.06605100631713867,0.04931831359863281,0.050232887268066406,0.056230783462524414,0.048090219497680664,0.0627899169921875,0.05784153938293457,0.6624741554260254,0.08639764785766602,1.0305755138397217,1.036090612411499,0.5039567947387695,7.294728994369507,0.2705724239349365 diff --git a/results/combined/merges_timed/avaje-common/avaje-agentloader.csv b/results/combined/merges_timed/avaje-common/avaje-agentloader.csv index ac95f756e8..5e6e76701f 100644 --- a/results/combined/merges_timed/avaje-common/avaje-agentloader.csv +++ b/results/combined/merges_timed/avaje-common/avaje-agentloader.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,1406ac7a25bad7155a3ace629e63da4ba6d9c4c0,9fef8b5a77120ba7feb1d1d46e763bc4b1052d6c,6652713f4ba4337ca030fea6c306cc21c932fdae,,b600ab30bf1a6c2c0338e1364d1953ab9794ed902bc23873aea1f3ef70cb90e5,Tests_passed,d9f63ef2754a04cb34a1ab4e47ebbfd76fbabe9b62d7ad695671c6e13959833e,Tests_passed,True,True,True,True,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,c8e13a85481e2e06a69d167ff9a067ee0be7a002db81e0a11be9991c1d5149ba,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a4a8403c5d4651104e18f0b9a4c9532b226849fac5863b7ef1cb533a5e0f9638,Merge_failed,a4a8403c5d4651104e18f0b9a4c9532b226849fac5863b7ef1cb533a5e0f9638,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,834fc8ccf5b1975e010a5489af3590f2eed5c64c029d93ff98cb4c13796c5ec3,Merge_failed,bc78ea94ab3adabaf81382511dfc87fd8184b1ebbc73d94f08f6089fc9ee4410,0.010302066802978516,0.04129815101623535,0.04221749305725098,0.03571057319641113,0.03776216506958008,0.03697681427001953,0.040988922119140625,0.21999573707580566,0.017722606658935547,0.08408641815185547,0.08401203155517578,0.1797330379486084,0.7902274131774902,0.18407988548278809 +7,refs/heads/master,1406ac7a25bad7155a3ace629e63da4ba6d9c4c0,9fef8b5a77120ba7feb1d1d46e763bc4b1052d6c,6652713f4ba4337ca030fea6c306cc21c932fdae,,b600ab30bf1a6c2c0338e1364d1953ab9794ed902bc23873aea1f3ef70cb90e5,Tests_passed,d9f63ef2754a04cb34a1ab4e47ebbfd76fbabe9b62d7ad695671c6e13959833e,Tests_passed,True,True,True,True,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,c8e13a85481e2e06a69d167ff9a067ee0be7a002db81e0a11be9991c1d5149ba,Merge_failed,a08763da49ac7d70e1d11758ba2c01249b39a374bc53cb2b888173d6b1e30835,Merge_failed,a4a8403c5d4651104e18f0b9a4c9532b226849fac5863b7ef1cb533a5e0f9638,Merge_failed,a4a8403c5d4651104e18f0b9a4c9532b226849fac5863b7ef1cb533a5e0f9638,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,834fc8ccf5b1975e010a5489af3590f2eed5c64c029d93ff98cb4c13796c5ec3,Merge_failed,bc78ea94ab3adabaf81382511dfc87fd8184b1ebbc73d94f08f6089fc9ee4410,0.010302066802978516,0.04129815101623535,0.04221749305725098,0.03571057319641113,0.03776216506958008,0.03697681427001953,0.040988922119140625,0.21999573707580566,0.017722606658935547,0.08354973793029785,0.08372974395751953,0.1797330379486084,0.7902274131774902,0.18407988548278809 diff --git a/results/combined/merges_timed/awaisathar/dependensee.csv b/results/combined/merges_timed/awaisathar/dependensee.csv index 9b2c05117d..4475ca9d5c 100644 --- a/results/combined/merges_timed/awaisathar/dependensee.csv +++ b/results/combined/merges_timed/awaisathar/dependensee.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,38b5080a19a4b08f68e6255427afa7d8d57caae4,55efd475ca9223eb2ac75021f4862487b70ab2c5,56277c0e14a8c2bef74e4be02bbd2d980f4d939b,,4f38be01ee9da8e1497a2544f50925a20a119f2b13d80064095318e001670c27,Tests_passed,c2128c07d91497e2179ba4694ad88b57660e18859d979bffbb8beb43db6e96d0,Tests_passed,True,True,True,True,Merge_failed,29d08eae66e9010b5fcd0b40bd9bbd3c878314dcc6b52a2607126d4ac4e8933d,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,29d08eae66e9010b5fcd0b40bd9bbd3c878314dcc6b52a2607126d4ac4e8933d,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,c33c2914973350a824a9073fc24bbc530adc62ee1417752f17fc80290fa7bef0,Merge_failed,c33c2914973350a824a9073fc24bbc530adc62ee1417752f17fc80290fa7bef0,Merge_failed,29d08eae66e9010b5fcd0b40bd9bbd3c878314dcc6b52a2607126d4ac4e8933d,Merge_failed,d3018f389ce0ddb294ba7d36053ad1c98989797db2569b6f4aea7800eeeba4de,Merge_failed,29d08eae66e9010b5fcd0b40bd9bbd3c878314dcc6b52a2607126d4ac4e8933d,Merge_failed,7b0f90bc1be5fb4605dd6ad1040c04e989f69622d317a01d7da79abcc4521ef8,Merge_failed,7b0f90bc1be5fb4605dd6ad1040c04e989f69622d317a01d7da79abcc4521ef8,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,2c23e39635c8853ee25ca1c5285a8fe4a5ffce5b92f4fd59b88c0f53d9d0c74f,0.03763270378112793,0.041391611099243164,0.010508537292480469,0.012546539306640625,0.031003475189208984,0.03216052055358887,0.013474702835083008,0.3093569278717041,0.07526683807373047,0.20012354850769043,0.19925642013549805,0.2251298427581787,2.2134323120117188,0.22813677787780762 +1,refs/heads/master,38b5080a19a4b08f68e6255427afa7d8d57caae4,55efd475ca9223eb2ac75021f4862487b70ab2c5,56277c0e14a8c2bef74e4be02bbd2d980f4d939b,,4f38be01ee9da8e1497a2544f50925a20a119f2b13d80064095318e001670c27,Tests_passed,c2128c07d91497e2179ba4694ad88b57660e18859d979bffbb8beb43db6e96d0,Tests_passed,True,True,True,True,Merge_failed,29d08eae66e9010b5fcd0b40bd9bbd3c878314dcc6b52a2607126d4ac4e8933d,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,29d08eae66e9010b5fcd0b40bd9bbd3c878314dcc6b52a2607126d4ac4e8933d,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,c33c2914973350a824a9073fc24bbc530adc62ee1417752f17fc80290fa7bef0,Merge_failed,c33c2914973350a824a9073fc24bbc530adc62ee1417752f17fc80290fa7bef0,Merge_failed,29d08eae66e9010b5fcd0b40bd9bbd3c878314dcc6b52a2607126d4ac4e8933d,Merge_failed,d3018f389ce0ddb294ba7d36053ad1c98989797db2569b6f4aea7800eeeba4de,Merge_failed,29d08eae66e9010b5fcd0b40bd9bbd3c878314dcc6b52a2607126d4ac4e8933d,Merge_failed,7b0f90bc1be5fb4605dd6ad1040c04e989f69622d317a01d7da79abcc4521ef8,Merge_failed,7b0f90bc1be5fb4605dd6ad1040c04e989f69622d317a01d7da79abcc4521ef8,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,2c23e39635c8853ee25ca1c5285a8fe4a5ffce5b92f4fd59b88c0f53d9d0c74f,0.03763270378112793,0.041391611099243164,0.010508537292480469,0.012546539306640625,0.031003475189208984,0.03216052055358887,0.013474702835083008,0.3093569278717041,0.07526683807373047,0.19985508918762207,0.19979047775268555,0.2251298427581787,2.2134323120117188,0.22813677787780762 diff --git a/results/combined/merges_timed/awaitility/awaitility.csv b/results/combined/merges_timed/awaitility/awaitility.csv index 05e5bb80ac..e35e5eee8d 100644 --- a/results/combined/merges_timed/awaitility/awaitility.csv +++ b/results/combined/merges_timed/awaitility/awaitility.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,Tests_passed,True,True,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,5da5841c61b69626dca41611c5683ff7b3dea7a55d846b93a4171f681ef24d0c,Merge_failed,033d23b19ffce5b7c38e57ed620929bf493b677fbcaeb4d285f6fdc19defe797,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,0.03825807571411133,0.026620864868164062,0.047556161880493164,0.01991438865661621,0.02585744857788086,0.05531501770019531,0.04225420951843262,0.22882771492004395,0.06444644927978516,0.24308466911315918,0.2410893440246582,0.17362451553344727,1.2263951301574707,0.19228124618530273 +45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,Tests_passed,True,True,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,5da5841c61b69626dca41611c5683ff7b3dea7a55d846b93a4171f681ef24d0c,Merge_failed,033d23b19ffce5b7c38e57ed620929bf493b677fbcaeb4d285f6fdc19defe797,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,0.03825807571411133,0.026620864868164062,0.047556161880493164,0.01991438865661621,0.02585744857788086,0.05531501770019531,0.04225420951843262,0.22882771492004395,0.06444644927978516,0.24039864540100098,0.23975920677185059,0.17362451553344727,1.2263951301574707,0.19228124618530273 diff --git a/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv b/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv index c9f5bc93cd..22092b3784 100644 --- a/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv +++ b/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,93b744705965d180aa463a576f96eb6c2e19731b,642e116773e5d3495f3f95682e72cd77a7e391f8,c8e66e6ebdab6bbf07c30912f64625fd8e8187b8,,b470b08641dd44116f4201fb4d577b3ff69300ab5a0b2949327b64f8a236787f,Tests_passed,c598958f04ce09f559db8ef634d8cdb3613f46e9129a23d9a37de862526480ee,Tests_passed,True,True,True,True,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,0.008794307708740234,0.008954286575317383,0.00860905647277832,0.008661508560180664,0.008766889572143555,0.008694171905517578,0.00875997543334961,0.042949676513671875,0.009012222290039062,0.3005807399749756,0.30090951919555664,0.11600112915039062,1.5237650871276855,0.16244769096374512 +2,refs/heads/master,93b744705965d180aa463a576f96eb6c2e19731b,642e116773e5d3495f3f95682e72cd77a7e391f8,c8e66e6ebdab6bbf07c30912f64625fd8e8187b8,,b470b08641dd44116f4201fb4d577b3ff69300ab5a0b2949327b64f8a236787f,Tests_passed,c598958f04ce09f559db8ef634d8cdb3613f46e9129a23d9a37de862526480ee,Tests_passed,True,True,True,True,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,0.008794307708740234,0.008954286575317383,0.00860905647277832,0.008661508560180664,0.008766889572143555,0.008694171905517578,0.00875997543334961,0.042949676513671875,0.009012222290039062,0.30144500732421875,0.3027079105377197,0.11600112915039062,1.5237650871276855,0.16244769096374512 diff --git a/results/combined/merges_timed/aws/aws-cloudtrail-processing-library.csv b/results/combined/merges_timed/aws/aws-cloudtrail-processing-library.csv index 547197548e..8b47b0393c 100644 --- a/results/combined/merges_timed/aws/aws-cloudtrail-processing-library.csv +++ b/results/combined/merges_timed/aws/aws-cloudtrail-processing-library.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/2,75fb2ff17d00bd2a2f1f478901a13de2149b3f15,eb47dbe7b5f96148b77d94f0a1471de1d01830a2,3aa119cc6425360f76cb96fb5c7f103db1c92ca8,,751d4a43b21d8de56b21e3a148883a4cec30be4695c800a6a3e691999d5ac912,Tests_passed,f8343de806fb0573de66933baf08fc3bb54cd37f2a49addbe0b73575573eef59,Tests_passed,True,True,True,True,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,740ee519d959a4077fedb1b023a31b858563d9d47ffece415399fce7e81df8ef,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,c6c8073cdde2572ffdbd0e9aef700091b7226810c267e86ab764e8529dd99d1b,Merge_failed,c6c8073cdde2572ffdbd0e9aef700091b7226810c267e86ab764e8529dd99d1b,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,6514943e1d33b0af754808af85fe340226f10188c54055b0ecb62aa1a2beae98,Merge_failed,a6a782362e5023408d76622d584944f96c822ab4d24dd6e5a04a268b13499d24,0.04653811454772949,0.05917692184448242,0.052701711654663086,0.05152320861816406,0.05758547782897949,0.055236101150512695,0.056145668029785156,0.2175917625427246,0.0852508544921875,0.14894318580627441,0.1491250991821289,0.17685151100158691,0.7141304016113281,0.26300811767578125 +3,refs/remotes/origin/pull/2,75fb2ff17d00bd2a2f1f478901a13de2149b3f15,eb47dbe7b5f96148b77d94f0a1471de1d01830a2,3aa119cc6425360f76cb96fb5c7f103db1c92ca8,,751d4a43b21d8de56b21e3a148883a4cec30be4695c800a6a3e691999d5ac912,Tests_passed,f8343de806fb0573de66933baf08fc3bb54cd37f2a49addbe0b73575573eef59,Tests_passed,True,True,True,True,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,740ee519d959a4077fedb1b023a31b858563d9d47ffece415399fce7e81df8ef,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,c6c8073cdde2572ffdbd0e9aef700091b7226810c267e86ab764e8529dd99d1b,Merge_failed,c6c8073cdde2572ffdbd0e9aef700091b7226810c267e86ab764e8529dd99d1b,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,6514943e1d33b0af754808af85fe340226f10188c54055b0ecb62aa1a2beae98,Merge_failed,a6a782362e5023408d76622d584944f96c822ab4d24dd6e5a04a268b13499d24,0.04653811454772949,0.05917692184448242,0.052701711654663086,0.05152320861816406,0.05758547782897949,0.055236101150512695,0.056145668029785156,0.2175917625427246,0.0852508544921875,0.15009355545043945,0.15047478675842285,0.17685151100158691,0.7141304016113281,0.26300811767578125 diff --git a/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv b/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv index 44df1d8002..798c675ed2 100644 --- a/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv +++ b/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -120,refs/remotes/origin/pull/221,ed1f9d4dca07aefc6c353bd84552f7cc041a63aa,92c0b43b2a391f52f633ebe2eff4c288988b8cfa,f9701f96519acb1bb7e45f3b8cbabdb81f08ed9c,,dbf5991e5695532e2e2785d52ade252ac90a581263b493e951ccc81bed099d07,Tests_passed,6e21f76599e647576e6c2001eb548dcd56b9a05fa26f60cd8c8422aeefcae914,Tests_passed,True,True,True,True,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,723af23c21615157731d65803234159b7ef726c9ad952eca4f879919809c15f4,Tests_failed,723af23c21615157731d65803234159b7ef726c9ad952eca4f879919809c15f4,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_passed,ef6e994f040ba00849800a17428fcb3de54cdd97686bb88934d98477621874c2,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,0.03161025047302246,0.0363924503326416,0.03439044952392578,0.06681108474731445,0.05126047134399414,0.03599882125854492,0.04647684097290039,0.1410083770751953,0.04654407501220703,0.3049006462097168,0.3112359046936035,0.15465140342712402,1.2532639503479004,0.2841196060180664 +120,refs/remotes/origin/pull/221,ed1f9d4dca07aefc6c353bd84552f7cc041a63aa,92c0b43b2a391f52f633ebe2eff4c288988b8cfa,f9701f96519acb1bb7e45f3b8cbabdb81f08ed9c,,dbf5991e5695532e2e2785d52ade252ac90a581263b493e951ccc81bed099d07,Tests_passed,6e21f76599e647576e6c2001eb548dcd56b9a05fa26f60cd8c8422aeefcae914,Tests_passed,True,True,True,True,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,723af23c21615157731d65803234159b7ef726c9ad952eca4f879919809c15f4,Tests_failed,723af23c21615157731d65803234159b7ef726c9ad952eca4f879919809c15f4,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_passed,ef6e994f040ba00849800a17428fcb3de54cdd97686bb88934d98477621874c2,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,0.03161025047302246,0.0363924503326416,0.03439044952392578,0.06681108474731445,0.05126047134399414,0.03599882125854492,0.04647684097290039,0.1410083770751953,0.04654407501220703,0.31049275398254395,0.30677223205566406,0.15465140342712402,1.2532639503479004,0.2841196060180664 diff --git a/results/combined/merges_timed/awslabs/amazon-sqs-java-messaging-lib.csv b/results/combined/merges_timed/awslabs/amazon-sqs-java-messaging-lib.csv index ac57e4f0a7..574290d150 100644 --- a/results/combined/merges_timed/awslabs/amazon-sqs-java-messaging-lib.csv +++ b/results/combined/merges_timed/awslabs/amazon-sqs-java-messaging-lib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,04b2881401bb35ae6113c4802484135c1c3533ae,721cd7d882b4af5168f474d16a071d780ffa91dd,091d3e41238d823838d761c2c41532ca7e880f97,,09114dcb420c91af75b3e08615a81b4afc454335ae2df7c939c660ba9be72594,Tests_passed,842420198bc8701ec5ba7c5a3bbde3d742c921a48e89eb417cc6ee8ea49e7ca9,Tests_passed,True,True,True,True,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,0.042525529861450195,0.05101633071899414,0.06299996376037598,0.06098461151123047,0.03650164604187012,0.04703545570373535,0.04755830764770508,0.16946744918823242,0.044493675231933594,0.17003440856933594,0.1701347827911377,0.11815142631530762,1.123809576034546,0.24616312980651855 +24,refs/heads/master,04b2881401bb35ae6113c4802484135c1c3533ae,721cd7d882b4af5168f474d16a071d780ffa91dd,091d3e41238d823838d761c2c41532ca7e880f97,,09114dcb420c91af75b3e08615a81b4afc454335ae2df7c939c660ba9be72594,Tests_passed,842420198bc8701ec5ba7c5a3bbde3d742c921a48e89eb417cc6ee8ea49e7ca9,Tests_passed,True,True,True,True,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,0.042525529861450195,0.05101633071899414,0.06299996376037598,0.06098461151123047,0.03650164604187012,0.04703545570373535,0.04755830764770508,0.16946744918823242,0.044493675231933594,0.16902589797973633,0.1688382625579834,0.11815142631530762,1.123809576034546,0.24616312980651855 diff --git a/results/combined/merges_timed/awslabs/dynamodb-geo.csv b/results/combined/merges_timed/awslabs/dynamodb-geo.csv index fddf674e1f..2c65885a32 100644 --- a/results/combined/merges_timed/awslabs/dynamodb-geo.csv +++ b/results/combined/merges_timed/awslabs/dynamodb-geo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,1d1b774cef3609a4e9f435c2ed8ea36359e058bd,f4d62cbb93f622c0565ff23a95908385d1d4a799,ef43ffecf577d610b6be671634c64bf1dc09adea,,999c7d6c45f71b90674a9e41b7abc7f88cf4307059383432b586990243381013,Tests_passed,92b9ae4263d61671d401e712afa7c73976334d71e3a61b60b8cedb0a33449f7a,Tests_passed,True,True,True,True,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,0.09301209449768066,0.0930325984954834,0.05215287208557129,0.1341562271118164,0.13864517211914062,0.13538146018981934,0.11452960968017578,0.17320847511291504,0.05180072784423828,0.23771119117736816,0.15227818489074707,0.11213922500610352,0.8321640491485596,0.22258281707763672 +3,refs/heads/master,1d1b774cef3609a4e9f435c2ed8ea36359e058bd,f4d62cbb93f622c0565ff23a95908385d1d4a799,ef43ffecf577d610b6be671634c64bf1dc09adea,,999c7d6c45f71b90674a9e41b7abc7f88cf4307059383432b586990243381013,Tests_passed,92b9ae4263d61671d401e712afa7c73976334d71e3a61b60b8cedb0a33449f7a,Tests_passed,True,True,True,True,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,0.09301209449768066,0.0930325984954834,0.05215287208557129,0.1341562271118164,0.13864517211914062,0.13538146018981934,0.11452960968017578,0.17320847511291504,0.05180072784423828,0.22353529930114746,0.23344755172729492,0.11213922500610352,0.8321640491485596,0.22258281707763672 diff --git a/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv b/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv index f267c1d3a7..c16b79a76c 100644 --- a/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv +++ b/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,4acb58fdc4040822d2f8bdcad0e89354a06a1157,3304473d0d47b00517e04e5942052f4205edca9a,cc0811dba8cb9210fa86aa57f2ac40d9e14ff244,,a1eefa38c5061dbc9b605fd767ee746846b0e52f77fa831f49ae9d2b4cfd7868,Tests_passed,ff928199e1db91f59b72fde0191ccbe323b1e0fab491d8e8c9ee292aeb1a4bdb,Tests_passed,True,True,True,True,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,17536cdee22e52d86ff22082e3344b941a0bc473d6f2f57e31bce510acdcf473,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,0.043430328369140625,0.04649186134338379,0.0443730354309082,0.045194149017333984,0.04446673393249512,0.04247570037841797,0.041356563568115234,0.2168745994567871,0.043366193771362305,0.15765619277954102,0.15885162353515625,0.1710834503173828,0.7936110496520996,0.1999971866607666 +1,refs/heads/master,4acb58fdc4040822d2f8bdcad0e89354a06a1157,3304473d0d47b00517e04e5942052f4205edca9a,cc0811dba8cb9210fa86aa57f2ac40d9e14ff244,,a1eefa38c5061dbc9b605fd767ee746846b0e52f77fa831f49ae9d2b4cfd7868,Tests_passed,ff928199e1db91f59b72fde0191ccbe323b1e0fab491d8e8c9ee292aeb1a4bdb,Tests_passed,True,True,True,True,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,17536cdee22e52d86ff22082e3344b941a0bc473d6f2f57e31bce510acdcf473,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,0.043430328369140625,0.04649186134338379,0.0443730354309082,0.045194149017333984,0.04446673393249512,0.04247570037841797,0.041356563568115234,0.2168745994567871,0.043366193771362305,0.1559762954711914,0.15756607055664062,0.1710834503173828,0.7936110496520996,0.1999971866607666 diff --git a/results/combined/merges_timed/azuread/azure-activedirectory-library-for-java.csv b/results/combined/merges_timed/azuread/azure-activedirectory-library-for-java.csv index 28dacee3bd..0b876c2f64 100644 --- a/results/combined/merges_timed/azuread/azure-activedirectory-library-for-java.csv +++ b/results/combined/merges_timed/azuread/azure-activedirectory-library-for-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -107,refs/remotes/origin/pull/189,7ba3f410c7ea8203968eeb2c99ab62442eca40a6,58a2d8745bbe51f24c83ed6e1366f803938e6aec,6cbac35775566870f20a40e3bcec515b7abd24e9,,True,True,752b6a018987f3867236868724a405de7294f1d5368214a6d168ebb97ccd008f,Tests_passed,affbc3e449c2e8faaba9bcdd5ef5e150b19db4b16dcfc1ef64435f60fd9926b1,Tests_passed,True,True,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,91501224b845f04d556e02acfb664188a88cadf7cb9d0d0746bc056d1b52e01b,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,9717ae79b106600e0a5f9655636231276c9734c39a08d3c91453afbc441d9bc4,Merge_failed,9717ae79b106600e0a5f9655636231276c9734c39a08d3c91453afbc441d9bc4,Merge_failed,4d049b063393c21237e5e3a2f5e56a4868a1f080c5decf21a9b0608cfebf4c2b,Merge_failed,60682237aee3b42794039695f5272109751e3479d44515bea8bb49aa0376ff0e,Merge_failed,e8ad2e5031b24add152c3ae72bd7a1a0f6f6f0c0e7242789a8555ab6a222acc0,0.03459620475769043,0.04503369331359863,0.038634300231933594,0.04508066177368164,0.053168296813964844,0.05708575248718262,0.054231882095336914,0.3261525630950928,0.08021116256713867,0.3168020248413086,0.3189845085144043,0.2500474452972412,2.9412715435028076,0.2376089096069336 +107,refs/remotes/origin/pull/189,7ba3f410c7ea8203968eeb2c99ab62442eca40a6,58a2d8745bbe51f24c83ed6e1366f803938e6aec,6cbac35775566870f20a40e3bcec515b7abd24e9,,True,True,752b6a018987f3867236868724a405de7294f1d5368214a6d168ebb97ccd008f,Tests_passed,affbc3e449c2e8faaba9bcdd5ef5e150b19db4b16dcfc1ef64435f60fd9926b1,Tests_passed,True,True,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,91501224b845f04d556e02acfb664188a88cadf7cb9d0d0746bc056d1b52e01b,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,9717ae79b106600e0a5f9655636231276c9734c39a08d3c91453afbc441d9bc4,Merge_failed,9717ae79b106600e0a5f9655636231276c9734c39a08d3c91453afbc441d9bc4,Merge_failed,4d049b063393c21237e5e3a2f5e56a4868a1f080c5decf21a9b0608cfebf4c2b,Merge_failed,60682237aee3b42794039695f5272109751e3479d44515bea8bb49aa0376ff0e,Merge_failed,e8ad2e5031b24add152c3ae72bd7a1a0f6f6f0c0e7242789a8555ab6a222acc0,0.03459620475769043,0.04503369331359863,0.038634300231933594,0.04508066177368164,0.053168296813964844,0.05708575248718262,0.054231882095336914,0.3261525630950928,0.08021116256713867,0.31984949111938477,0.3176708221435547,0.2500474452972412,2.9412715435028076,0.2376089096069336 diff --git a/results/combined/merges_timed/b/kafka-websocket.csv b/results/combined/merges_timed/b/kafka-websocket.csv index e8233e23c7..1f5bed43be 100644 --- a/results/combined/merges_timed/b/kafka-websocket.csv +++ b/results/combined/merges_timed/b/kafka-websocket.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,3e7fb0a946a78bee2f1ae85fcbdc36e3d85bc5d8,214dd17bdce8b4bb846f1906bbeed685bff07be9,c1cc4961a40a45b2b4fd1796eeda998ba5e6d617,,True,True,2de6155d3b55b16d42dcebd7bfbdb5643fef262f33a5ab66f6ee22338a78d563,Tests_passed,b395ee4c0847300b9a2e4233f74ae41c237010fb93f1a9fa3326ecd7611cd0ed,Tests_passed,True,True,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Merge_failed,8d9883c3081b9cd12ac36f0aed233e3a2498808401a727985684a835b6f6a78f,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,a4e9669ee0900161a3dc83bb0b098d866477ed372801a4a841756825d3ce1290,Tests_passed,a4e9669ee0900161a3dc83bb0b098d866477ed372801a4a841756825d3ce1290,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,0.008585691452026367,0.008965492248535156,0.009319782257080078,0.009346246719360352,0.00873422622680664,0.008953094482421875,0.00917959213256836,0.038961172103881836,0.008887529373168945,0.3068723678588867,0.30504631996154785,0.11918807029724121,1.3069379329681396,0.17031240463256836 +3,refs/heads/master,3e7fb0a946a78bee2f1ae85fcbdc36e3d85bc5d8,214dd17bdce8b4bb846f1906bbeed685bff07be9,c1cc4961a40a45b2b4fd1796eeda998ba5e6d617,,True,True,2de6155d3b55b16d42dcebd7bfbdb5643fef262f33a5ab66f6ee22338a78d563,Tests_passed,b395ee4c0847300b9a2e4233f74ae41c237010fb93f1a9fa3326ecd7611cd0ed,Tests_passed,True,True,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Merge_failed,8d9883c3081b9cd12ac36f0aed233e3a2498808401a727985684a835b6f6a78f,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,a4e9669ee0900161a3dc83bb0b098d866477ed372801a4a841756825d3ce1290,Tests_passed,a4e9669ee0900161a3dc83bb0b098d866477ed372801a4a841756825d3ce1290,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,0.008585691452026367,0.008965492248535156,0.009319782257080078,0.009346246719360352,0.00873422622680664,0.008953094482421875,0.00917959213256836,0.038961172103881836,0.008887529373168945,0.3016393184661865,0.30179429054260254,0.11918807029724121,1.3069379329681396,0.17031240463256836 diff --git a/results/combined/merges_timed/barend/java-iban.csv b/results/combined/merges_timed/barend/java-iban.csv index 15782cbd1b..bc70808ed7 100644 --- a/results/combined/merges_timed/barend/java-iban.csv +++ b/results/combined/merges_timed/barend/java-iban.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -66,refs/heads/main,981e0311705b2f83cabb82c9c9e098952960b248,6f91a456f15385e0c713bf52e99249b7679222e8,97764aca73b79d78f8544cb2d6355501efcd0d2f,,True,True,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Tests_passed,138260e0ef7fb7cebe0f1d9e127da546ec05033e2ef378c0e6b2dfbcdd24f6b4,Tests_passed,True,True,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,fdc664cc4a91f8f1cb3544734bd9e1d197be6f242e2f303e3e3bc78e1dfc0197,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,62bd2232d3683b27ad070bd1d3fdb925b44c72172b5d678c90719c0f7520441c,Merge_failed,62bd2232d3683b27ad070bd1d3fdb925b44c72172b5d678c90719c0f7520441c,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,de65cc873cd172aef52247335ab474571833c1d47551cd906f1afc5a3f1fb7de,0.00970315933227539,0.009860515594482422,0.009824514389038086,0.010242700576782227,0.009905815124511719,0.009815454483032227,0.009597301483154297,0.06370282173156738,0.015522003173828125,0.36664557456970215,0.3671751022338867,0.1849057674407959,2.5425896644592285,0.16602230072021484 +66,refs/heads/main,981e0311705b2f83cabb82c9c9e098952960b248,6f91a456f15385e0c713bf52e99249b7679222e8,97764aca73b79d78f8544cb2d6355501efcd0d2f,,True,True,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Tests_passed,138260e0ef7fb7cebe0f1d9e127da546ec05033e2ef378c0e6b2dfbcdd24f6b4,Tests_passed,True,True,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,fdc664cc4a91f8f1cb3544734bd9e1d197be6f242e2f303e3e3bc78e1dfc0197,Merge_failed,3a7a63b8d4f75586030fb6d6cc04aa6cb9a048760bfe2086f6699d3e014c5891,Merge_failed,62bd2232d3683b27ad070bd1d3fdb925b44c72172b5d678c90719c0f7520441c,Merge_failed,62bd2232d3683b27ad070bd1d3fdb925b44c72172b5d678c90719c0f7520441c,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,de65cc873cd172aef52247335ab474571833c1d47551cd906f1afc5a3f1fb7de,0.00970315933227539,0.009860515594482422,0.009824514389038086,0.010242700576782227,0.009905815124511719,0.009815454483032227,0.009597301483154297,0.06370282173156738,0.015522003173828125,0.36469364166259766,0.3618907928466797,0.1849057674407959,2.5425896644592285,0.16602230072021484 diff --git a/results/combined/merges_timed/basho/riak-java-client.csv b/results/combined/merges_timed/basho/riak-java-client.csv index 48a513a5f5..901975b8e4 100644 --- a/results/combined/merges_timed/basho/riak-java-client.csv +++ b/results/combined/merges_timed/basho/riak-java-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/develop,1cf7c917508a69d5ea12f3d5bebc3dab5984be23,e1c33ec9de33e6b395401183c18c60da5cad31a2,15da081ff85e6c899184b619b4bf87bb0728f4ea,,True,True,3a228fafc2b902172c56310aa0b7e8b212d2ed676d56ca388c381af7c7be9baa,Tests_passed,8e3ba0cef7564135f171ddbe9b22eaec0c0f9aa01a6af618ec8b2bf6b34231f1,Tests_passed,True,True,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,0.011985540390014648,0.011957406997680664,0.013340473175048828,0.013225317001342773,0.013278961181640625,0.013298749923706055,0.01287078857421875,0.039090633392333984,0.012091398239135742,0.17079734802246094,0.1706376075744629,0.06747055053710938,0.01540827751159668,0.2512471675872803 +31,refs/heads/develop,1cf7c917508a69d5ea12f3d5bebc3dab5984be23,e1c33ec9de33e6b395401183c18c60da5cad31a2,15da081ff85e6c899184b619b4bf87bb0728f4ea,,True,True,3a228fafc2b902172c56310aa0b7e8b212d2ed676d56ca388c381af7c7be9baa,Tests_passed,8e3ba0cef7564135f171ddbe9b22eaec0c0f9aa01a6af618ec8b2bf6b34231f1,Tests_passed,True,True,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,0.011985540390014648,0.011957406997680664,0.013340473175048828,0.013225317001342773,0.013278961181640625,0.013298749923706055,0.01287078857421875,0.039090633392333984,0.012091398239135742,0.16857409477233887,0.17588448524475098,0.06747055053710938,0.01540827751159668,0.2512471675872803 diff --git a/results/combined/merges_timed/bastillion-io/bastillion.csv b/results/combined/merges_timed/bastillion-io/bastillion.csv index 404cb99819..61819779af 100644 --- a/results/combined/merges_timed/bastillion-io/bastillion.csv +++ b/results/combined/merges_timed/bastillion-io/bastillion.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -98,refs/heads/master,551ae81d94b8f29f3486edf9ad1ec1be6fcfce9a,7e750d65b7f1c02c4ef6385771f2f6e5e2b81435,f3905553e7070af1bf784b42768c5b17851f260d,,True,True,bca3bc493b1a6821783af8694930392bae15267ef01ad6054af27ac16f3bd91b,Tests_passed,c33868eaa3a409f8b45e70e249c9d46d0e51a545dc44530e7241c3e25fa78c01,Tests_passed,True,True,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,0.040569305419921875,0.020774126052856445,0.040750741958618164,0.031053781509399414,0.0456082820892334,0.07231497764587402,0.021005868911743164,0.13183975219726562,0.0232546329498291,0.1616971492767334,0.17140507698059082,0.12875866889953613,1.1734318733215332,0.2192704677581787 +98,refs/heads/master,551ae81d94b8f29f3486edf9ad1ec1be6fcfce9a,7e750d65b7f1c02c4ef6385771f2f6e5e2b81435,f3905553e7070af1bf784b42768c5b17851f260d,,True,True,bca3bc493b1a6821783af8694930392bae15267ef01ad6054af27ac16f3bd91b,Tests_passed,c33868eaa3a409f8b45e70e249c9d46d0e51a545dc44530e7241c3e25fa78c01,Tests_passed,True,True,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,0.040569305419921875,0.020774126052856445,0.040750741958618164,0.031053781509399414,0.0456082820892334,0.07231497764587402,0.021005868911743164,0.13183975219726562,0.0232546329498291,0.1643075942993164,0.16906285285949707,0.12875866889953613,1.1734318733215332,0.2192704677581787 diff --git a/results/combined/merges_timed/bazhenov/load-test-tool.csv b/results/combined/merges_timed/bazhenov/load-test-tool.csv index 57c7d2e97d..09244fc096 100644 --- a/results/combined/merges_timed/bazhenov/load-test-tool.csv +++ b/results/combined/merges_timed/bazhenov/load-test-tool.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,6593812db93b89deb415cd4e2728baf690b38487,34d51cd87873b3239c3fc65ee88f35468a23baea,63a868bfc12d00d726e6ecba2fd9be1b5ae29584,,True,True,313f0c1ddaba97cbd2d795a390befa7e6f00f21d58ea17e4df27dd46c40a7328,Tests_passed,2394e1e6dba97558969834a69f14bb27c1062dfdd27c67cb2d4c5a418e1c0d68,Tests_passed,True,True,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,ead356baef18eb94975767454fdc555baa489ecb7ca94e1acea0b3ddd919d8cc,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,245ed20c9f255c08287fb54f0e15feac1ca748780b0fe4c935ab93ec4999e629,Merge_failed,245ed20c9f255c08287fb54f0e15feac1ca748780b0fe4c935ab93ec4999e629,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Merge_failed,6489e797c1e42577f9916a24267c334499eb6b5e2ce35a0676c82b1acd210984,0.038123130798339844,0.0391240119934082,0.03932833671569824,0.030520915985107422,0.036347389221191406,0.04111480712890625,0.04415750503540039,0.17374277114868164,0.05616450309753418,0.06333708763122559,0.06354331970214844,0.1041419506072998,0.44814300537109375,0.20958542823791504 +9,refs/heads/master,6593812db93b89deb415cd4e2728baf690b38487,34d51cd87873b3239c3fc65ee88f35468a23baea,63a868bfc12d00d726e6ecba2fd9be1b5ae29584,,True,True,313f0c1ddaba97cbd2d795a390befa7e6f00f21d58ea17e4df27dd46c40a7328,Tests_passed,2394e1e6dba97558969834a69f14bb27c1062dfdd27c67cb2d4c5a418e1c0d68,Tests_passed,True,True,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,ead356baef18eb94975767454fdc555baa489ecb7ca94e1acea0b3ddd919d8cc,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,245ed20c9f255c08287fb54f0e15feac1ca748780b0fe4c935ab93ec4999e629,Merge_failed,245ed20c9f255c08287fb54f0e15feac1ca748780b0fe4c935ab93ec4999e629,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Merge_failed,6489e797c1e42577f9916a24267c334499eb6b5e2ce35a0676c82b1acd210984,0.038123130798339844,0.0391240119934082,0.03932833671569824,0.030520915985107422,0.036347389221191406,0.04111480712890625,0.04415750503540039,0.17374277114868164,0.05616450309753418,0.06343936920166016,0.06296849250793457,0.1041419506072998,0.44814300537109375,0.20958542823791504 diff --git a/results/combined/merges_timed/beastmachine/ggplot.csv b/results/combined/merges_timed/beastmachine/ggplot.csv index 6f0fde1736..9afed623c0 100644 --- a/results/combined/merges_timed/beastmachine/ggplot.csv +++ b/results/combined/merges_timed/beastmachine/ggplot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,e2841b05bab86e238732649229f3d0a2834badf7,5a94ad6e32c8175745c301c900a3184e83a6923c,ff2ab22bcb56d13c130004d312f0b56efd1f8ed2,,True,True,a035e7a19867b9a5062fb37a9524b4745247c17f6f566cb42d5608cbf1931a4a,Tests_passed,0bb57dafc5ba5a54fa0b5aa060883bf862b8914b0dad133ed974d232eddfc10d,Tests_passed,True,True,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,5e97975fa1ee062883fd625d36db6d0bf983a6951ddf50184661022b30b45348,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,643b7029bf9bf2074d05436ce909442c44a6f59beab138f8f9cce39a0b12bd63,Merge_failed,643b7029bf9bf2074d05436ce909442c44a6f59beab138f8f9cce39a0b12bd63,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Merge_failed,0b2768af298c210498cea09a0e865c78b8ce057e7935d4af0fdb646ec5436b6d,0.03054642677307129,0.038384437561035156,0.04659891128540039,0.038292646408081055,0.03882455825805664,0.04100322723388672,0.032270193099975586,0.16979598999023438,0.059638023376464844,0.0852813720703125,0.08381032943725586,0.10570454597473145,0.5409183502197266,0.19081521034240723 +9,refs/heads/master,e2841b05bab86e238732649229f3d0a2834badf7,5a94ad6e32c8175745c301c900a3184e83a6923c,ff2ab22bcb56d13c130004d312f0b56efd1f8ed2,,True,True,a035e7a19867b9a5062fb37a9524b4745247c17f6f566cb42d5608cbf1931a4a,Tests_passed,0bb57dafc5ba5a54fa0b5aa060883bf862b8914b0dad133ed974d232eddfc10d,Tests_passed,True,True,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,5e97975fa1ee062883fd625d36db6d0bf983a6951ddf50184661022b30b45348,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,643b7029bf9bf2074d05436ce909442c44a6f59beab138f8f9cce39a0b12bd63,Merge_failed,643b7029bf9bf2074d05436ce909442c44a6f59beab138f8f9cce39a0b12bd63,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Merge_failed,0b2768af298c210498cea09a0e865c78b8ce057e7935d4af0fdb646ec5436b6d,0.03054642677307129,0.038384437561035156,0.04659891128540039,0.038292646408081055,0.03882455825805664,0.04100322723388672,0.032270193099975586,0.16979598999023438,0.059638023376464844,0.08479619026184082,0.08497762680053711,0.10570454597473145,0.5409183502197266,0.19081521034240723 diff --git a/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv b/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv index f6aee030ad..d46c144e00 100644 --- a/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv +++ b/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/remotes/origin/pull/5,1416f1af0698abdf85fed9076cf00896f176f3a8,980366ecfc5b313f23e9032c2cd766bd1905f777,9f80c5c8e0ca843d54cc23fcb5769a824f0b0ff7,,a33534485efef0da7fa4ea4fb639e0acc16c6eea5069a81db41d5ba044c136af,Tests_passed,d1c22d1dc041af25a27710c793a4d2bf9c5ed4681c3df27570e7dbcc08bd456d,Tests_passed,True,True,True,True,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,968bb12f289d19b4414b2813b7da496169482442b4c39b9a65a13a5cc77cbe3b,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,edffcd981c0e68a2ade91793e5b72eef1c214ab4fa27625842c1195fcada14bb,Merge_failed,edffcd981c0e68a2ade91793e5b72eef1c214ab4fa27625842c1195fcada14bb,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Merge_failed,192900d47c1fb61b40d8347766e02bd2514bf419e2e9c023292ebb1fa167890f,0.030667781829833984,0.03727364540100098,0.03853106498718262,0.036594390869140625,0.03143477439880371,0.03269243240356445,0.03667092323303223,0.16221332550048828,0.062401533126831055,0.06188154220581055,0.06179404258728027,0.10513496398925781,0.7702414989471436,0.18156719207763672 +5,refs/remotes/origin/pull/5,1416f1af0698abdf85fed9076cf00896f176f3a8,980366ecfc5b313f23e9032c2cd766bd1905f777,9f80c5c8e0ca843d54cc23fcb5769a824f0b0ff7,,a33534485efef0da7fa4ea4fb639e0acc16c6eea5069a81db41d5ba044c136af,Tests_passed,d1c22d1dc041af25a27710c793a4d2bf9c5ed4681c3df27570e7dbcc08bd456d,Tests_passed,True,True,True,True,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,968bb12f289d19b4414b2813b7da496169482442b4c39b9a65a13a5cc77cbe3b,Merge_failed,d65b7db77f703f35c0092acce93d75efe6af5c416af9666a6b9f5f4cfcbb4273,Merge_failed,edffcd981c0e68a2ade91793e5b72eef1c214ab4fa27625842c1195fcada14bb,Merge_failed,edffcd981c0e68a2ade91793e5b72eef1c214ab4fa27625842c1195fcada14bb,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Merge_failed,192900d47c1fb61b40d8347766e02bd2514bf419e2e9c023292ebb1fa167890f,0.030667781829833984,0.03727364540100098,0.03853106498718262,0.036594390869140625,0.03143477439880371,0.03269243240356445,0.03667092323303223,0.16221332550048828,0.062401533126831055,0.062047481536865234,0.06178164482116699,0.10513496398925781,0.7702414989471436,0.18156719207763672 diff --git a/results/combined/merges_timed/benas/easy-rules.csv b/results/combined/merges_timed/benas/easy-rules.csv index 3aa1b29449..99026d682f 100644 --- a/results/combined/merges_timed/benas/easy-rules.csv +++ b/results/combined/merges_timed/benas/easy-rules.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/remotes/origin/pull/289,cc5de266d34bd622580059ef5de52d5e893c0b53,1967db34f27494adfbe443337a240891e96b50ad,b888b85119db7adde3d9399c9d9bd1d0079731f4,,eda46100da055b1844a4bb18f2c5adad510930c2928460d2396afb8993500409,Tests_passed,ec8d986848f0c9e3b88548412c1332df3652820cb9578caf1cbb418bc0636e30,Tests_passed,True,True,True,True,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,939e742feb2e4ac103c01ca89159148d47e4c75c9f6e38dc2ee5ad5ef4ac20f5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,6b74d89ec215ba028ff32dceefca745622fe8e67f33a103d2c25b547cce289de,Merge_failed,6b74d89ec215ba028ff32dceefca745622fe8e67f33a103d2c25b547cce289de,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,3224e89bf539864fdab90426d1e7b9278e4da378a0b8e4aa736996733df48d33,0.028174638748168945,0.029384136199951172,0.041097164154052734,0.030654191970825195,0.04118204116821289,0.04319357872009277,0.034900665283203125,0.2266981601715088,0.06567502021789551,0.12444019317626953,0.12367987632751465,0.14893174171447754,1.179353952407837,0.20650005340576172 +32,refs/remotes/origin/pull/289,cc5de266d34bd622580059ef5de52d5e893c0b53,1967db34f27494adfbe443337a240891e96b50ad,b888b85119db7adde3d9399c9d9bd1d0079731f4,,eda46100da055b1844a4bb18f2c5adad510930c2928460d2396afb8993500409,Tests_passed,ec8d986848f0c9e3b88548412c1332df3652820cb9578caf1cbb418bc0636e30,Tests_passed,True,True,True,True,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,939e742feb2e4ac103c01ca89159148d47e4c75c9f6e38dc2ee5ad5ef4ac20f5,Merge_failed,e5de653ab9a97e86ab48786445b87e28d791da4ddde2a7dbdb078330dee640c5,Merge_failed,6b74d89ec215ba028ff32dceefca745622fe8e67f33a103d2c25b547cce289de,Merge_failed,6b74d89ec215ba028ff32dceefca745622fe8e67f33a103d2c25b547cce289de,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,3224e89bf539864fdab90426d1e7b9278e4da378a0b8e4aa736996733df48d33,0.028174638748168945,0.029384136199951172,0.041097164154052734,0.030654191970825195,0.04118204116821289,0.04319357872009277,0.034900665283203125,0.2266981601715088,0.06567502021789551,0.12411880493164062,0.12297654151916504,0.14893174171447754,1.179353952407837,0.20650005340576172 diff --git a/results/combined/merges_timed/benas/projector.csv b/results/combined/merges_timed/benas/projector.csv index 9c2b691bb2..d87017f35c 100644 --- a/results/combined/merges_timed/benas/projector.csv +++ b/results/combined/merges_timed/benas/projector.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,f088b5c59aefe6966218d6af783f02ec7508a6c6,a127d12133d0f2e3def0d99a999250ab6ed5d77a,52020bf4c023f00a76086ddd3b6f0a48eb69606f,,d81081af6ef3c25acc3e63a9b8bd3c26de150dd9010cb876f5751813fbee2e7a,Tests_passed,c0c421cf9772eb05bde93d2d847ca3788a3e5bdb65b5d4e9af1eea167d4a13bb,Tests_passed,True,True,True,True,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,b77ec165ba3526546a4b76eddd037b5a0e0541258c5bdd154373473128cbaf53,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,8ea8314c66d21214c4b665c125e3c5dcd8e0bf830a4451ae7e2b916106a2e4c3,0.009256601333618164,0.008911848068237305,0.009033203125,0.008839845657348633,0.009224653244018555,0.009671926498413086,0.009168624877929688,0.05839204788208008,0.01381826400756836,0.43353891372680664,0.4364151954650879,0.17456793785095215,1.5798366069793701,0.1792900562286377 +2,refs/heads/master,f088b5c59aefe6966218d6af783f02ec7508a6c6,a127d12133d0f2e3def0d99a999250ab6ed5d77a,52020bf4c023f00a76086ddd3b6f0a48eb69606f,,d81081af6ef3c25acc3e63a9b8bd3c26de150dd9010cb876f5751813fbee2e7a,Tests_passed,c0c421cf9772eb05bde93d2d847ca3788a3e5bdb65b5d4e9af1eea167d4a13bb,Tests_passed,True,True,True,True,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,b77ec165ba3526546a4b76eddd037b5a0e0541258c5bdd154373473128cbaf53,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,8ea8314c66d21214c4b665c125e3c5dcd8e0bf830a4451ae7e2b916106a2e4c3,0.009256601333618164,0.008911848068237305,0.009033203125,0.008839845657348633,0.009224653244018555,0.009671926498413086,0.009168624877929688,0.05839204788208008,0.01381826400756836,0.43671202659606934,0.4396393299102783,0.17456793785095215,1.5798366069793701,0.1792900562286377 diff --git a/results/combined/merges_timed/benoker/dockingframes.csv b/results/combined/merges_timed/benoker/dockingframes.csv index 2b6dbde2c8..bcf748ea0c 100644 --- a/results/combined/merges_timed/benoker/dockingframes.csv +++ b/results/combined/merges_timed/benoker/dockingframes.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -85,refs/heads/master,c3dfb4ebbfeb49d09b88c8aefaa07183eb0fa06f,a290c6b19c9e7efaa8a780d9c97e2d6173b69b09,de608ff664a7df506839703b09a98b6f21d41491,,True,True,1bec92ba3e6acc88f87f589e9ba1b941f49efbcf9023abcafc424da963573e79,Tests_passed,9143dea5299555abf5e5e88b9862399b8bd701f9def2b8782fc3b4fa6aaee830,Tests_passed,True,True,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,c30f0f27044f6f3252be16893f01707519fa4f0f7c62921cccaf0b72568ee680,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,bc1f170650e1f84ad34d96f427575c56e42410bfbfd9fcd0a3e39bff049cd76f,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,6e5ba5adb97d1df0f3736952449a85f2d00d52628df1502ec0524b8aaf90d998,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,35c6423ebf01b3fdb86da19b8aa096d7afc68c556aade73115ede20621418644,Merge_failed,35c6423ebf01b3fdb86da19b8aa096d7afc68c556aade73115ede20621418644,Merge_failed,93346f18f3ed0b973082c6522d6f4c0c2024345903690025d4d31ad8dc89f7da,Tests_passed,9ce8d61148439f447ec45a2e66e2eb4725a57d8fd8ad3a676df2d6b0b0699bb0,Merge_failed,93cd0edb105b152fa9cd12fe2ca85bede045d82d8be90eb243c6477fc4d540c5,0.016859054565429688,0.0172269344329834,0.018302202224731445,0.018278121948242188,0.018211841583251953,0.017676591873168945,0.018522262573242188,0.07827520370483398,0.04343533515930176,0.15660357475280762,0.14642858505249023,0.13207769393920898,3.0810937881469727,0.34377384185791016 +85,refs/heads/master,c3dfb4ebbfeb49d09b88c8aefaa07183eb0fa06f,a290c6b19c9e7efaa8a780d9c97e2d6173b69b09,de608ff664a7df506839703b09a98b6f21d41491,,True,True,1bec92ba3e6acc88f87f589e9ba1b941f49efbcf9023abcafc424da963573e79,Tests_passed,9143dea5299555abf5e5e88b9862399b8bd701f9def2b8782fc3b4fa6aaee830,Tests_passed,True,True,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,c30f0f27044f6f3252be16893f01707519fa4f0f7c62921cccaf0b72568ee680,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,bc1f170650e1f84ad34d96f427575c56e42410bfbfd9fcd0a3e39bff049cd76f,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,6e5ba5adb97d1df0f3736952449a85f2d00d52628df1502ec0524b8aaf90d998,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,35c6423ebf01b3fdb86da19b8aa096d7afc68c556aade73115ede20621418644,Merge_failed,35c6423ebf01b3fdb86da19b8aa096d7afc68c556aade73115ede20621418644,Merge_failed,93346f18f3ed0b973082c6522d6f4c0c2024345903690025d4d31ad8dc89f7da,Tests_passed,9ce8d61148439f447ec45a2e66e2eb4725a57d8fd8ad3a676df2d6b0b0699bb0,Merge_failed,93cd0edb105b152fa9cd12fe2ca85bede045d82d8be90eb243c6477fc4d540c5,0.016859054565429688,0.0172269344329834,0.018302202224731445,0.018278121948242188,0.018211841583251953,0.017676591873168945,0.018522262573242188,0.07827520370483398,0.04343533515930176,0.1355428695678711,0.1467747688293457,0.13207769393920898,3.0810937881469727,0.34377384185791016 diff --git a/results/combined/merges_timed/bguerout/jongo.csv b/results/combined/merges_timed/bguerout/jongo.csv index 27f9be95fa..33fab1f604 100644 --- a/results/combined/merges_timed/bguerout/jongo.csv +++ b/results/combined/merges_timed/bguerout/jongo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,697fc67ed565bbaf3b67d4ad5e8a19ca8c09e90c,468ca36d2cbf8216f91c3543aa60be4254469479,bdcc9aaa22f9470ce4d424736aabbc49c4857931,,8d773af9214d52f12790ff4fb133e81df8c5699668bcd88742e1f3e4d58cf2a6,Tests_passed,b2ca0ce4f00d3864211e434312373e07b732d8165795867063ce1b92f1608d1f,Tests_passed,True,True,True,True,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,66fa138715da91ad3cf66ad630f7f802be219a1eb22b26b9e566f1441be65997,Merge_failed,66fa138715da91ad3cf66ad630f7f802be219a1eb22b26b9e566f1441be65997,Merge_failed,66fa138715da91ad3cf66ad630f7f802be219a1eb22b26b9e566f1441be65997,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,296a412eaf93d429c9cca59047c146bcb79d1045ada80a5e37f1658aa065fa60,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,671f373fb24e20b17cf50c18590ecc9adcda5630a678074d4f764424e1e69d44,Merge_failed,671f373fb24e20b17cf50c18590ecc9adcda5630a678074d4f764424e1e69d44,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,2f44c4684153cba4983fe6526cce452b0a5eae01d0b6c8e637c5207ea84d2115,0.055085182189941406,0.05562114715576172,0.04331183433532715,0.04566669464111328,0.05116462707519531,0.05127429962158203,0.04306507110595703,0.30126404762268066,0.06382489204406738,0.3881874084472656,0.3873143196105957,0.20873570442199707,2.37990665435791,0.22999119758605957 +5,refs/heads/master,697fc67ed565bbaf3b67d4ad5e8a19ca8c09e90c,468ca36d2cbf8216f91c3543aa60be4254469479,bdcc9aaa22f9470ce4d424736aabbc49c4857931,,8d773af9214d52f12790ff4fb133e81df8c5699668bcd88742e1f3e4d58cf2a6,Tests_passed,b2ca0ce4f00d3864211e434312373e07b732d8165795867063ce1b92f1608d1f,Tests_passed,True,True,True,True,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,66fa138715da91ad3cf66ad630f7f802be219a1eb22b26b9e566f1441be65997,Merge_failed,66fa138715da91ad3cf66ad630f7f802be219a1eb22b26b9e566f1441be65997,Merge_failed,66fa138715da91ad3cf66ad630f7f802be219a1eb22b26b9e566f1441be65997,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,296a412eaf93d429c9cca59047c146bcb79d1045ada80a5e37f1658aa065fa60,Merge_failed,b9c67b17e01022aec7d6748552b94ffa82c76a6c1c0f2678a6134b0847081e9e,Merge_failed,671f373fb24e20b17cf50c18590ecc9adcda5630a678074d4f764424e1e69d44,Merge_failed,671f373fb24e20b17cf50c18590ecc9adcda5630a678074d4f764424e1e69d44,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,2f44c4684153cba4983fe6526cce452b0a5eae01d0b6c8e637c5207ea84d2115,0.055085182189941406,0.05562114715576172,0.04331183433532715,0.04566669464111328,0.05116462707519531,0.05127429962158203,0.04306507110595703,0.30126404762268066,0.06382489204406738,0.38620901107788086,0.3849630355834961,0.20873570442199707,2.37990665435791,0.22999119758605957 diff --git a/results/combined/merges_timed/biezhi/30-seconds-of-java8.csv b/results/combined/merges_timed/biezhi/30-seconds-of-java8.csv index 0ee991a2eb..edfe5c85cb 100644 --- a/results/combined/merges_timed/biezhi/30-seconds-of-java8.csv +++ b/results/combined/merges_timed/biezhi/30-seconds-of-java8.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/remotes/origin/pull/7,6b515ec5c78bdea3f3175bc443ad871d41a8eccf,d05e3e39138170814f8a101fd86262cb733095ba,598ae2a3ef829753d509b68e862eeb3a2f19ccff,,83a2f4ff2e6006ae3321d232c58910d1406919bd0173b4d99a2844d1386d13db,Tests_passed,cf2784b3400dd3de9b1f1f17422b4c7679bff904c41e0cc9748f03bd1f37d695,Tests_passed,True,True,True,True,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,aecc17bc717623a21984d3b3e27ed054c58492c0002ecbfb4b744d531573194d,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,57a2703de4d410b84f8440e1ccb99ae48e8c62587b1db175dd0e8c466be80b7f,Merge_failed,57a2703de4d410b84f8440e1ccb99ae48e8c62587b1db175dd0e8c466be80b7f,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Merge_failed,e5a7d2fb1d2c8912db8c839061974303a03845a5d691428e6a93f8e7a5227a89,0.04017519950866699,0.0380709171295166,0.039852142333984375,0.03662991523742676,0.0381929874420166,0.03687429428100586,0.037882089614868164,0.16466546058654785,0.060738325119018555,0.07364797592163086,0.06412029266357422,0.11150431632995605,1.436072587966919,0.17769217491149902 +1,refs/remotes/origin/pull/7,6b515ec5c78bdea3f3175bc443ad871d41a8eccf,d05e3e39138170814f8a101fd86262cb733095ba,598ae2a3ef829753d509b68e862eeb3a2f19ccff,,83a2f4ff2e6006ae3321d232c58910d1406919bd0173b4d99a2844d1386d13db,Tests_passed,cf2784b3400dd3de9b1f1f17422b4c7679bff904c41e0cc9748f03bd1f37d695,Tests_passed,True,True,True,True,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,aecc17bc717623a21984d3b3e27ed054c58492c0002ecbfb4b744d531573194d,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,57a2703de4d410b84f8440e1ccb99ae48e8c62587b1db175dd0e8c466be80b7f,Merge_failed,57a2703de4d410b84f8440e1ccb99ae48e8c62587b1db175dd0e8c466be80b7f,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Merge_failed,e5a7d2fb1d2c8912db8c839061974303a03845a5d691428e6a93f8e7a5227a89,0.04017519950866699,0.0380709171295166,0.039852142333984375,0.03662991523742676,0.0381929874420166,0.03687429428100586,0.037882089614868164,0.16466546058654785,0.060738325119018555,0.06453299522399902,0.07380485534667969,0.11150431632995605,1.436072587966919,0.17769217491149902 diff --git a/results/combined/merges_timed/bitletorg/weupnp.csv b/results/combined/merges_timed/bitletorg/weupnp.csv index f0061f2c88..d8067da28f 100644 --- a/results/combined/merges_timed/bitletorg/weupnp.csv +++ b/results/combined/merges_timed/bitletorg/weupnp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/remotes/origin/pull/1,9054d6dff4032b41ba55d23678931497ff2af75a,5c19ff9fed515e83b86f15acb8d095b2f5e0cf5e,14664d548c67775a219b9a863e67e51242bd5bac,,True,True,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Tests_passed,e7e462d1ff0dd4d1ea6665e84491d4ec1e7d574a1d6de93cea91575b36300290,Tests_passed,True,True,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Merge_failed,544a0c9f608e0d7469bd8da87993d4b7819aad0fda90a230850b1979916fda72,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Merge_failed,80c397ac5a2722777461999fd0fe3bd324ef75c2cae7ba67210d57fdb047d888,Merge_failed,80c397ac5a2722777461999fd0fe3bd324ef75c2cae7ba67210d57fdb047d888,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Merge_failed,fc675e4a76e3b04b0bfe4d0a14370ec069a8da829d62c6c7a1e71cc8b03378bb,0.0402216911315918,0.043372154235839844,0.04049539566040039,0.04208564758300781,0.03528904914855957,0.03667640686035156,0.03760385513305664,0.055582284927368164,0.06680607795715332,0.06495404243469238,0.0644373893737793,0.11000323295593262,0.781761646270752,0.18247342109680176 +8,refs/remotes/origin/pull/1,9054d6dff4032b41ba55d23678931497ff2af75a,5c19ff9fed515e83b86f15acb8d095b2f5e0cf5e,14664d548c67775a219b9a863e67e51242bd5bac,,True,True,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Tests_passed,e7e462d1ff0dd4d1ea6665e84491d4ec1e7d574a1d6de93cea91575b36300290,Tests_passed,True,True,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Merge_failed,544a0c9f608e0d7469bd8da87993d4b7819aad0fda90a230850b1979916fda72,Merge_failed,8b8e612cd1c77b7a884578e23fdba65fa5736e5f7a3b7383ef34cdaa993bdf57,Merge_failed,80c397ac5a2722777461999fd0fe3bd324ef75c2cae7ba67210d57fdb047d888,Merge_failed,80c397ac5a2722777461999fd0fe3bd324ef75c2cae7ba67210d57fdb047d888,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Merge_failed,fc675e4a76e3b04b0bfe4d0a14370ec069a8da829d62c6c7a1e71cc8b03378bb,0.0402216911315918,0.043372154235839844,0.04049539566040039,0.04208564758300781,0.03528904914855957,0.03667640686035156,0.03760385513305664,0.055582284927368164,0.06680607795715332,0.06352400779724121,0.06392312049865723,0.11000323295593262,0.781761646270752,0.18247342109680176 diff --git a/results/combined/merges_timed/bitzeche/zencoder-java.csv b/results/combined/merges_timed/bitzeche/zencoder-java.csv index e5a3a95152..090e05258d 100644 --- a/results/combined/merges_timed/bitzeche/zencoder-java.csv +++ b/results/combined/merges_timed/bitzeche/zencoder-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,116a8e2fb219900072f36ac16320fbbe459cac03,4a25777e403cce64e4e0b44006380f932d85843c,81aff4a5655d87bab53885f736501b0d1c3aa23b,,10cfd377843a748955e24ef91b8f18e075813dcd815d591e1f9cd23fa43460fb,Tests_passed,e2fe6d4f35b12ce12831cd97bf9bfbb0ea6f638acc787c9088baff9554d26440,Tests_passed,True,True,True,True,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,0.04459547996520996,0.047368526458740234,0.04953765869140625,0.04426455497741699,0.04794049263000488,0.043209075927734375,0.037962913513183594,0.16820240020751953,0.0384366512298584,0.16084694862365723,0.1631486415863037,0.11035466194152832,1.056281566619873,0.19806909561157227 +10,refs/heads/master,116a8e2fb219900072f36ac16320fbbe459cac03,4a25777e403cce64e4e0b44006380f932d85843c,81aff4a5655d87bab53885f736501b0d1c3aa23b,,10cfd377843a748955e24ef91b8f18e075813dcd815d591e1f9cd23fa43460fb,Tests_passed,e2fe6d4f35b12ce12831cd97bf9bfbb0ea6f638acc787c9088baff9554d26440,Tests_passed,True,True,True,True,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,0.04459547996520996,0.047368526458740234,0.04953765869140625,0.04426455497741699,0.04794049263000488,0.043209075927734375,0.037962913513183594,0.16820240020751953,0.0384366512298584,0.15869498252868652,0.15824270248413086,0.11035466194152832,1.056281566619873,0.19806909561157227 diff --git a/results/combined/merges_timed/bjornharrtell/jts2geojson.csv b/results/combined/merges_timed/bjornharrtell/jts2geojson.csv index 1bd1618cc4..bc304403db 100644 --- a/results/combined/merges_timed/bjornharrtell/jts2geojson.csv +++ b/results/combined/merges_timed/bjornharrtell/jts2geojson.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/master,afbe2cdddd2d776744547752f820f0d8c03ad755,f190b3781a786d8102f986dd5246cdbf3652b8a6,bfe0f485963079579c710e12acd36d34971c775b,,True,True,e1d3a06eeb005ef9624875d7442754e74c46d02dd642a54a0ea7464fb57121a3,Tests_passed,136350a3b76cae98a566f5af6ff93532df288ba825c498edf98e528f3b48e9c8,Tests_passed,True,True,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,0.04346346855163574,0.04460644721984863,0.042308807373046875,0.04250955581665039,0.04329204559326172,0.044895172119140625,0.03903460502624512,0.22295856475830078,0.04403209686279297,0.1440262794494629,0.1442255973815918,0.16607904434204102,0.6618447303771973,0.2032155990600586 +17,refs/heads/master,afbe2cdddd2d776744547752f820f0d8c03ad755,f190b3781a786d8102f986dd5246cdbf3652b8a6,bfe0f485963079579c710e12acd36d34971c775b,,True,True,e1d3a06eeb005ef9624875d7442754e74c46d02dd642a54a0ea7464fb57121a3,Tests_passed,136350a3b76cae98a566f5af6ff93532df288ba825c498edf98e528f3b48e9c8,Tests_passed,True,True,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,0.04346346855163574,0.04460644721984863,0.042308807373046875,0.04250955581665039,0.04329204559326172,0.044895172119140625,0.03903460502624512,0.22295856475830078,0.04403209686279297,0.14142370223999023,0.14144563674926758,0.16607904434204102,0.6618447303771973,0.2032155990600586 diff --git a/results/combined/merges_timed/blockchain/api-v1-client-java.csv b/results/combined/merges_timed/blockchain/api-v1-client-java.csv index 316f4ff10f..9b6edd181d 100644 --- a/results/combined/merges_timed/blockchain/api-v1-client-java.csv +++ b/results/combined/merges_timed/blockchain/api-v1-client-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/remotes/origin/pull/36,e349598f954da532e51825f2580948d63d0bb743,3fb6d582999cfd32ce450a5f7bede6ad3704d08b,14d5560b04fd84ba9c4173b6669a2b7d90354adf,,True,True,982ba1f18069e4e35900310214fc89dc60d0a05e75a76a6a49418e765fe69b07,Tests_passed,326c8c78ad07281d3f66c30b76d818499470888fadc5bd7b219393c46446bf14,Tests_passed,True,True,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,8bf5c56890ce0c78978c8fa3dcb7f88cad797dda16517b779135ef400965a0c1,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,eca512c4a4aa5ce38d593807f866a7c9165cf767706d7736c8f08125c10e17b6,Merge_failed,eca512c4a4aa5ce38d593807f866a7c9165cf767706d7736c8f08125c10e17b6,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Merge_failed,f4f6b85ec8683973fca3e52b2b500d973e520683860742a4940610d553904665,0.037313222885131836,0.03557729721069336,0.039875030517578125,0.039427757263183594,0.044836997985839844,0.04068183898925781,0.03649425506591797,0.1635890007019043,0.06323647499084473,0.0639193058013916,0.06390857696533203,0.09402608871459961,0.6908097267150879,0.19423198699951172 +10,refs/remotes/origin/pull/36,e349598f954da532e51825f2580948d63d0bb743,3fb6d582999cfd32ce450a5f7bede6ad3704d08b,14d5560b04fd84ba9c4173b6669a2b7d90354adf,,True,True,982ba1f18069e4e35900310214fc89dc60d0a05e75a76a6a49418e765fe69b07,Tests_passed,326c8c78ad07281d3f66c30b76d818499470888fadc5bd7b219393c46446bf14,Tests_passed,True,True,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,8bf5c56890ce0c78978c8fa3dcb7f88cad797dda16517b779135ef400965a0c1,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,eca512c4a4aa5ce38d593807f866a7c9165cf767706d7736c8f08125c10e17b6,Merge_failed,eca512c4a4aa5ce38d593807f866a7c9165cf767706d7736c8f08125c10e17b6,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Merge_failed,f4f6b85ec8683973fca3e52b2b500d973e520683860742a4940610d553904665,0.037313222885131836,0.03557729721069336,0.039875030517578125,0.039427757263183594,0.044836997985839844,0.04068183898925781,0.03649425506591797,0.1635890007019043,0.06323647499084473,0.06318473815917969,0.06327676773071289,0.09402608871459961,0.6908097267150879,0.19423198699951172 diff --git a/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv b/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv index 726740bd9e..ae4c4d4ffa 100644 --- a/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv +++ b/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,46f2d8d50ae406cbf93855eb99b88e0fe9003454,91c92ad05f63c8e1b472f6d9e0164eb92537e03f,5cd4602a8d657cccbf97ea489eea519446c0e401,,8a7c2669ed7f66932c02dc0b26f2d9d5a0da8b3faadfc49a32f034b3c1ad6611,Tests_passed,434ad22f00ca5015e85fdea7ceb5d67365a5eefa83ef8620dfe92cc2fa5d31df,Tests_passed,True,True,True,True,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,8d87cff099040d4ce7c4f95604f78b26393107712b13e6e17888f79b3be6d796,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,0.04646754264831543,0.04988241195678711,0.04315638542175293,0.03564858436584473,0.05012798309326172,0.052347421646118164,0.043356895446777344,0.1651782989501953,0.041166067123413086,0.167680025100708,0.1701221466064453,0.12100028991699219,1.4561455249786377,0.20138955116271973 +1,refs/heads/master,46f2d8d50ae406cbf93855eb99b88e0fe9003454,91c92ad05f63c8e1b472f6d9e0164eb92537e03f,5cd4602a8d657cccbf97ea489eea519446c0e401,,8a7c2669ed7f66932c02dc0b26f2d9d5a0da8b3faadfc49a32f034b3c1ad6611,Tests_passed,434ad22f00ca5015e85fdea7ceb5d67365a5eefa83ef8620dfe92cc2fa5d31df,Tests_passed,True,True,True,True,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,8d87cff099040d4ce7c4f95604f78b26393107712b13e6e17888f79b3be6d796,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,0.04646754264831543,0.04988241195678711,0.04315638542175293,0.03564858436584473,0.05012798309326172,0.052347421646118164,0.043356895446777344,0.1651782989501953,0.041166067123413086,0.16907358169555664,0.1713573932647705,0.12100028991699219,1.4561455249786377,0.20138955116271973 diff --git a/results/combined/merges_timed/bobharner/componentworld.csv b/results/combined/merges_timed/bobharner/componentworld.csv index c6bc8b2ddb..17f4452180 100644 --- a/results/combined/merges_timed/bobharner/componentworld.csv +++ b/results/combined/merges_timed/bobharner/componentworld.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/back-to-maven,1a2ff04097bd33609bd1c4ea9aa833640357f362,831fafda54d270586421497d4c0036067a47838e,ff5f0c920c58135ce736d60598f8080b991b6095,,True,True,446d6bff03c906d7fbf16009920c2d6eb262258abc08f32b836f2b2c650d8c22,Tests_passed,6d270490d1e754219ddf921a19de11ddaabf2a83d80e57db5116904bbcee7abb,Tests_passed,True,True,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,24545773c19553c204e45d8e2a55018b2ebf2d2a8e30e2323f765943e82edd28,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,24545773c19553c204e45d8e2a55018b2ebf2d2a8e30e2323f765943e82edd28,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,a6fa2488b8d3c35ef4a8ff91b38eb2af337a1ec67af281c08324fc5e8dba0900,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,9b55f8508bb58519680a8ca28d3670efc51b9b1fb10d2b4576a84fe3946aad67,Merge_failed,9b55f8508bb58519680a8ca28d3670efc51b9b1fb10d2b4576a84fe3946aad67,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,1ccf82ce5e23f2ec90495e8a2e3bcfd96ac8ff7a51fb12b6649613fe86b6c480,Merge_failed,6b461a8a8b6a5097d81ac39a204bd4885be5f32de98c964b62b9d1ecc752eb17,0.08621048927307129,0.05714869499206543,0.11442780494689941,0.11373519897460938,0.09696197509765625,0.11411190032958984,0.11404156684875488,0.16920256614685059,0.09895801544189453,0.21441268920898438,0.22855424880981445,0.19932937622070312,0.5063347816467285,0.26683568954467773 +1,refs/heads/back-to-maven,1a2ff04097bd33609bd1c4ea9aa833640357f362,831fafda54d270586421497d4c0036067a47838e,ff5f0c920c58135ce736d60598f8080b991b6095,,True,True,446d6bff03c906d7fbf16009920c2d6eb262258abc08f32b836f2b2c650d8c22,Tests_passed,6d270490d1e754219ddf921a19de11ddaabf2a83d80e57db5116904bbcee7abb,Tests_passed,True,True,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,24545773c19553c204e45d8e2a55018b2ebf2d2a8e30e2323f765943e82edd28,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,24545773c19553c204e45d8e2a55018b2ebf2d2a8e30e2323f765943e82edd28,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,a6fa2488b8d3c35ef4a8ff91b38eb2af337a1ec67af281c08324fc5e8dba0900,Merge_failed,e4c5794aa0899cac7020f4da18ff88b69b5429643ac872fdbf7c06d178f48e3c,Merge_failed,9b55f8508bb58519680a8ca28d3670efc51b9b1fb10d2b4576a84fe3946aad67,Merge_failed,9b55f8508bb58519680a8ca28d3670efc51b9b1fb10d2b4576a84fe3946aad67,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,1ccf82ce5e23f2ec90495e8a2e3bcfd96ac8ff7a51fb12b6649613fe86b6c480,Merge_failed,6b461a8a8b6a5097d81ac39a204bd4885be5f32de98c964b62b9d1ecc752eb17,0.08621048927307129,0.05714869499206543,0.11442780494689941,0.11373519897460938,0.09696197509765625,0.11411190032958984,0.11404156684875488,0.16920256614685059,0.09895801544189453,0.22703051567077637,0.22883081436157227,0.19932937622070312,0.5063347816467285,0.26683568954467773 diff --git a/results/combined/merges_timed/boilit/ebm.csv b/results/combined/merges_timed/boilit/ebm.csv index 599fb3c9c4..f2fb42db07 100644 --- a/results/combined/merges_timed/boilit/ebm.csv +++ b/results/combined/merges_timed/boilit/ebm.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,b29fc0d1313fff81549c25758b1cc7b1d8f8a610,49250bf09cdeb0eae3090090c1e73c5e87ee72b0,3dedd78526d1feb50991b74c94a9e962b0610fc1,,True,True,fd4dfdca08d3015f825302ec21cabc87f93f120885734fb10f42ac2ce3fcb2de,Tests_passed,807672812daddb02e11e69ab92bf391754bd8dcfd4d208cbfa2c219132058223,Tests_passed,True,True,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Merge_failed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,0.03714561462402344,0.07161188125610352,0.10403823852539062,0.10439658164978027,0.03570437431335449,0.11525130271911621,0.10470890998840332,0.28221678733825684,0.07615065574645996,0.22329163551330566,0.2229328155517578,0.21256780624389648,0.7728300094604492,0.2946665287017822 +5,refs/heads/master,b29fc0d1313fff81549c25758b1cc7b1d8f8a610,49250bf09cdeb0eae3090090c1e73c5e87ee72b0,3dedd78526d1feb50991b74c94a9e962b0610fc1,,True,True,fd4dfdca08d3015f825302ec21cabc87f93f120885734fb10f42ac2ce3fcb2de,Tests_passed,807672812daddb02e11e69ab92bf391754bd8dcfd4d208cbfa2c219132058223,Tests_passed,True,True,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Merge_failed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,0.03714561462402344,0.07161188125610352,0.10403823852539062,0.10439658164978027,0.03570437431335449,0.11525130271911621,0.10470890998840332,0.28221678733825684,0.07615065574645996,0.21855926513671875,0.19490385055541992,0.21256780624389648,0.7728300094604492,0.2946665287017822 diff --git a/results/combined/merges_timed/brettflan/worldborder.csv b/results/combined/merges_timed/brettflan/worldborder.csv index 028d33f02f..bfcf0eed14 100644 --- a/results/combined/merges_timed/brettflan/worldborder.csv +++ b/results/combined/merges_timed/brettflan/worldborder.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/remotes/origin/pull/173,fbf9066966d4b472136dcaf207400d77e2652ca5,c2a45b5876985665c80be37ff343d01f20399fe7,c1d99e560c227b2b5e3a5fb2f0d410159ff3d810,,True,True,6598f969f1251c250c2c6a2be0a5ec85b5cd6b46d3a80eb7efafcdbe6fff175b,Tests_passed,64b77d515fd91002a7092ca06daef30aa8ab91c4a549fc7e42b0708e73eab6e5,Tests_passed,True,True,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,0.011594295501708984,0.011245965957641602,0.012764215469360352,0.01190638542175293,0.011964082717895508,0.012707710266113281,0.01266336441040039,0.03743743896484375,0.011497020721435547,0.16378283500671387,0.16492199897766113,0.06677007675170898,1.0676310062408447,0.16412639617919922 +24,refs/remotes/origin/pull/173,fbf9066966d4b472136dcaf207400d77e2652ca5,c2a45b5876985665c80be37ff343d01f20399fe7,c1d99e560c227b2b5e3a5fb2f0d410159ff3d810,,True,True,6598f969f1251c250c2c6a2be0a5ec85b5cd6b46d3a80eb7efafcdbe6fff175b,Tests_passed,64b77d515fd91002a7092ca06daef30aa8ab91c4a549fc7e42b0708e73eab6e5,Tests_passed,True,True,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,0.011594295501708984,0.011245965957641602,0.012764215469360352,0.01190638542175293,0.011964082717895508,0.012707710266113281,0.01266336441040039,0.03743743896484375,0.011497020721435547,0.1612868309020996,0.16048455238342285,0.06677007675170898,1.0676310062408447,0.16412639617919922 diff --git a/results/combined/merges_timed/brettwooldridge/hikarijson.csv b/results/combined/merges_timed/brettwooldridge/hikarijson.csv index 2b15199be4..07fb4dbd9b 100644 --- a/results/combined/merges_timed/brettwooldridge/hikarijson.csv +++ b/results/combined/merges_timed/brettwooldridge/hikarijson.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,f1b45352cf9c8510a94fd97c943d4fe526cc94ad,98fb6a09755102f18ced62474bc1d08093fe06af,dc0f7cdf4f2186ff65e8ac4fb1edd7b2930d6171,,True,True,8d2a1271a18045a380a928f3f87fa85f72215fafeaa6cd022459005e346aa220,Tests_passed,618dc5d39d5479d4d406718de1ceb91417fc3d2ea9052ad15711cc34fc74e090,Tests_passed,True,True,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,3d60a23aa6a36c42c76c04dffeef362638e5712c94aecba00c90c8f26854a10c,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,a71c429ac0e2b116d6984a0e05256da86312985fd7e29d8987a3b0991d24244a,Merge_failed,a71c429ac0e2b116d6984a0e05256da86312985fd7e29d8987a3b0991d24244a,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Merge_failed,8655247904befb89cff33e7849e1664bdc0c46370016a0374c5d663b0b6fb727,0.03260231018066406,0.02874016761779785,0.0374603271484375,0.04066061973571777,0.033489227294921875,0.03817892074584961,0.060811758041381836,0.22415494918823242,0.043071746826171875,0.22611093521118164,0.22771215438842773,0.18512439727783203,1.437009334564209,0.1812899112701416 +5,refs/heads/master,f1b45352cf9c8510a94fd97c943d4fe526cc94ad,98fb6a09755102f18ced62474bc1d08093fe06af,dc0f7cdf4f2186ff65e8ac4fb1edd7b2930d6171,,True,True,8d2a1271a18045a380a928f3f87fa85f72215fafeaa6cd022459005e346aa220,Tests_passed,618dc5d39d5479d4d406718de1ceb91417fc3d2ea9052ad15711cc34fc74e090,Tests_passed,True,True,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,3d60a23aa6a36c42c76c04dffeef362638e5712c94aecba00c90c8f26854a10c,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,a71c429ac0e2b116d6984a0e05256da86312985fd7e29d8987a3b0991d24244a,Merge_failed,a71c429ac0e2b116d6984a0e05256da86312985fd7e29d8987a3b0991d24244a,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Merge_failed,8655247904befb89cff33e7849e1664bdc0c46370016a0374c5d663b0b6fb727,0.03260231018066406,0.02874016761779785,0.0374603271484375,0.04066061973571777,0.033489227294921875,0.03817892074584961,0.060811758041381836,0.22415494918823242,0.043071746826171875,0.2273550033569336,0.23020601272583008,0.18512439727783203,1.437009334564209,0.1812899112701416 diff --git a/results/combined/merges_timed/brettwooldridge/nuprocess.csv b/results/combined/merges_timed/brettwooldridge/nuprocess.csv index 88e04cdb6a..f3bc902b8e 100644 --- a/results/combined/merges_timed/brettwooldridge/nuprocess.csv +++ b/results/combined/merges_timed/brettwooldridge/nuprocess.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/remotes/origin/pull/131,c18f600e9456192f1216d5f1e5cb8da32822bec0,014e357002becfa872b246373656ec1f8b5d9b25,9b42fc36d3c678939ffbdfc139bcae048fa96526,,d78ceb58f5917736a3bf8715aac4a119be8619905a8060a617dd3510d5316a53,Tests_passed,e17e709961098ed93c9f2e67d78b96b5c8155e05f381dcedc2e92f67d7378390,Tests_passed,True,True,True,True,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,4a96197e7a6cd3113209e78c39bc75daef22c4b7c5574fbe90aee8b4f213a30d,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,4b994b2d2c7ea29fe4ee0b7d07e0784dc12244dd73a7084e644caa70b1d679b6,Merge_failed,4b994b2d2c7ea29fe4ee0b7d07e0784dc12244dd73a7084e644caa70b1d679b6,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,1df039dc0179d489cc27dcd6c4de08f6b0a32734f3bc6f3d26e867f5519f46a7,0.03422904014587402,0.04122519493103027,0.03450489044189453,0.037695884704589844,0.04033923149108887,0.03405570983886719,0.043050527572631836,0.16683006286621094,0.06712961196899414,0.06578922271728516,0.06572675704956055,0.12568187713623047,0.5470924377441406,0.21981048583984375 +32,refs/remotes/origin/pull/131,c18f600e9456192f1216d5f1e5cb8da32822bec0,014e357002becfa872b246373656ec1f8b5d9b25,9b42fc36d3c678939ffbdfc139bcae048fa96526,,d78ceb58f5917736a3bf8715aac4a119be8619905a8060a617dd3510d5316a53,Tests_passed,e17e709961098ed93c9f2e67d78b96b5c8155e05f381dcedc2e92f67d7378390,Tests_passed,True,True,True,True,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,4a96197e7a6cd3113209e78c39bc75daef22c4b7c5574fbe90aee8b4f213a30d,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,4b994b2d2c7ea29fe4ee0b7d07e0784dc12244dd73a7084e644caa70b1d679b6,Merge_failed,4b994b2d2c7ea29fe4ee0b7d07e0784dc12244dd73a7084e644caa70b1d679b6,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,1df039dc0179d489cc27dcd6c4de08f6b0a32734f3bc6f3d26e867f5519f46a7,0.03422904014587402,0.04122519493103027,0.03450489044189453,0.037695884704589844,0.04033923149108887,0.03405570983886719,0.043050527572631836,0.16683006286621094,0.06712961196899414,0.06502366065979004,0.06598091125488281,0.12568187713623047,0.5470924377441406,0.21981048583984375 diff --git a/results/combined/merges_timed/brettwooldridge/sansorm.csv b/results/combined/merges_timed/brettwooldridge/sansorm.csv index 361247bf6c..2e804ad55a 100644 --- a/results/combined/merges_timed/brettwooldridge/sansorm.csv +++ b/results/combined/merges_timed/brettwooldridge/sansorm.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,6e3a8b4303ad3c0778bd04f08ceacd024e9b67a7,0b4c876530d7f4b4962fe88142d03ace6ce4d58a,9d23c8e449cc138506f4c71454a3116bfd051d46,,9a9a1099dcca43179a9602fd983d6223fa9ef507b60df10cd2138730eb1bae29,Tests_passed,a128b6699580ca29f9938c9b6b0233f0f8057045c755ce6db700d846229e8f32,Tests_passed,True,True,True,True,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,0.010223865509033203,0.04660344123840332,0.04442596435546875,0.04543280601501465,0.043305158615112305,0.04065394401550293,0.043709516525268555,0.15832209587097168,0.014193296432495117,0.151686429977417,0.15166640281677246,0.11688232421875,0.6519486904144287,0.17778754234313965 +14,refs/heads/master,6e3a8b4303ad3c0778bd04f08ceacd024e9b67a7,0b4c876530d7f4b4962fe88142d03ace6ce4d58a,9d23c8e449cc138506f4c71454a3116bfd051d46,,9a9a1099dcca43179a9602fd983d6223fa9ef507b60df10cd2138730eb1bae29,Tests_passed,a128b6699580ca29f9938c9b6b0233f0f8057045c755ce6db700d846229e8f32,Tests_passed,True,True,True,True,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,0.010223865509033203,0.04660344123840332,0.04442596435546875,0.04543280601501465,0.043305158615112305,0.04065394401550293,0.043709516525268555,0.15832209587097168,0.014193296432495117,0.1487746238708496,0.1499805450439453,0.11688232421875,0.6519486904144287,0.17778754234313965 diff --git a/results/combined/merges_timed/brettwooldridge/sparsebitset.csv b/results/combined/merges_timed/brettwooldridge/sparsebitset.csv index be9a7d5360..6975173a78 100644 --- a/results/combined/merges_timed/brettwooldridge/sparsebitset.csv +++ b/results/combined/merges_timed/brettwooldridge/sparsebitset.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/25,43cda6d2235f1133ae94cdfebce65d0dbaa4d83f,1f168799ce0dcac325cc7d787b8bb24465bdbfa0,8b32633706533a1fb828e05415dbdbc2c32f3a31,,True,True,a54e1416719615f83999c52735a79585ce2eff4f501f620963eb6800e82e2770,Tests_passed,c8aa55b9556b30704d48f2bc849676a11897da893973dc603bc242943cfd0738,Tests_passed,True,True,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,b9d12b06a107afd30cfb524158f4025941f73a29fef086396972740ba6981b51,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,426f5e18614476a5fc9646cfdbc8c815eb887dbb494af6e083e0ad80b55bf1ca,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,0.037149906158447266,0.05401444435119629,0.03854012489318848,0.05866885185241699,0.05214834213256836,0.03739500045776367,0.02592754364013672,0.2542381286621094,0.05547308921813965,0.22418975830078125,0.2234499454498291,0.16827154159545898,2.279326915740967,0.2027735710144043 +3,refs/remotes/origin/pull/25,43cda6d2235f1133ae94cdfebce65d0dbaa4d83f,1f168799ce0dcac325cc7d787b8bb24465bdbfa0,8b32633706533a1fb828e05415dbdbc2c32f3a31,,True,True,a54e1416719615f83999c52735a79585ce2eff4f501f620963eb6800e82e2770,Tests_passed,c8aa55b9556b30704d48f2bc849676a11897da893973dc603bc242943cfd0738,Tests_passed,True,True,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,b9d12b06a107afd30cfb524158f4025941f73a29fef086396972740ba6981b51,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,426f5e18614476a5fc9646cfdbc8c815eb887dbb494af6e083e0ad80b55bf1ca,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,0.037149906158447266,0.05401444435119629,0.03854012489318848,0.05866885185241699,0.05214834213256836,0.03739500045776367,0.02592754364013672,0.2542381286621094,0.05547308921813965,0.22404789924621582,0.22084450721740723,0.16827154159545898,2.279326915740967,0.2027735710144043 diff --git a/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv b/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv index f82af9934f..ce133b01b5 100644 --- a/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv +++ b/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/remotes/origin/pull/12,ccc17f78b72bd7d10a1e55e134f3eb6205a97180,f5b7f6ef62af71a4d9f953956d87c2a9eaadd25b,75e78cc2b436b169582ce05d7c0b6871c66424b1,,True,True,429b77e7e100fe4099b801c308b7c330955f0dc68a7105518f0bf26e2817fbd9,Tests_passed,360795bd1e13760e12a6c9fddc0e03f361a00b164389fd2559d9bc19a9d3c0b0,Tests_passed,True,True,Merge_failed,950a49b2998d0fd6d30d993e5430a3c3c7b9b69aac7d219301fd6f5bee5d2860,Merge_failed,c48da4e7cd1ef3e34d0d24cd81affad582b5c517db87bfd3e8f565598d263c23,Merge_failed,950a49b2998d0fd6d30d993e5430a3c3c7b9b69aac7d219301fd6f5bee5d2860,Merge_failed,02cdfc1de6ea2e0a731d29d149097d1c14208c71b6e3ba930f25d50bbf1c29ea,Merge_failed,8c6f95229ef731ba5bb9041016ef317245366e2cd6b62297f3a62c63868833f2,Merge_failed,8c6f95229ef731ba5bb9041016ef317245366e2cd6b62297f3a62c63868833f2,Merge_failed,3780b6d4032d26327d78c516c03aebcebf10d4ccdad617ee38877bdb9fd6195b,Merge_failed,145698c32a1497f757183b97412276643fdb5c474faa165b7581deed50639349,Merge_failed,950a49b2998d0fd6d30d993e5430a3c3c7b9b69aac7d219301fd6f5bee5d2860,Merge_failed,1c8d86bd8b3d80052753fd994cd47da4a2234a96c5d6b96c7d340e30157a6a82,Merge_failed,1c8d86bd8b3d80052753fd994cd47da4a2234a96c5d6b96c7d340e30157a6a82,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Merge_failed,b53d41a1cf1269a70085704f721c62845904e50ee9a81126d0a4cd98f8fc3822,0.057235002517700195,0.047975778579711914,0.0466313362121582,0.05362510681152344,0.05224204063415527,0.04306769371032715,0.05707287788391113,0.17870306968688965,0.06857442855834961,0.1608257293701172,0.16048693656921387,0.16486310958862305,1.7534911632537842,0.2102053165435791 +19,refs/remotes/origin/pull/12,ccc17f78b72bd7d10a1e55e134f3eb6205a97180,f5b7f6ef62af71a4d9f953956d87c2a9eaadd25b,75e78cc2b436b169582ce05d7c0b6871c66424b1,,True,True,429b77e7e100fe4099b801c308b7c330955f0dc68a7105518f0bf26e2817fbd9,Tests_passed,360795bd1e13760e12a6c9fddc0e03f361a00b164389fd2559d9bc19a9d3c0b0,Tests_passed,True,True,Merge_failed,950a49b2998d0fd6d30d993e5430a3c3c7b9b69aac7d219301fd6f5bee5d2860,Merge_failed,c48da4e7cd1ef3e34d0d24cd81affad582b5c517db87bfd3e8f565598d263c23,Merge_failed,950a49b2998d0fd6d30d993e5430a3c3c7b9b69aac7d219301fd6f5bee5d2860,Merge_failed,02cdfc1de6ea2e0a731d29d149097d1c14208c71b6e3ba930f25d50bbf1c29ea,Merge_failed,8c6f95229ef731ba5bb9041016ef317245366e2cd6b62297f3a62c63868833f2,Merge_failed,8c6f95229ef731ba5bb9041016ef317245366e2cd6b62297f3a62c63868833f2,Merge_failed,3780b6d4032d26327d78c516c03aebcebf10d4ccdad617ee38877bdb9fd6195b,Merge_failed,145698c32a1497f757183b97412276643fdb5c474faa165b7581deed50639349,Merge_failed,950a49b2998d0fd6d30d993e5430a3c3c7b9b69aac7d219301fd6f5bee5d2860,Merge_failed,1c8d86bd8b3d80052753fd994cd47da4a2234a96c5d6b96c7d340e30157a6a82,Merge_failed,1c8d86bd8b3d80052753fd994cd47da4a2234a96c5d6b96c7d340e30157a6a82,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Merge_failed,b53d41a1cf1269a70085704f721c62845904e50ee9a81126d0a4cd98f8fc3822,0.057235002517700195,0.047975778579711914,0.0466313362121582,0.05362510681152344,0.05224204063415527,0.04306769371032715,0.05707287788391113,0.17870306968688965,0.06857442855834961,0.15865468978881836,0.15817999839782715,0.16486310958862305,1.7534911632537842,0.2102053165435791 diff --git a/results/combined/merges_timed/brianm/config-magic.csv b/results/combined/merges_timed/brianm/config-magic.csv index f27e09efd9..b7524ce09d 100644 --- a/results/combined/merges_timed/brianm/config-magic.csv +++ b/results/combined/merges_timed/brianm/config-magic.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,a7953193ae2e296565ecee2809830b5abb3a3bb7,0b2b3049ac1f80ac94d49f7a449af8281ad462c2,9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd,,True,True,729c70a5cce401e65730c1a776367d40596d97439f28693e55cf802a8fe0b37b,Tests_passed,dab5f506370335878353bba304d83b48b05cccb3b206ff36072c9a5cc6d154f9,Tests_passed,True,True,Merge_failed,ab24e6da013996e4aa5765aaf8224096d530fb6301356aeabe7afd2c0f5bcc27,Merge_failed,9398fc373c122cf478aabb40a3d7ff1f01020812e05ef77ad061b207eba6cf8f,Merge_failed,ab24e6da013996e4aa5765aaf8224096d530fb6301356aeabe7afd2c0f5bcc27,Merge_failed,9398fc373c122cf478aabb40a3d7ff1f01020812e05ef77ad061b207eba6cf8f,Merge_failed,f5c0ccc333a77ae899a3d95bfe4e25215383379b9903a24780f248c6d9f29aa3,Merge_failed,f5c0ccc333a77ae899a3d95bfe4e25215383379b9903a24780f248c6d9f29aa3,Merge_failed,ab24e6da013996e4aa5765aaf8224096d530fb6301356aeabe7afd2c0f5bcc27,Merge_failed,f0f09a2a90c4bafa65bd18c08753e75674abebeb2969e69ba30d54462076d1f1,Merge_failed,ab24e6da013996e4aa5765aaf8224096d530fb6301356aeabe7afd2c0f5bcc27,Merge_failed,0764c66bd8f9d40c566501cac935e70acba22aafd21898df392c55feb723f5cf,Merge_failed,0764c66bd8f9d40c566501cac935e70acba22aafd21898df392c55feb723f5cf,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,9080527ca16f981f294563c98199425e3b0f768ffe435df4f892eaf9eb65a7df,0.04176616668701172,0.0466609001159668,0.04107403755187988,0.03494715690612793,0.040364742279052734,0.04706454277038574,0.0428926944732666,0.2882351875305176,0.06371283531188965,0.2361283302307129,0.23705744743347168,0.2368459701538086,1.9646737575531006,0.21897602081298828 +5,refs/heads/master,a7953193ae2e296565ecee2809830b5abb3a3bb7,0b2b3049ac1f80ac94d49f7a449af8281ad462c2,9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd,,True,True,729c70a5cce401e65730c1a776367d40596d97439f28693e55cf802a8fe0b37b,Tests_passed,dab5f506370335878353bba304d83b48b05cccb3b206ff36072c9a5cc6d154f9,Tests_passed,True,True,Merge_failed,ab24e6da013996e4aa5765aaf8224096d530fb6301356aeabe7afd2c0f5bcc27,Merge_failed,9398fc373c122cf478aabb40a3d7ff1f01020812e05ef77ad061b207eba6cf8f,Merge_failed,ab24e6da013996e4aa5765aaf8224096d530fb6301356aeabe7afd2c0f5bcc27,Merge_failed,9398fc373c122cf478aabb40a3d7ff1f01020812e05ef77ad061b207eba6cf8f,Merge_failed,f5c0ccc333a77ae899a3d95bfe4e25215383379b9903a24780f248c6d9f29aa3,Merge_failed,f5c0ccc333a77ae899a3d95bfe4e25215383379b9903a24780f248c6d9f29aa3,Merge_failed,ab24e6da013996e4aa5765aaf8224096d530fb6301356aeabe7afd2c0f5bcc27,Merge_failed,f0f09a2a90c4bafa65bd18c08753e75674abebeb2969e69ba30d54462076d1f1,Merge_failed,ab24e6da013996e4aa5765aaf8224096d530fb6301356aeabe7afd2c0f5bcc27,Merge_failed,0764c66bd8f9d40c566501cac935e70acba22aafd21898df392c55feb723f5cf,Merge_failed,0764c66bd8f9d40c566501cac935e70acba22aafd21898df392c55feb723f5cf,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,9080527ca16f981f294563c98199425e3b0f768ffe435df4f892eaf9eb65a7df,0.04176616668701172,0.0466609001159668,0.04107403755187988,0.03494715690612793,0.040364742279052734,0.04706454277038574,0.0428926944732666,0.2882351875305176,0.06371283531188965,0.22854900360107422,0.22858810424804688,0.2368459701538086,1.9646737575531006,0.21897602081298828 diff --git a/results/combined/merges_timed/brianm/jdbi3.csv b/results/combined/merges_timed/brianm/jdbi3.csv index 1c68d1e211..7cf38660ab 100644 --- a/results/combined/merges_timed/brianm/jdbi3.csv +++ b/results/combined/merges_timed/brianm/jdbi3.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,9f40c034b7d4b1a262f723ec81a630d1ebeb31bd,d4bf1ba6bbff2c9a9726839d0dfbad1f154f0c07,536ef1ada584141d12aba9135f744404f007c842,,a13deb9bb2aaaf9cd2f71dc901689920efd234f151b2cb716cfe559d27a9b83a,Tests_passed,35508aedfa7e6c36aca6730ac32b3f82c99929041227b69b611066caee59f314,Tests_passed,True,True,True,True,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,a8c773d465ae758ddc978067bbf7a02b43b0342a451966d5f6dc6907d8c9f3d4,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,61411337a7dbd03402b5a08ae72968f1b57e52886881e19e1efcda7c15c9f8ca,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,fef2de6dd95a82b301f641b8f9717bcc19a81395adc5907881e9359fa527a117,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,01f838b7ee16e2b1d2ba91db8357e1768c0f55b18dc1e88e73786f43a5821159,Merge_failed,01f838b7ee16e2b1d2ba91db8357e1768c0f55b18dc1e88e73786f43a5821159,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,b7361d7f9f382d4456a0fa6d01ff67778a6f362d0edfcd3a42517d9af8b68d3e,0.04014468193054199,0.04041242599487305,0.03388571739196777,0.03688406944274902,0.03910541534423828,0.03461265563964844,0.034612417221069336,0.33057117462158203,0.0746622085571289,0.2735416889190674,0.2732856273651123,0.24273085594177246,1.6061160564422607,0.17949652671813965 +1,refs/heads/master,9f40c034b7d4b1a262f723ec81a630d1ebeb31bd,d4bf1ba6bbff2c9a9726839d0dfbad1f154f0c07,536ef1ada584141d12aba9135f744404f007c842,,a13deb9bb2aaaf9cd2f71dc901689920efd234f151b2cb716cfe559d27a9b83a,Tests_passed,35508aedfa7e6c36aca6730ac32b3f82c99929041227b69b611066caee59f314,Tests_passed,True,True,True,True,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,a8c773d465ae758ddc978067bbf7a02b43b0342a451966d5f6dc6907d8c9f3d4,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,61411337a7dbd03402b5a08ae72968f1b57e52886881e19e1efcda7c15c9f8ca,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,fef2de6dd95a82b301f641b8f9717bcc19a81395adc5907881e9359fa527a117,Merge_failed,b7b8609e0abdd94c243151cb0599cf3edafc7ff87ae96bf10a5cd890c1537c17,Merge_failed,01f838b7ee16e2b1d2ba91db8357e1768c0f55b18dc1e88e73786f43a5821159,Merge_failed,01f838b7ee16e2b1d2ba91db8357e1768c0f55b18dc1e88e73786f43a5821159,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,b7361d7f9f382d4456a0fa6d01ff67778a6f362d0edfcd3a42517d9af8b68d3e,0.04014468193054199,0.04041242599487305,0.03388571739196777,0.03688406944274902,0.03910541534423828,0.03461265563964844,0.034612417221069336,0.33057117462158203,0.0746622085571289,0.273043155670166,0.2717165946960449,0.24273085594177246,1.6061160564422607,0.17949652671813965 diff --git a/results/combined/merges_timed/brianm/really-executable-jars-maven-plugin.csv b/results/combined/merges_timed/brianm/really-executable-jars-maven-plugin.csv index 25c9b0fd5f..d8652c8621 100644 --- a/results/combined/merges_timed/brianm/really-executable-jars-maven-plugin.csv +++ b/results/combined/merges_timed/brianm/really-executable-jars-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,913bd85a3e0137af536fc489fe7845625da4c99b,692acc3220ae529dde128d24a6fb920e599359e7,3ed2c7154ac04c734cfb7459ba5046483e34437a,,True,True,5a9ba7434f61d3ba973df6c3f8ec363af8c30b7c64b36fcda65ed99883768681,Tests_passed,2016b6b4b0bc06d7d2024adceff138d02b32f0c452250912dc97978795f7a49a,Tests_passed,True,True,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,0.0400090217590332,0.040825843811035156,0.031056642532348633,0.009676218032836914,0.03995847702026367,0.04093194007873535,0.04105877876281738,0.14660191535949707,0.03862357139587402,0.14870929718017578,0.14925193786621094,0.08091402053833008,0.6507353782653809,0.17042875289916992 +11,refs/heads/master,913bd85a3e0137af536fc489fe7845625da4c99b,692acc3220ae529dde128d24a6fb920e599359e7,3ed2c7154ac04c734cfb7459ba5046483e34437a,,True,True,5a9ba7434f61d3ba973df6c3f8ec363af8c30b7c64b36fcda65ed99883768681,Tests_passed,2016b6b4b0bc06d7d2024adceff138d02b32f0c452250912dc97978795f7a49a,Tests_passed,True,True,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,0.0400090217590332,0.040825843811035156,0.031056642532348633,0.009676218032836914,0.03995847702026367,0.04093194007873535,0.04105877876281738,0.14660191535949707,0.03862357139587402,0.14733099937438965,0.14625978469848633,0.08091402053833008,0.6507353782653809,0.17042875289916992 diff --git a/results/combined/merges_timed/brndnmtthws/hdfs.csv b/results/combined/merges_timed/brndnmtthws/hdfs.csv index 02bd52789d..6b5799cfe3 100644 --- a/results/combined/merges_timed/brndnmtthws/hdfs.csv +++ b/results/combined/merges_timed/brndnmtthws/hdfs.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -104,refs/remotes/origin/pull/5,136f7cf97c6a687150950f7ccd1e03f2bde6a823,ee4b5ad98f64e7f278a565fe124cf316ea0d1b60,f334d6b0ffdf1dfc359d411dea29262e5aa683c1,,True,True,04eb8d2879c632f63d8f2a71e239338125550765a2c825aa108c2b4626d1905c,Tests_passed,0f9283d967381f3d8f049bc76055bab2c500f2eea996a407423584fd32d60bb5,Tests_passed,True,True,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,dd2a234393ab7b71ec8309c67475b0ee1fcbddc1bb3c2b76bf0a7808cc55bf0c,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,2e8fcd4e36182736ac917038ee48f81aa4e676d9f3fbe0396a6c0650f26ab607,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,ac70cd7824654ba4e77f383bbeb27bfc9dc878883f9b0326b267973455a5c9a3,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,0.012996435165405273,0.013573408126831055,0.014136314392089844,0.015053272247314453,0.014916181564331055,0.014269828796386719,0.014623641967773438,0.053568124771118164,0.012900829315185547,0.3066689968109131,0.3067147731781006,0.1202082633972168,1.7166731357574463,0.18532276153564453 +104,refs/remotes/origin/pull/5,136f7cf97c6a687150950f7ccd1e03f2bde6a823,ee4b5ad98f64e7f278a565fe124cf316ea0d1b60,f334d6b0ffdf1dfc359d411dea29262e5aa683c1,,True,True,04eb8d2879c632f63d8f2a71e239338125550765a2c825aa108c2b4626d1905c,Tests_passed,0f9283d967381f3d8f049bc76055bab2c500f2eea996a407423584fd32d60bb5,Tests_passed,True,True,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,dd2a234393ab7b71ec8309c67475b0ee1fcbddc1bb3c2b76bf0a7808cc55bf0c,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,2e8fcd4e36182736ac917038ee48f81aa4e676d9f3fbe0396a6c0650f26ab607,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,ac70cd7824654ba4e77f383bbeb27bfc9dc878883f9b0326b267973455a5c9a3,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,0.012996435165405273,0.013573408126831055,0.014136314392089844,0.015053272247314453,0.014916181564331055,0.014269828796386719,0.014623641967773438,0.053568124771118164,0.012900829315185547,0.3060157299041748,0.3060126304626465,0.1202082633972168,1.7166731357574463,0.18532276153564453 diff --git a/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv b/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv index 00917b96e6..7a5f110a5e 100644 --- a/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv +++ b/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -462,refs/heads/develop-6.2.x,4c906659b12b21ea55fd99e9e59d22de6a0133ad,5beb9dced0311917ca58e701bc6efbe0111f5237,af94f77e1218f0fb5357f6dcf3a0438fb6cf84f8,,True,True,8301741259a9b51b2cf414140ef7bbe547bb91c7e578ce7ef1d0c6259a791e4b,Tests_passed,e61fba4c0c89674620006b27ff750c2ff83711232bc84eef5868e15db59b97f7,Tests_passed,True,True,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,0ea3a08d940c0254fa719e0374abac600fa5b2a1f531ace84d975e8621cbf1b2,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,0ea3a08d940c0254fa719e0374abac600fa5b2a1f531ace84d975e8621cbf1b2,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,b0a924c0d9e1b88247580cc7747af14d5dc8c90b4169590f154149694c48beb8,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,65f2c22a1931346eaa12b7e7b62a5ac2429e1926ffc3e28b22e4f5519387c673,Merge_failed,c1358113ecf1da23c8642cf275a3042f8d5807da29774b0ae1b9e92a619432fd,Merge_failed,04db2ed99d07b271135babc92b5dd667e91a14c18b156ea31e14171ebc7bf789,Merge_failed,06b8051893a5083887ab7d0f3bd8e848554a8b8a0e8b107fd2f03e687c3d8d13,Merge_failed,1a5f9d2421d24e8f647b042fc760a1b2d0a50864725a0a33304c1238e5661f6d,0.18297410011291504,0.19223570823669434,0.20979046821594238,0.2157151699066162,0.20727753639221191,0.20778512954711914,0.21101617813110352,5.02060079574585,0.34886765480041504,36.45486569404602,36.27680706977844,17.257490873336792,182.52923679351807,23.08800458908081 +462,refs/heads/develop-6.2.x,4c906659b12b21ea55fd99e9e59d22de6a0133ad,5beb9dced0311917ca58e701bc6efbe0111f5237,af94f77e1218f0fb5357f6dcf3a0438fb6cf84f8,,True,True,8301741259a9b51b2cf414140ef7bbe547bb91c7e578ce7ef1d0c6259a791e4b,Tests_passed,e61fba4c0c89674620006b27ff750c2ff83711232bc84eef5868e15db59b97f7,Tests_passed,True,True,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,0ea3a08d940c0254fa719e0374abac600fa5b2a1f531ace84d975e8621cbf1b2,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,0ea3a08d940c0254fa719e0374abac600fa5b2a1f531ace84d975e8621cbf1b2,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,b0a924c0d9e1b88247580cc7747af14d5dc8c90b4169590f154149694c48beb8,Merge_failed,445e6b92584f6229bf3a86698cacd3083dd628a6651561e75ac45b6796ae6097,Merge_failed,65f2c22a1931346eaa12b7e7b62a5ac2429e1926ffc3e28b22e4f5519387c673,Merge_failed,c1358113ecf1da23c8642cf275a3042f8d5807da29774b0ae1b9e92a619432fd,Merge_failed,04db2ed99d07b271135babc92b5dd667e91a14c18b156ea31e14171ebc7bf789,Merge_failed,06b8051893a5083887ab7d0f3bd8e848554a8b8a0e8b107fd2f03e687c3d8d13,Merge_failed,1a5f9d2421d24e8f647b042fc760a1b2d0a50864725a0a33304c1238e5661f6d,0.18297410011291504,0.19223570823669434,0.20979046821594238,0.2157151699066162,0.20727753639221191,0.20778512954711914,0.21101617813110352,5.02060079574585,0.34886765480041504,35.83525800704956,35.83252191543579,17.257490873336792,182.52923679351807,23.08800458908081 diff --git a/results/combined/merges_timed/bronx/saci-vraptor.csv b/results/combined/merges_timed/bronx/saci-vraptor.csv index cd68f5134d..0b9265c409 100644 --- a/results/combined/merges_timed/bronx/saci-vraptor.csv +++ b/results/combined/merges_timed/bronx/saci-vraptor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,cb9355ed085d8366a0317c7be599c1ffc0256a55,5bd3bdf950aaa203727ed98c937edab28c6429b3,f7da6af523ed9afda669349adfd8f1f2361594ab,,e72316aa393100cdd1b4386d606e305b84124f9e5ea8f3adf4eb3557148b4751,Tests_passed,fd47b49850c946f8857dca98fcf3f4b35c0b3a5edce8ec54a2a9ec81071931cc,Tests_passed,True,True,True,True,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_failed,9b57fae4467f0f70b648d9842aef4bc310ffff01a18f30d22e819a031eb09649,Tests_failed,9b57fae4467f0f70b648d9842aef4bc310ffff01a18f30d22e819a031eb09649,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,0.009358644485473633,0.010475635528564453,0.01024007797241211,0.010410547256469727,0.010519266128540039,0.010383129119873047,0.010027408599853516,0.035186767578125,0.009889841079711914,0.15014052391052246,0.14818739891052246,0.06761527061462402,0.5948057174682617,0.16016101837158203 +1,refs/heads/master,cb9355ed085d8366a0317c7be599c1ffc0256a55,5bd3bdf950aaa203727ed98c937edab28c6429b3,f7da6af523ed9afda669349adfd8f1f2361594ab,,e72316aa393100cdd1b4386d606e305b84124f9e5ea8f3adf4eb3557148b4751,Tests_passed,fd47b49850c946f8857dca98fcf3f4b35c0b3a5edce8ec54a2a9ec81071931cc,Tests_passed,True,True,True,True,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_failed,9b57fae4467f0f70b648d9842aef4bc310ffff01a18f30d22e819a031eb09649,Tests_failed,9b57fae4467f0f70b648d9842aef4bc310ffff01a18f30d22e819a031eb09649,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,0.009358644485473633,0.010475635528564453,0.01024007797241211,0.010410547256469727,0.010519266128540039,0.010383129119873047,0.010027408599853516,0.035186767578125,0.009889841079711914,0.1436140537261963,0.14325833320617676,0.06761527061462402,0.5948057174682617,0.16016101837158203 diff --git a/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv b/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv index 3ffb779ee0..af1aeff2c4 100644 --- a/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv +++ b/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -103,refs/heads/master,2b1a13acb9dd3617392ce7794dc7602908e46900,3b9261bbe998deeee80c9bb1aa5bb293b4367e14,503e498fda03565bedb43a9b7ee4b3fa9b3b5b88,,True,True,f0dd30643fa21bafb6af4f12317388cffacc2f5fc20c84758027a88edb55bd49,Tests_passed,9aa221acf1421d39a4e3e841c443f151bdf14a8c982173ce48140c621e62ea01,Tests_passed,True,True,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,0.009642839431762695,0.009598016738891602,0.009842634201049805,0.009564399719238281,0.010534048080444336,0.010259628295898438,0.009795665740966797,0.033881187438964844,0.009074687957763672,0.14324355125427246,0.14334774017333984,0.06402778625488281,0.5444686412811279,0.18636584281921387 +103,refs/heads/master,2b1a13acb9dd3617392ce7794dc7602908e46900,3b9261bbe998deeee80c9bb1aa5bb293b4367e14,503e498fda03565bedb43a9b7ee4b3fa9b3b5b88,,True,True,f0dd30643fa21bafb6af4f12317388cffacc2f5fc20c84758027a88edb55bd49,Tests_passed,9aa221acf1421d39a4e3e841c443f151bdf14a8c982173ce48140c621e62ea01,Tests_passed,True,True,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,0.009642839431762695,0.009598016738891602,0.009842634201049805,0.009564399719238281,0.010534048080444336,0.010259628295898438,0.009795665740966797,0.033881187438964844,0.009074687957763672,0.1437842845916748,0.1433100700378418,0.06402778625488281,0.5444686412811279,0.18636584281921387 diff --git a/results/combined/merges_timed/brooklyncentral/clocker.csv b/results/combined/merges_timed/brooklyncentral/clocker.csv index 8cf0dae06d..72f00d1eea 100644 --- a/results/combined/merges_timed/brooklyncentral/clocker.csv +++ b/results/combined/merges_timed/brooklyncentral/clocker.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -254,refs/remotes/origin/pull/168,76e41ca0646e971450da04a2fd88a74c32acc0fa,d2afe7308db3df086f829d424adb11a3c9457c44,c3e5c77d178fc046f9e94945b93c7b6ceb592bf2,,True,True,3529cfb0ef4ca30cbd04b1f5a5b9ba47e419ca28a0fd63540bee4ce9b5c689f7,Tests_passed,b9052ed29357ce0599a6b4ed13430b48ba0303c2a6206bab540630c2aa0f674a,Tests_passed,True,True,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,e37329652cc5d6608e1c98465087056fcf96ca56087501e0f12360566e9fb4bb,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,deef0745fd5b220bf7aacca0016c0655461deca3e6bb564f0bc83c49924432f9,Merge_failed,deef0745fd5b220bf7aacca0016c0655461deca3e6bb564f0bc83c49924432f9,Merge_failed,9ee44866e8c4f74ad589568d22ee7fe037980323431f8b80affc50da1c1078f7,Merge_failed,cdab53e313a9c14d67f9ed73359e4fce1a877e8520cc9faf2de8c827ba22111d,Merge_failed,04e9850672b70c2767627a62d241b859f43adb460cb94fee97effe478866dc7d,0.024641036987304688,0.02517867088317871,0.028654098510742188,0.028929471969604492,0.02815532684326172,0.028856992721557617,0.028774499893188477,0.11786675453186035,0.038805484771728516,0.5157618522644043,0.5181894302368164,0.2931327819824219,3.6853456497192383,0.24252820014953613 +254,refs/remotes/origin/pull/168,76e41ca0646e971450da04a2fd88a74c32acc0fa,d2afe7308db3df086f829d424adb11a3c9457c44,c3e5c77d178fc046f9e94945b93c7b6ceb592bf2,,True,True,3529cfb0ef4ca30cbd04b1f5a5b9ba47e419ca28a0fd63540bee4ce9b5c689f7,Tests_passed,b9052ed29357ce0599a6b4ed13430b48ba0303c2a6206bab540630c2aa0f674a,Tests_passed,True,True,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,e37329652cc5d6608e1c98465087056fcf96ca56087501e0f12360566e9fb4bb,Merge_failed,abd18289b3b9563eb3e64384f3d081fcf650b04b37a109080984139a2a86fd39,Merge_failed,deef0745fd5b220bf7aacca0016c0655461deca3e6bb564f0bc83c49924432f9,Merge_failed,deef0745fd5b220bf7aacca0016c0655461deca3e6bb564f0bc83c49924432f9,Merge_failed,9ee44866e8c4f74ad589568d22ee7fe037980323431f8b80affc50da1c1078f7,Merge_failed,cdab53e313a9c14d67f9ed73359e4fce1a877e8520cc9faf2de8c827ba22111d,Merge_failed,04e9850672b70c2767627a62d241b859f43adb460cb94fee97effe478866dc7d,0.024641036987304688,0.02517867088317871,0.028654098510742188,0.028929471969604492,0.02815532684326172,0.028856992721557617,0.028774499893188477,0.11786675453186035,0.038805484771728516,0.49822306632995605,0.509443998336792,0.2931327819824219,3.6853456497192383,0.24252820014953613 diff --git a/results/combined/merges_timed/brunoribeiro/sql-parser.csv b/results/combined/merges_timed/brunoribeiro/sql-parser.csv index 33035e3b52..70e9ec741b 100644 --- a/results/combined/merges_timed/brunoribeiro/sql-parser.csv +++ b/results/combined/merges_timed/brunoribeiro/sql-parser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,ec06c99726c4d7c4d5e94601535cf87c1f62f265,4c768844566b6f1d168a3efba5b26ed3f75fc91e,d298f8d193486310c8813234ec30a280f315c6b0,,True,True,efc4243a431828199adcd76eee29018e2e54b91c49334851ce45606d3c019f30,Tests_passed,9e5ca09cb1c6a5815ba01308d1e7c56f17d7c005ad15caa33aaa810bda44b5a8,Tests_passed,True,True,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,0.04292464256286621,0.05312371253967285,0.07389616966247559,0.03236079216003418,0.04465627670288086,0.05565643310546875,0.04913020133972168,0.21632599830627441,0.07072901725769043,0.1983044147491455,0.1884322166442871,0.12616539001464844,1.5211899280548096,0.3172018527984619 +20,refs/heads/master,ec06c99726c4d7c4d5e94601535cf87c1f62f265,4c768844566b6f1d168a3efba5b26ed3f75fc91e,d298f8d193486310c8813234ec30a280f315c6b0,,True,True,efc4243a431828199adcd76eee29018e2e54b91c49334851ce45606d3c019f30,Tests_passed,9e5ca09cb1c6a5815ba01308d1e7c56f17d7c005ad15caa33aaa810bda44b5a8,Tests_passed,True,True,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,0.04292464256286621,0.05312371253967285,0.07389616966247559,0.03236079216003418,0.04465627670288086,0.05565643310546875,0.04913020133972168,0.21632599830627441,0.07072901725769043,0.19663691520690918,0.18987751007080078,0.12616539001464844,1.5211899280548096,0.3172018527984619 diff --git a/results/combined/merges_timed/bryncooke/cdi-unit.csv b/results/combined/merges_timed/bryncooke/cdi-unit.csv index 49c2be6357..888ff11379 100644 --- a/results/combined/merges_timed/bryncooke/cdi-unit.csv +++ b/results/combined/merges_timed/bryncooke/cdi-unit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,2af8a2a49d84164202df069beadd2041120415d1,472aca06eeb6b7b0859845da02053b0782c7c6fa,a02637bde4ca6947ca84a14958ae6988d6f587b6,,True,True,55d0d9406cdac4af8de163a41136d54577eb78393bde2699af269846ee033e52,Tests_passed,e64a5124920e28161f3c02cdf9ba827718afb9282834699f4461a82492edeccf,Tests_passed,True,True,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,0.04314994812011719,0.043294668197631836,0.04682183265686035,0.05311298370361328,0.05108046531677246,0.04724407196044922,0.04959535598754883,0.2514514923095703,0.05225992202758789,0.3200802803039551,0.320650577545166,0.18256831169128418,0.04402494430541992,0.23350739479064941 +3,refs/heads/master,2af8a2a49d84164202df069beadd2041120415d1,472aca06eeb6b7b0859845da02053b0782c7c6fa,a02637bde4ca6947ca84a14958ae6988d6f587b6,,True,True,55d0d9406cdac4af8de163a41136d54577eb78393bde2699af269846ee033e52,Tests_passed,e64a5124920e28161f3c02cdf9ba827718afb9282834699f4461a82492edeccf,Tests_passed,True,True,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,0.04314994812011719,0.043294668197631836,0.04682183265686035,0.05311298370361328,0.05108046531677246,0.04724407196044922,0.04959535598754883,0.2514514923095703,0.05225992202758789,0.3172008991241455,0.31699562072753906,0.18256831169128418,0.04402494430541992,0.23350739479064941 diff --git a/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv b/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv index 71ad46958d..1bc93d08c5 100644 --- a/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv +++ b/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,e1324f33636a9746384d621cddcea8cedd241318,b5e7156c005b7a106da3e82b051a4bb1fed5a7a7,2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a,,36da6b0742033a2e04186d78207c31ee8d3ae201e8de6c637c24ad09f5fc514b,Tests_passed,9d007c72e73932718f03e83a9cf9a30df50923e3552d94f2de4478057f4417bd,Tests_passed,True,True,True,True,Merge_failed,686ab7ecfe81ca7783e3de590347eea9fcb8de72ddc676401764c5f5ad854e4d,Merge_failed,f7fcd5898c8174dccf753234f6a75f7576671d4e7f9ac86d46b1a44568fab649,Merge_failed,686ab7ecfe81ca7783e3de590347eea9fcb8de72ddc676401764c5f5ad854e4d,Merge_failed,a25a1e0a30273f90680e05d09cf17765641940dcf0e1c7009b51c6208f6b8d6d,Merge_failed,4239f5e3d1b460d0b36382a85a49fd4d3f71660175b3e1b84ee5fab54e8e46da,Merge_failed,4239f5e3d1b460d0b36382a85a49fd4d3f71660175b3e1b84ee5fab54e8e46da,Merge_failed,7b6c4c3d742135cc4a54240e646ccb1cc3783da78cce54a8c8671e70e0edcd46,Merge_failed,bd28f1ab10266431a7cf4517d5dbc5e1f54395708d6fa7346a29f8911c28d6e2,Merge_failed,686ab7ecfe81ca7783e3de590347eea9fcb8de72ddc676401764c5f5ad854e4d,Merge_failed,9ffe5cff2b225ddc76f8e7019950ed06d18a653f835883401a7fb57a8bcc48c2,Merge_failed,2a8472e987987593fd60fefd40d34be4ab4c8aa7b24d4e32fc195bbb6dae766d,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,990e5c906bd4600e008e1016c8e43689a44963d03f03222a04782cc67efbe8e0,Merge_failed,7549cec2a5a1004651adb5cffcfbf2b0e356393c839a9f8351ef640c2c0f705c,0.012783288955688477,0.01258230209350586,0.012273788452148438,0.01244807243347168,0.012543916702270508,0.012357234954833984,0.01270914077758789,0.14211821556091309,0.03598213195800781,0.338315486907959,0.34018969535827637,0.5621793270111084,2.3340699672698975,0.1889195442199707 +1,refs/heads/master,e1324f33636a9746384d621cddcea8cedd241318,b5e7156c005b7a106da3e82b051a4bb1fed5a7a7,2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a,,36da6b0742033a2e04186d78207c31ee8d3ae201e8de6c637c24ad09f5fc514b,Tests_passed,9d007c72e73932718f03e83a9cf9a30df50923e3552d94f2de4478057f4417bd,Tests_passed,True,True,True,True,Merge_failed,686ab7ecfe81ca7783e3de590347eea9fcb8de72ddc676401764c5f5ad854e4d,Merge_failed,f7fcd5898c8174dccf753234f6a75f7576671d4e7f9ac86d46b1a44568fab649,Merge_failed,686ab7ecfe81ca7783e3de590347eea9fcb8de72ddc676401764c5f5ad854e4d,Merge_failed,a25a1e0a30273f90680e05d09cf17765641940dcf0e1c7009b51c6208f6b8d6d,Merge_failed,4239f5e3d1b460d0b36382a85a49fd4d3f71660175b3e1b84ee5fab54e8e46da,Merge_failed,4239f5e3d1b460d0b36382a85a49fd4d3f71660175b3e1b84ee5fab54e8e46da,Merge_failed,7b6c4c3d742135cc4a54240e646ccb1cc3783da78cce54a8c8671e70e0edcd46,Merge_failed,bd28f1ab10266431a7cf4517d5dbc5e1f54395708d6fa7346a29f8911c28d6e2,Merge_failed,686ab7ecfe81ca7783e3de590347eea9fcb8de72ddc676401764c5f5ad854e4d,Merge_failed,9ffe5cff2b225ddc76f8e7019950ed06d18a653f835883401a7fb57a8bcc48c2,Merge_failed,2a8472e987987593fd60fefd40d34be4ab4c8aa7b24d4e32fc195bbb6dae766d,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,990e5c906bd4600e008e1016c8e43689a44963d03f03222a04782cc67efbe8e0,Merge_failed,7549cec2a5a1004651adb5cffcfbf2b0e356393c839a9f8351ef640c2c0f705c,0.012783288955688477,0.01258230209350586,0.012273788452148438,0.01244807243347168,0.012543916702270508,0.012357234954833984,0.01270914077758789,0.14211821556091309,0.03598213195800781,0.323375940322876,0.32477784156799316,0.5621793270111084,2.3340699672698975,0.1889195442199707 diff --git a/results/combined/merges_timed/bserdar/jcliff.csv b/results/combined/merges_timed/bserdar/jcliff.csv index 913d498068..16c66353c9 100644 --- a/results/combined/merges_timed/bserdar/jcliff.csv +++ b/results/combined/merges_timed/bserdar/jcliff.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,f92b40d0588bda3a035268bcdf9cbf0ac8e6acaa,f9cbdf1261bdf671b12271025acf11f887bf47c2,6e4ddbd168592ee1df3de326fce2d1e1f16c995f,,cd8946a704702159be7623b35cf5229e744effe1c88eb74c1383f193415b3d6e,Tests_passed,54cb902b3f59390abb61d730bfde833e7a73604e9f60d356f87740cb43c2c899,Tests_passed,True,True,True,True,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,0.04919242858886719,0.0510249137878418,0.05398416519165039,0.04811549186706543,0.05256485939025879,0.04236340522766113,0.037043094635009766,0.17114949226379395,0.04247450828552246,0.15927743911743164,0.15795326232910156,0.10742735862731934,0.9970958232879639,0.27040863037109375 +5,refs/heads/master,f92b40d0588bda3a035268bcdf9cbf0ac8e6acaa,f9cbdf1261bdf671b12271025acf11f887bf47c2,6e4ddbd168592ee1df3de326fce2d1e1f16c995f,,cd8946a704702159be7623b35cf5229e744effe1c88eb74c1383f193415b3d6e,Tests_passed,54cb902b3f59390abb61d730bfde833e7a73604e9f60d356f87740cb43c2c899,Tests_passed,True,True,True,True,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,0.04919242858886719,0.0510249137878418,0.05398416519165039,0.04811549186706543,0.05256485939025879,0.04236340522766113,0.037043094635009766,0.17114949226379395,0.04247450828552246,0.15773391723632812,0.15816760063171387,0.10742735862731934,0.9970958232879639,0.27040863037109375 diff --git a/results/combined/merges_timed/btrplace/scheduler.csv b/results/combined/merges_timed/btrplace/scheduler.csv index 8ef5820b3a..07d0bf1bfe 100644 --- a/results/combined/merges_timed/btrplace/scheduler.csv +++ b/results/combined/merges_timed/btrplace/scheduler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -171,refs/heads/master,e98de3367896653a65052d04949c3d13f171d17d,6cd3ec8922c81f00b8ddba838c47c585fcf9ca25,f729a9d848a5e0ade380322464b3bf719357772a,,True,True,5b56903c911ed6e7008bc1120895e8b07bdeb132887d6eec7f8c67b3d27595bd,Tests_passed,b4622299446ab885d96cd8679127032bd920ccc385935298c45ce602b18120ea,Tests_passed,True,True,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,5cc2e7713a6369c6414863974f848d1d423ee4c71c8cd15dab7d7323a799332d,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,1f54c897509b352881c998affa28e99a36b2de1655824f52088588ae8b8ddb1b,Merge_failed,1f54c897509b352881c998affa28e99a36b2de1655824f52088588ae8b8ddb1b,Merge_failed,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,4d54f49843f83c43d3eb0f1752f52d228f1c3283fd39a501321ae58a0211cc83,Merge_failed,8f98c17c6648d505315dfef750057ba027a113fc4a37eac472ee47e0afe452f5,0.0537419319152832,0.03619098663330078,0.06673502922058105,0.0634317398071289,0.06121206283569336,0.05717206001281738,0.06220436096191406,0.31375718116760254,0.12128114700317383,0.1671924591064453,0.1685047149658203,0.2001039981842041,1.2184102535247803,0.3814082145690918 +171,refs/heads/master,e98de3367896653a65052d04949c3d13f171d17d,6cd3ec8922c81f00b8ddba838c47c585fcf9ca25,f729a9d848a5e0ade380322464b3bf719357772a,,True,True,5b56903c911ed6e7008bc1120895e8b07bdeb132887d6eec7f8c67b3d27595bd,Tests_passed,b4622299446ab885d96cd8679127032bd920ccc385935298c45ce602b18120ea,Tests_passed,True,True,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,5cc2e7713a6369c6414863974f848d1d423ee4c71c8cd15dab7d7323a799332d,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,1f54c897509b352881c998affa28e99a36b2de1655824f52088588ae8b8ddb1b,Merge_failed,1f54c897509b352881c998affa28e99a36b2de1655824f52088588ae8b8ddb1b,Merge_failed,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,4d54f49843f83c43d3eb0f1752f52d228f1c3283fd39a501321ae58a0211cc83,Merge_failed,8f98c17c6648d505315dfef750057ba027a113fc4a37eac472ee47e0afe452f5,0.0537419319152832,0.03619098663330078,0.06673502922058105,0.0634317398071289,0.06121206283569336,0.05717206001281738,0.06220436096191406,0.31375718116760254,0.12128114700317383,0.16764092445373535,0.17003345489501953,0.2001039981842041,1.2184102535247803,0.3814082145690918 diff --git a/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv b/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv index 1e29d67761..192ec19e87 100644 --- a/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv +++ b/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -59,refs/heads/master,add022f6eee649d0bb3a578dbd43412abe750398,07e445684c08c14cb559b65b8e950dc48fe8f24d,1e845e6e49fcd1c4da5690fbc9c4514ae445bc39,,True,True,85c8d5cdba361e5e2979b588433736af6bc7e5b6c3938da2cb830999c02b37e1,Tests_passed,8566262c7b23ea71ca58cdc08694a779778b65c7d1ecaa99f2fbb4bf4fa494f8,Tests_passed,True,True,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Merge_failed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Merge_failed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,918be263f4aac70c1d4a120fe82849d2ffb3694f95d8fe40bf79470818e4a629,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,0.043459177017211914,0.047933101654052734,0.062213897705078125,0.0662696361541748,0.05861163139343262,0.04194307327270508,0.05280280113220215,0.23126912117004395,0.05677318572998047,0.07411813735961914,0.09386849403381348,0.1873784065246582,0.8446598052978516,0.2892017364501953 +59,refs/heads/master,add022f6eee649d0bb3a578dbd43412abe750398,07e445684c08c14cb559b65b8e950dc48fe8f24d,1e845e6e49fcd1c4da5690fbc9c4514ae445bc39,,True,True,85c8d5cdba361e5e2979b588433736af6bc7e5b6c3938da2cb830999c02b37e1,Tests_passed,8566262c7b23ea71ca58cdc08694a779778b65c7d1ecaa99f2fbb4bf4fa494f8,Tests_passed,True,True,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Merge_failed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Merge_failed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,918be263f4aac70c1d4a120fe82849d2ffb3694f95d8fe40bf79470818e4a629,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,0.043459177017211914,0.047933101654052734,0.062213897705078125,0.0662696361541748,0.05861163139343262,0.04194307327270508,0.05280280113220215,0.23126912117004395,0.05677318572998047,0.0930173397064209,0.09299421310424805,0.1873784065246582,0.8446598052978516,0.2892017364501953 diff --git a/results/combined/merges_timed/bujiio/buji-pac4j.csv b/results/combined/merges_timed/bujiio/buji-pac4j.csv index 463d571850..f5978f72c4 100644 --- a/results/combined/merges_timed/bujiio/buji-pac4j.csv +++ b/results/combined/merges_timed/bujiio/buji-pac4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -35,refs/remotes/origin/pull/68,1c7eb2acf1643212c399c9485bd30e3fdd5d88a8,3adfb5dce2e27bf2b7f1946ec097a7af5e324c71,92702c61d9db078febf717bbeea5e237a4bf9d2f,,True,True,6198764f3533235188bb2e6581b643063bf9eb96f6185322429a185816903c5c,Tests_passed,b1221a13d7bdfd0ebeab7f885fdf6b845ffb9490af9ab9d4cc6a16daf6b24fda,Tests_passed,True,True,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,40c7c9f69167bc0109ca1ec7abc69160c2afc4fd4105c02e5e5ab133acf2b906,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,40c7c9f69167bc0109ca1ec7abc69160c2afc4fd4105c02e5e5ab133acf2b906,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,e9be992eaf90dcaa406f0251132529fc177d66ba4f08824cdf999e789a682dcc,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,436cf39fbbbe61e50132216729b02805a618cfa04a37f05724c291895caf6786,Merge_failed,436cf39fbbbe61e50132216729b02805a618cfa04a37f05724c291895caf6786,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Merge_failed,74a22cb51b0b248befc1acc237704ab8d8387717acbcfb0db6ea647726c5b571,0.008528470993041992,0.008322715759277344,0.008201837539672852,0.00797724723815918,0.008054733276367188,0.008100509643554688,0.008189678192138672,0.03274798393249512,0.014325380325317383,0.06598401069641113,0.0662684440612793,0.06450676918029785,0.5221312046051025,0.16872310638427734 +35,refs/remotes/origin/pull/68,1c7eb2acf1643212c399c9485bd30e3fdd5d88a8,3adfb5dce2e27bf2b7f1946ec097a7af5e324c71,92702c61d9db078febf717bbeea5e237a4bf9d2f,,True,True,6198764f3533235188bb2e6581b643063bf9eb96f6185322429a185816903c5c,Tests_passed,b1221a13d7bdfd0ebeab7f885fdf6b845ffb9490af9ab9d4cc6a16daf6b24fda,Tests_passed,True,True,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,40c7c9f69167bc0109ca1ec7abc69160c2afc4fd4105c02e5e5ab133acf2b906,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,40c7c9f69167bc0109ca1ec7abc69160c2afc4fd4105c02e5e5ab133acf2b906,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,e9be992eaf90dcaa406f0251132529fc177d66ba4f08824cdf999e789a682dcc,Merge_failed,d65a88b874c82b956dc4fa5a5310c027c8218c48428ca3c96cb10bbf9006105b,Merge_failed,436cf39fbbbe61e50132216729b02805a618cfa04a37f05724c291895caf6786,Merge_failed,436cf39fbbbe61e50132216729b02805a618cfa04a37f05724c291895caf6786,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Merge_failed,74a22cb51b0b248befc1acc237704ab8d8387717acbcfb0db6ea647726c5b571,0.008528470993041992,0.008322715759277344,0.008201837539672852,0.00797724723815918,0.008054733276367188,0.008100509643554688,0.008189678192138672,0.03274798393249512,0.014325380325317383,0.06575369834899902,0.06560301780700684,0.06450676918029785,0.5221312046051025,0.16872310638427734 diff --git a/results/combined/merges_timed/buschmais/extended-objects.csv b/results/combined/merges_timed/buschmais/extended-objects.csv index 8167688be1..28f38b1195 100644 --- a/results/combined/merges_timed/buschmais/extended-objects.csv +++ b/results/combined/merges_timed/buschmais/extended-objects.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,46ec306cf6bed6dbcfa790383ae80542ebb61324,8b434139ec272993f04775ae7c4c2b3d3597d90a,7c316187356cf8c77c63e56af510fefeeeda73ca,,True,True,74f567f50a2c83d24c13cf4678bd243ce56b64f2510237cc2af460cfb1252d1c,Tests_passed,184bd57cbc90be0e41f6a750b7226c079670824734f7fb14ebeadd0304a3bca8,Tests_passed,True,True,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,0.02429819107055664,0.023638486862182617,0.02200460433959961,0.022686481475830078,0.022323131561279297,0.03426551818847656,0.034597158432006836,0.04926919937133789,0.01603412628173828,0.18422269821166992,0.18966913223266602,0.08048868179321289,0.9528591632843018,0.4456450939178467 +7,refs/heads/master,46ec306cf6bed6dbcfa790383ae80542ebb61324,8b434139ec272993f04775ae7c4c2b3d3597d90a,7c316187356cf8c77c63e56af510fefeeeda73ca,,True,True,74f567f50a2c83d24c13cf4678bd243ce56b64f2510237cc2af460cfb1252d1c,Tests_passed,184bd57cbc90be0e41f6a750b7226c079670824734f7fb14ebeadd0304a3bca8,Tests_passed,True,True,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,0.02429819107055664,0.023638486862182617,0.02200460433959961,0.022686481475830078,0.022323131561279297,0.03426551818847656,0.034597158432006836,0.04926919937133789,0.01603412628173828,0.18639826774597168,0.18620514869689941,0.08048868179321289,0.9528591632843018,0.4456450939178467 diff --git a/results/combined/merges_timed/bytedeco/javacpp.csv b/results/combined/merges_timed/bytedeco/javacpp.csv index f4da2fa80c..3ee9b01b3c 100644 --- a/results/combined/merges_timed/bytedeco/javacpp.csv +++ b/results/combined/merges_timed/bytedeco/javacpp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -43,refs/remotes/origin/pull/658,d0d81140d1557312cd24f331fdc54cfbe4af33e5,c78695feb6c380b5dd72151eb85e7da8e9926925,7a72aacb313e6b2bc488147a4cb2e89ef5eecac8,,c5064432e6d1e38a608b3c04be7522852ff5a60987081cc89301526816f2e8cc,Tests_passed,4e2250bff77ced11abbd1dfd94c7843c9d4e25870d0c40b7d11d101f9ebaf73d,Tests_passed,True,True,True,True,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,ba9e08f0cd722cee8f813a075241adbbe82a51631dce1da94f734489b3683577,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,6196388f618e9ffc399ba48244afabfb8f7d2af8bb61d1af20eea3c54ba8818e,Merge_failed,6196388f618e9ffc399ba48244afabfb8f7d2af8bb61d1af20eea3c54ba8818e,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Tests_passed,3e5b13892ff7a6f9e8489fe9702280df931bc211d589fed82befd7e4baf89566,Merge_failed,4bb6de901575a635c0b7311e0c0addeda481b6ca450f066a2e78dcb852acca98,0.04938936233520508,0.048209190368652344,0.04940032958984375,0.03403615951538086,0.053556203842163086,0.059857845306396484,0.03450894355773926,0.1909186840057373,0.07374334335327148,0.09711217880249023,0.09765958786010742,0.1036531925201416,5.2480409145355225,0.2519819736480713 +43,refs/remotes/origin/pull/658,d0d81140d1557312cd24f331fdc54cfbe4af33e5,c78695feb6c380b5dd72151eb85e7da8e9926925,7a72aacb313e6b2bc488147a4cb2e89ef5eecac8,,c5064432e6d1e38a608b3c04be7522852ff5a60987081cc89301526816f2e8cc,Tests_passed,4e2250bff77ced11abbd1dfd94c7843c9d4e25870d0c40b7d11d101f9ebaf73d,Tests_passed,True,True,True,True,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,ba9e08f0cd722cee8f813a075241adbbe82a51631dce1da94f734489b3683577,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,6196388f618e9ffc399ba48244afabfb8f7d2af8bb61d1af20eea3c54ba8818e,Merge_failed,6196388f618e9ffc399ba48244afabfb8f7d2af8bb61d1af20eea3c54ba8818e,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Tests_passed,3e5b13892ff7a6f9e8489fe9702280df931bc211d589fed82befd7e4baf89566,Merge_failed,4bb6de901575a635c0b7311e0c0addeda481b6ca450f066a2e78dcb852acca98,0.04938936233520508,0.048209190368652344,0.04940032958984375,0.03403615951538086,0.053556203842163086,0.059857845306396484,0.03450894355773926,0.1909186840057373,0.07374334335327148,0.08566093444824219,0.09581875801086426,0.1036531925201416,5.2480409145355225,0.2519819736480713 diff --git a/results/combined/merges_timed/caelum/vraptor-console.csv b/results/combined/merges_timed/caelum/vraptor-console.csv index cc6414e349..4c735ed0a7 100644 --- a/results/combined/merges_timed/caelum/vraptor-console.csv +++ b/results/combined/merges_timed/caelum/vraptor-console.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,75017316626095be7d4b6cbb4c1532561e1ff8a1,10d80abb189438236c5a5d5723c222ec28a69ee8,db3d6f9a2375d14d9a96c2281572a6741acb32bd,,96a540f2c8b27352d25886f40f3478f5b1002c52e02d6129a9f63c86bb124927,Tests_passed,4ab414c3cb61a6dabbfc4c8be31374cf153b0441f0da8203d36f1c64939d8987,Tests_passed,True,True,True,True,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,0a725314e82bc8b3f61fdab978411ab12eddeaba1addc5d75ca6ab6f2a78a827,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,b29cbc6e0aafe42a7ecce010196a787fbb5986fe43bfefb7d2ff9b382631597c,Merge_failed,b29cbc6e0aafe42a7ecce010196a787fbb5986fe43bfefb7d2ff9b382631597c,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Merge_failed,c09f4ba1d727bd85b0641685dfa98f7c9903e297d0c3d09519d12d527769e7fe,0.03743886947631836,0.03560638427734375,0.03322124481201172,0.03760576248168945,0.03968310356140137,0.03226590156555176,0.04080796241760254,0.16326403617858887,0.06597256660461426,0.0795433521270752,0.0796823501586914,0.10766959190368652,0.51505446434021,0.18456172943115234 +4,refs/heads/master,75017316626095be7d4b6cbb4c1532561e1ff8a1,10d80abb189438236c5a5d5723c222ec28a69ee8,db3d6f9a2375d14d9a96c2281572a6741acb32bd,,96a540f2c8b27352d25886f40f3478f5b1002c52e02d6129a9f63c86bb124927,Tests_passed,4ab414c3cb61a6dabbfc4c8be31374cf153b0441f0da8203d36f1c64939d8987,Tests_passed,True,True,True,True,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,0a725314e82bc8b3f61fdab978411ab12eddeaba1addc5d75ca6ab6f2a78a827,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,b29cbc6e0aafe42a7ecce010196a787fbb5986fe43bfefb7d2ff9b382631597c,Merge_failed,b29cbc6e0aafe42a7ecce010196a787fbb5986fe43bfefb7d2ff9b382631597c,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Merge_failed,c09f4ba1d727bd85b0641685dfa98f7c9903e297d0c3d09519d12d527769e7fe,0.03743886947631836,0.03560638427734375,0.03322124481201172,0.03760576248168945,0.03968310356140137,0.03226590156555176,0.04080796241760254,0.16326403617858887,0.06597256660461426,0.07918405532836914,0.07867789268493652,0.10766959190368652,0.51505446434021,0.18456172943115234 diff --git a/results/combined/merges_timed/caelum/vraptor-environment.csv b/results/combined/merges_timed/caelum/vraptor-environment.csv index a9d904e69a..c6027beef5 100644 --- a/results/combined/merges_timed/caelum/vraptor-environment.csv +++ b/results/combined/merges_timed/caelum/vraptor-environment.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,57463c6eb5148d0640081dab2ba0099937ba72ed,f708e7975329930f818ed9ba45ec415748b2d73b,b95e39f1416ceff938c759f0684bdce789a93e59,,True,True,011ec18143fe90baa19f61869023d2caaabc431a5473ed0b83a428e24551e0e8,Tests_passed,e8885593a15b29783e6b151351f0dfaa4c5235a1ca60b11cf91679b2c69aa5f2,Tests_passed,True,True,Merge_failed,97c6aceae25f885ace8fa08f06009bb71643f4525c0b9bc146aa1738516245ea,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,97c6aceae25f885ace8fa08f06009bb71643f4525c0b9bc146aa1738516245ea,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,7f73409bfaea48b9b12a1fa58bd9e15113eeacda7949a5f8ca9a26400537b5eb,Merge_failed,9c8a55669205d9f3dbb68e5e9880ca9b4b588d77a0d8339ff8cd529986d202ea,Merge_failed,97c6aceae25f885ace8fa08f06009bb71643f4525c0b9bc146aa1738516245ea,Merge_failed,cf00d9f02dd836b23960bc9ccbf4876d67b215d2732a159d826e8a09b61b993c,Merge_failed,cf00d9f02dd836b23960bc9ccbf4876d67b215d2732a159d826e8a09b61b993c,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,2720cd2481515561bdaba21ca01454a9be41f3916d111c9c46a8feaba93a297a,0.008309125900268555,0.00828862190246582,0.007877111434936523,0.0077893733978271484,0.007863521575927734,0.007895708084106445,0.007858037948608398,0.0561823844909668,0.017200469970703125,0.17007112503051758,0.16908574104309082,0.17727375030517578,1.028254747390747,0.15361452102661133 +3,refs/heads/master,57463c6eb5148d0640081dab2ba0099937ba72ed,f708e7975329930f818ed9ba45ec415748b2d73b,b95e39f1416ceff938c759f0684bdce789a93e59,,True,True,011ec18143fe90baa19f61869023d2caaabc431a5473ed0b83a428e24551e0e8,Tests_passed,e8885593a15b29783e6b151351f0dfaa4c5235a1ca60b11cf91679b2c69aa5f2,Tests_passed,True,True,Merge_failed,97c6aceae25f885ace8fa08f06009bb71643f4525c0b9bc146aa1738516245ea,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,97c6aceae25f885ace8fa08f06009bb71643f4525c0b9bc146aa1738516245ea,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,7f73409bfaea48b9b12a1fa58bd9e15113eeacda7949a5f8ca9a26400537b5eb,Merge_failed,9c8a55669205d9f3dbb68e5e9880ca9b4b588d77a0d8339ff8cd529986d202ea,Merge_failed,97c6aceae25f885ace8fa08f06009bb71643f4525c0b9bc146aa1738516245ea,Merge_failed,cf00d9f02dd836b23960bc9ccbf4876d67b215d2732a159d826e8a09b61b993c,Merge_failed,cf00d9f02dd836b23960bc9ccbf4876d67b215d2732a159d826e8a09b61b993c,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,2720cd2481515561bdaba21ca01454a9be41f3916d111c9c46a8feaba93a297a,0.008309125900268555,0.00828862190246582,0.007877111434936523,0.0077893733978271484,0.007863521575927734,0.007895708084106445,0.007858037948608398,0.0561823844909668,0.017200469970703125,0.1597728729248047,0.16977214813232422,0.17727375030517578,1.028254747390747,0.15361452102661133 diff --git a/results/combined/merges_timed/campagnelaboratory/metar.csv b/results/combined/merges_timed/campagnelaboratory/metar.csv index b40daa9d7b..7cbefdd879 100644 --- a/results/combined/merges_timed/campagnelaboratory/metar.csv +++ b/results/combined/merges_timed/campagnelaboratory/metar.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -112,refs/heads/master,61182b0126310c7d1928e46a272f2e0a45e60627,2f9f9f0632c66144b9e64ac972d4b1c28a5658a7,07b736d27431c9d7db5768a8d13da0b30eff5217,,True,True,bcc741c9fc5c52f601790a2ac1e943c59950b10e3449469c87edf43303c4d33e,Tests_passed,7c95a505066ee15005c8fa7160004b6191e9af61dc404cb1e445200c8e046aa3,Tests_passed,True,True,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,dd1acae356a8e4ad86fc3bbba5221ebf6ae7c7a29353a92241e952c337612f27,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,e7f52d4027a5f3414d0b104c80f60f0b9ca537a96c1b88902cbb671173547d31,Merge_failed,b1f60d7bd859935309687fb0f01425b9be2125865fda8a2add2027f10b80b76f,Merge_failed,e704beb63ac8c084b71778414b5b4f829dd97169ea33868fafea4b821210960c,Merge_failed,ee54d577817039f1ef4ccef25588d472c97d02d549d85af42fc8b1511e3ef710,Merge_failed,ee54d577817039f1ef4ccef25588d472c97d02d549d85af42fc8b1511e3ef710,0.08980941772460938,0.1245880126953125,0.09685039520263672,0.0995173454284668,0.13304591178894043,0.09218788146972656,0.1078639030456543,0.35518836975097656,0.11009478569030762,0.18421292304992676,0.19339442253112793,0.38462162017822266,0.10971474647521973,0.3919539451599121 +112,refs/heads/master,61182b0126310c7d1928e46a272f2e0a45e60627,2f9f9f0632c66144b9e64ac972d4b1c28a5658a7,07b736d27431c9d7db5768a8d13da0b30eff5217,,True,True,bcc741c9fc5c52f601790a2ac1e943c59950b10e3449469c87edf43303c4d33e,Tests_passed,7c95a505066ee15005c8fa7160004b6191e9af61dc404cb1e445200c8e046aa3,Tests_passed,True,True,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,dd1acae356a8e4ad86fc3bbba5221ebf6ae7c7a29353a92241e952c337612f27,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,e7f52d4027a5f3414d0b104c80f60f0b9ca537a96c1b88902cbb671173547d31,Merge_failed,b1f60d7bd859935309687fb0f01425b9be2125865fda8a2add2027f10b80b76f,Merge_failed,e704beb63ac8c084b71778414b5b4f829dd97169ea33868fafea4b821210960c,Merge_failed,ee54d577817039f1ef4ccef25588d472c97d02d549d85af42fc8b1511e3ef710,Merge_failed,ee54d577817039f1ef4ccef25588d472c97d02d549d85af42fc8b1511e3ef710,0.08980941772460938,0.1245880126953125,0.09685039520263672,0.0995173454284668,0.13304591178894043,0.09218788146972656,0.1078639030456543,0.35518836975097656,0.11009478569030762,0.1831986904144287,0.180283784866333,0.38462162017822266,0.10971474647521973,0.3919539451599121 diff --git a/results/combined/merges_timed/camsys/onebusaway-application-modules.csv b/results/combined/merges_timed/camsys/onebusaway-application-modules.csv index 14c53bca74..e11d172c3e 100644 --- a/results/combined/merges_timed/camsys/onebusaway-application-modules.csv +++ b/results/combined/merges_timed/camsys/onebusaway-application-modules.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -590,refs/remotes/origin/pull/139,a69d7b197eba2af2372cec23b93f547cb68342db,712aa4df21cf5249e26538de0f6a649ccd62cfde,c6116bb0dd552fe5c3b1edb98258d5223d808ad4,,True,True,8fb373a62eb9d694c6e7431a5c10d5b37440528279eef8884a7f0a8dae56a46c,Tests_passed,c6356e272dab48b5fff87aa19e50a7d6adc8fed72bfad14a0c32e64f0dd5d85f,Tests_passed,True,True,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,a94f2f84007648a218ff55927484f8584313a23d364385caf909a9432c7f3673,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,88d8b27062d9dfad391dc50f85bb31ffaf2d911a297fe635a9167e3e4b303cc3,Merge_failed,88d8b27062d9dfad391dc50f85bb31ffaf2d911a297fe635a9167e3e4b303cc3,Merge_failed,4f69d9130a79c20bc509853f251311e4428a300c58d225d71f5040684af434b6,Merge_failed,fe88493a1932f4ea26ada1123e70d9a9dc7962d7669b57a4fd1d4d3f50c1c66d,Merge_failed,88d8b27062d9dfad391dc50f85bb31ffaf2d911a297fe635a9167e3e4b303cc3,0.03401994705200195,0.03522348403930664,0.03727269172668457,0.03726696968078613,0.0368649959564209,0.037052154541015625,0.03722786903381348,0.6336073875427246,0.1737985610961914,0.20830655097961426,0.20984244346618652,2.4250152111053467,1.6556003093719482,0.6492605209350586 +590,refs/remotes/origin/pull/139,a69d7b197eba2af2372cec23b93f547cb68342db,712aa4df21cf5249e26538de0f6a649ccd62cfde,c6116bb0dd552fe5c3b1edb98258d5223d808ad4,,True,True,8fb373a62eb9d694c6e7431a5c10d5b37440528279eef8884a7f0a8dae56a46c,Tests_passed,c6356e272dab48b5fff87aa19e50a7d6adc8fed72bfad14a0c32e64f0dd5d85f,Tests_passed,True,True,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,a94f2f84007648a218ff55927484f8584313a23d364385caf909a9432c7f3673,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,88d8b27062d9dfad391dc50f85bb31ffaf2d911a297fe635a9167e3e4b303cc3,Merge_failed,88d8b27062d9dfad391dc50f85bb31ffaf2d911a297fe635a9167e3e4b303cc3,Merge_failed,4f69d9130a79c20bc509853f251311e4428a300c58d225d71f5040684af434b6,Merge_failed,fe88493a1932f4ea26ada1123e70d9a9dc7962d7669b57a4fd1d4d3f50c1c66d,Merge_failed,88d8b27062d9dfad391dc50f85bb31ffaf2d911a297fe635a9167e3e4b303cc3,0.03401994705200195,0.03522348403930664,0.03727269172668457,0.03726696968078613,0.0368649959564209,0.037052154541015625,0.03722786903381348,0.6336073875427246,0.1737985610961914,0.20647239685058594,0.20634841918945312,2.4250152111053467,1.6556003093719482,0.6492605209350586 diff --git a/results/combined/merges_timed/camunda/camunda-archetypes.csv b/results/combined/merges_timed/camunda/camunda-archetypes.csv index 7cc600c656..6cdffa6b01 100644 --- a/results/combined/merges_timed/camunda/camunda-archetypes.csv +++ b/results/combined/merges_timed/camunda/camunda-archetypes.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,4bc11ca34e0b8a811a6d5f12d45eaddd2f646cc6,a82d4b5ccd4d730dc2544bd5ee00870a91f30f09,b031aef316b7324b624b71a198e41e9cd434e08b,,True,True,5b339b1582680df894e0747a589001c73a274ba807c9b7cdc51376bc6585ff9e,Tests_passed,ffd6854096cd1b0c1e25215dec348f4f44892c9cce2bd941cbdf9c830739b0bf,Tests_passed,True,True,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,74455faeb96487ad3d4a4b23b99208da5181dc186e89806590406663fc64048a,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,74455faeb96487ad3d4a4b23b99208da5181dc186e89806590406663fc64048a,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,6c5ef51d45be5db671ae0a207133f053db1af3f7fdc45e052266fbf963004712,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,707ff466edc2090fd32ef4fb6607c0a4758033df8f304311fcf46f298cbafe1c,Merge_failed,707ff466edc2090fd32ef4fb6607c0a4758033df8f304311fcf46f298cbafe1c,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,a8df1c2cee8d1ce9929447beec3482d2a895929586f7eafdcf0c17853b259f50,Merge_failed,c2f964f9673867d125aa2401bacf8c87682db279e9f179948a2037b2f9784796,0.06413102149963379,0.0640265941619873,0.07694721221923828,0.05858635902404785,0.06177377700805664,0.05802011489868164,0.057660579681396484,1.4624695777893066,0.1506788730621338,0.8038797378540039,0.8011679649353027,1.5384533405303955,3.5557923316955566,0.2742643356323242 +3,refs/heads/master,4bc11ca34e0b8a811a6d5f12d45eaddd2f646cc6,a82d4b5ccd4d730dc2544bd5ee00870a91f30f09,b031aef316b7324b624b71a198e41e9cd434e08b,,True,True,5b339b1582680df894e0747a589001c73a274ba807c9b7cdc51376bc6585ff9e,Tests_passed,ffd6854096cd1b0c1e25215dec348f4f44892c9cce2bd941cbdf9c830739b0bf,Tests_passed,True,True,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,74455faeb96487ad3d4a4b23b99208da5181dc186e89806590406663fc64048a,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,74455faeb96487ad3d4a4b23b99208da5181dc186e89806590406663fc64048a,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,6c5ef51d45be5db671ae0a207133f053db1af3f7fdc45e052266fbf963004712,Merge_failed,1dccd96ce870aa99cb0e25309dbfedd3aa8b890c63a9d4536c875f84f6200ea4,Merge_failed,707ff466edc2090fd32ef4fb6607c0a4758033df8f304311fcf46f298cbafe1c,Merge_failed,707ff466edc2090fd32ef4fb6607c0a4758033df8f304311fcf46f298cbafe1c,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,a8df1c2cee8d1ce9929447beec3482d2a895929586f7eafdcf0c17853b259f50,Merge_failed,c2f964f9673867d125aa2401bacf8c87682db279e9f179948a2037b2f9784796,0.06413102149963379,0.0640265941619873,0.07694721221923828,0.05858635902404785,0.06177377700805664,0.05802011489868164,0.057660579681396484,1.4624695777893066,0.1506788730621338,0.8023216724395752,0.8034176826477051,1.5384533405303955,3.5557923316955566,0.2742643356323242 diff --git a/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv b/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv index 8599e5c3f3..9d0593d7e5 100644 --- a/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv +++ b/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -43,refs/remotes/origin/pull/84,3b9d3c98b5b6e2dd753097976e21ee5e3ca2ae0b,f86608325b39b5c68f406056fce6b8bfd30fd593,982b05589592f024e3fbf0af3a31862d804eeddb,,True,True,b7be287fbaa90321d59d6fdb858dcf30099b5351e82c2eae99dbb59f38b01a53,Tests_passed,ed78dec0f4c077fef2fdc6ed29d89dc8975b4c0668167aeedb1c9419156074c7,Tests_passed,True,True,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,24006533df8d7e7c72851d37d59bb7812537772c412b58f3d9135ebc9e04d876,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Tests_failed,ff80ed88b289a54df87810a8fd691c881863f292ad84a184113171b48ba8a8ac,Tests_failed,ff80ed88b289a54df87810a8fd691c881863f292ad84a184113171b48ba8a8ac,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Merge_failed,5128927485c23f8db1480b89f592e275df0f4f176a60ccb61c81ac304f4eff15,0.017400026321411133,0.018187999725341797,0.020037174224853516,0.01997232437133789,0.020138978958129883,0.019504785537719727,0.019786596298217773,0.049218177795410156,0.02391338348388672,0.16560792922973633,0.1579134464263916,0.07809782028198242,0.7609455585479736,0.18793940544128418 +43,refs/remotes/origin/pull/84,3b9d3c98b5b6e2dd753097976e21ee5e3ca2ae0b,f86608325b39b5c68f406056fce6b8bfd30fd593,982b05589592f024e3fbf0af3a31862d804eeddb,,True,True,b7be287fbaa90321d59d6fdb858dcf30099b5351e82c2eae99dbb59f38b01a53,Tests_passed,ed78dec0f4c077fef2fdc6ed29d89dc8975b4c0668167aeedb1c9419156074c7,Tests_passed,True,True,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Merge_failed,24006533df8d7e7c72851d37d59bb7812537772c412b58f3d9135ebc9e04d876,Merge_failed,c0dc84e5ae1278ded4ca9fd1c09caeb640b0a3991a8f8c9d956faa5b85fb62e2,Tests_failed,ff80ed88b289a54df87810a8fd691c881863f292ad84a184113171b48ba8a8ac,Tests_failed,ff80ed88b289a54df87810a8fd691c881863f292ad84a184113171b48ba8a8ac,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Merge_failed,5128927485c23f8db1480b89f592e275df0f4f176a60ccb61c81ac304f4eff15,0.017400026321411133,0.018187999725341797,0.020037174224853516,0.01997232437133789,0.020138978958129883,0.019504785537719727,0.019786596298217773,0.049218177795410156,0.02391338348388672,0.16543245315551758,0.16943979263305664,0.07809782028198242,0.7609455585479736,0.18793940544128418 diff --git a/results/combined/merges_timed/carbonado/carbonado.csv b/results/combined/merges_timed/carbonado/carbonado.csv index fd3d56b4fc..be44293c67 100644 --- a/results/combined/merges_timed/carbonado/carbonado.csv +++ b/results/combined/merges_timed/carbonado/carbonado.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/remotes/origin/v1.3,13f58b778c5559b24f1b371cfb54ad80a5ba4b3f,32d20be647d80ec3509bfa3d7040b0d21cd8cb83,51d486867a0f610f034f1934e6d494e5d302f383,,True,True,82df07c66438f8489a5a423933744d5c482ab95f513a5d209ca1a3d7b3bdabb4,Tests_passed,e0b92a6b14b8106114997025ce66478e7ac034d77a22a2febcd6a777a46aa261,Tests_passed,True,True,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,0.04558110237121582,0.05028581619262695,0.05404973030090332,0.05296587944030762,0.049512386322021484,0.04705977439880371,0.04989933967590332,0.1501321792602539,0.042208194732666016,0.14627289772033691,0.16693401336669922,0.11015629768371582,0.4259805679321289,0.23363471031188965 +6,refs/remotes/origin/v1.3,13f58b778c5559b24f1b371cfb54ad80a5ba4b3f,32d20be647d80ec3509bfa3d7040b0d21cd8cb83,51d486867a0f610f034f1934e6d494e5d302f383,,True,True,82df07c66438f8489a5a423933744d5c482ab95f513a5d209ca1a3d7b3bdabb4,Tests_passed,e0b92a6b14b8106114997025ce66478e7ac034d77a22a2febcd6a777a46aa261,Tests_passed,True,True,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,0.04558110237121582,0.05028581619262695,0.05404973030090332,0.05296587944030762,0.049512386322021484,0.04705977439880371,0.04989933967590332,0.1501321792602539,0.042208194732666016,0.14454984664916992,0.16223430633544922,0.11015629768371582,0.4259805679321289,0.23363471031188965 diff --git a/results/combined/merges_timed/carlossg/glacier-cli.csv b/results/combined/merges_timed/carlossg/glacier-cli.csv index 820dd0017f..090e42ef19 100644 --- a/results/combined/merges_timed/carlossg/glacier-cli.csv +++ b/results/combined/merges_timed/carlossg/glacier-cli.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/remotes/origin/pull/11,71a1f6f512bc099e47cfccb15b46b33a3053afa1,ec9c094a73a35264837116dc831a5f7689a3b895,486498aba8bbeced3e5c3833793f3f2ad2c4d160,,True,True,35dc813e0f3d097838b989d9cb45010c9a703def19508b0e51098ff9b1896086,Tests_passed,b10b46b7195fdef8f61e44bdfbe39b95da78828e512e520188049f1b70832483,Tests_passed,True,True,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,a2b32d99c3882bf06491815901c3bce3e258af93f729b3ed4d75a1381878446f,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,68f708090d4a87e5b2e51d224696033d8b6a2f62f43c56712799a993b022dc92,Merge_failed,68f708090d4a87e5b2e51d224696033d8b6a2f62f43c56712799a993b022dc92,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Merge_failed,b22fa11aa5b30481a60970db667621151513a03732bf939fc87bd48de2243fbd,0.007397174835205078,0.007379293441772461,0.007189273834228516,0.0069713592529296875,0.0071523189544677734,0.007109880447387695,0.007359981536865234,0.029959440231323242,0.01179051399230957,0.07623887062072754,0.07668209075927734,0.06736969947814941,0.9392759799957275,0.14325165748596191 +11,refs/remotes/origin/pull/11,71a1f6f512bc099e47cfccb15b46b33a3053afa1,ec9c094a73a35264837116dc831a5f7689a3b895,486498aba8bbeced3e5c3833793f3f2ad2c4d160,,True,True,35dc813e0f3d097838b989d9cb45010c9a703def19508b0e51098ff9b1896086,Tests_passed,b10b46b7195fdef8f61e44bdfbe39b95da78828e512e520188049f1b70832483,Tests_passed,True,True,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,a2b32d99c3882bf06491815901c3bce3e258af93f729b3ed4d75a1381878446f,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,68f708090d4a87e5b2e51d224696033d8b6a2f62f43c56712799a993b022dc92,Merge_failed,68f708090d4a87e5b2e51d224696033d8b6a2f62f43c56712799a993b022dc92,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Merge_failed,b22fa11aa5b30481a60970db667621151513a03732bf939fc87bd48de2243fbd,0.007397174835205078,0.007379293441772461,0.007189273834228516,0.0069713592529296875,0.0071523189544677734,0.007109880447387695,0.007359981536865234,0.029959440231323242,0.01179051399230957,0.07433891296386719,0.07476639747619629,0.06736969947814941,0.9392759799957275,0.14325165748596191 diff --git a/results/combined/merges_timed/cdi-spec/cdi-tck.csv b/results/combined/merges_timed/cdi-spec/cdi-tck.csv index dc0c49209b..300645fcd7 100644 --- a/results/combined/merges_timed/cdi-spec/cdi-tck.csv +++ b/results/combined/merges_timed/cdi-spec/cdi-tck.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,d3b387c66f86d5594ff36573b593a928791d01dc,c252b4f509588a578ae033d522f35a45fc360a1e,f69448340df0a4dc54b658a796152b9952fbabec,,True,True,26783a61133cdbd45413ecdc6e0c5e6673e016005d25ce1f1afd8870956b711f,Tests_passed,7fe74134ccd40a6f84eafc84eb0011bc94ffd0b9c2885b07aa9ad8da26b27784,Tests_passed,True,True,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,9c4fdd611ccd5586f4a1f26237599e1729fc6a79c4ce39ef0cc45d340b880c12,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,0eb8e171d8cf4e54551a966632ab1343da2eae8752fbe876a3e630b00849c164,Merge_failed,0eb8e171d8cf4e54551a966632ab1343da2eae8752fbe876a3e630b00849c164,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,0b52e4c75a7475a363d9749014b41ac993966f3225c212e23e5ba64dfbf8a54b,Merge_failed,67ec3c6ce062fe5af578d6c507706341abaa06c80011f87d7dc059b8151595fb,0.09740996360778809,0.08274698257446289,0.09839272499084473,0.10137605667114258,0.0916743278503418,0.09497594833374023,0.11279010772705078,0.899418830871582,0.1826457977294922,0.586463212966919,0.5869882106781006,0.8100552558898926,4.030128240585327,1.4178836345672607 +9,refs/heads/master,d3b387c66f86d5594ff36573b593a928791d01dc,c252b4f509588a578ae033d522f35a45fc360a1e,f69448340df0a4dc54b658a796152b9952fbabec,,True,True,26783a61133cdbd45413ecdc6e0c5e6673e016005d25ce1f1afd8870956b711f,Tests_passed,7fe74134ccd40a6f84eafc84eb0011bc94ffd0b9c2885b07aa9ad8da26b27784,Tests_passed,True,True,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,9c4fdd611ccd5586f4a1f26237599e1729fc6a79c4ce39ef0cc45d340b880c12,Merge_failed,b92895f711d9ba8b4e4c361cdd29aa24f6e7d6327168f3d3931575bbb77a7d8e,Merge_failed,0eb8e171d8cf4e54551a966632ab1343da2eae8752fbe876a3e630b00849c164,Merge_failed,0eb8e171d8cf4e54551a966632ab1343da2eae8752fbe876a3e630b00849c164,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,0b52e4c75a7475a363d9749014b41ac993966f3225c212e23e5ba64dfbf8a54b,Merge_failed,67ec3c6ce062fe5af578d6c507706341abaa06c80011f87d7dc059b8151595fb,0.09740996360778809,0.08274698257446289,0.09839272499084473,0.10137605667114258,0.0916743278503418,0.09497594833374023,0.11279010772705078,0.899418830871582,0.1826457977294922,0.5898494720458984,0.5916738510131836,0.8100552558898926,4.030128240585327,1.4178836345672607 diff --git a/results/combined/merges_timed/cglib/cglib.csv b/results/combined/merges_timed/cglib/cglib.csv index 4ba0f5fc9a..1869008f74 100644 --- a/results/combined/merges_timed/cglib/cglib.csv +++ b/results/combined/merges_timed/cglib/cglib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,Tests_passed,True,True,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,0.03728628158569336,0.04141545295715332,0.012869834899902344,0.03226780891418457,0.01594996452331543,0.04367542266845703,0.03709769248962402,0.13685393333435059,0.03406095504760742,0.16551589965820312,0.16433238983154297,0.08227705955505371,0.03081512451171875,0.1733090877532959 +42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,Tests_passed,True,True,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,0.03728628158569336,0.04141545295715332,0.012869834899902344,0.03226780891418457,0.01594996452331543,0.04367542266845703,0.03709769248962402,0.13685393333435059,0.03406095504760742,0.1633930206298828,0.16275787353515625,0.08227705955505371,0.03081512451171875,0.1733090877532959 diff --git a/results/combined/merges_timed/chargebee/chargebee-java.csv b/results/combined/merges_timed/chargebee/chargebee-java.csv index 801f23cfe5..9d2cbd86b2 100644 --- a/results/combined/merges_timed/chargebee/chargebee-java.csv +++ b/results/combined/merges_timed/chargebee/chargebee-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -34,refs/heads/master,0add5bcc4f9f339049d14a211e05e03546386fdb,0e60c0b862b9e980a479372812ceef2ebb555ed8,11156f634da00fe3852d459eff3cea67fa65b5ad,,True,True,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,a9d631a4875e15e4d09d93d8b45fb9d661f2ba725aad49da243fc328e1b92e26,Tests_passed,True,True,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,0.035103797912597656,0.03714895248413086,0.03603243827819824,0.043853759765625,0.045737504959106445,0.038839101791381836,0.04682803153991699,0.16522479057312012,0.03773307800292969,0.14446282386779785,0.14306163787841797,0.11207294464111328,0.5762996673583984,0.5776205062866211 +34,refs/heads/master,0add5bcc4f9f339049d14a211e05e03546386fdb,0e60c0b862b9e980a479372812ceef2ebb555ed8,11156f634da00fe3852d459eff3cea67fa65b5ad,,True,True,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,a9d631a4875e15e4d09d93d8b45fb9d661f2ba725aad49da243fc328e1b92e26,Tests_passed,True,True,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,0.035103797912597656,0.03714895248413086,0.03603243827819824,0.043853759765625,0.045737504959106445,0.038839101791381836,0.04682803153991699,0.16522479057312012,0.03773307800292969,0.1427459716796875,0.1420297622680664,0.11207294464111328,0.5762996673583984,0.5776205062866211 diff --git a/results/combined/merges_timed/chat-wane/lseq.csv b/results/combined/merges_timed/chat-wane/lseq.csv index c0e1f5958d..b8027997a8 100644 --- a/results/combined/merges_timed/chat-wane/lseq.csv +++ b/results/combined/merges_timed/chat-wane/lseq.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,916d8a5efc2654df3f31715ed05eea52f7d09957,cd69de37ea8aec0bad1e5a4114a4a243f1b66442,86932f013055275c558f7f964225bf8e70b98281,,57a196317ef2c7724708d82306b7196eac574a44a99f04d277efe6d2d37511bc,Tests_passed,a51dca367610fc8df1b2476584962c82e0e4063a598405ba5ebbfc9926d28ecb,Tests_passed,True,True,True,True,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,50fc2f836e88f66eb1d7957375f5a5be553c331825bbdea821ae65ac33208149,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,869671c2e8e1d8c8aacafbc50ada9ec3a37ca2ae084aea83b6f314e49e690fad,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,7054db495199d9d46978645b99738f11de27cddf336021c76733ea94b6edd9de,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,b2bc7ab1c356067c1ef4ae7e1aca39ff1647465b19d3c3a2b5c1d8af46764087,Merge_failed,b2bc7ab1c356067c1ef4ae7e1aca39ff1647465b19d3c3a2b5c1d8af46764087,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,c9edd0af6e769d396aeea0b46845f6378915226f36068778a39ba3a28b73673f,Merge_failed,abcabb3916461fcb662d05ef70dcec27cffd58ae2cea4c73abbfa8c0b95c473a,0.04320240020751953,0.05004167556762695,0.05167126655578613,0.04486274719238281,0.0444490909576416,0.044400691986083984,0.04057502746582031,0.44109177589416504,0.13198328018188477,0.26522231101989746,0.2671473026275635,0.3487052917480469,2.311600923538208,0.21742820739746094 +1,refs/heads/master,916d8a5efc2654df3f31715ed05eea52f7d09957,cd69de37ea8aec0bad1e5a4114a4a243f1b66442,86932f013055275c558f7f964225bf8e70b98281,,57a196317ef2c7724708d82306b7196eac574a44a99f04d277efe6d2d37511bc,Tests_passed,a51dca367610fc8df1b2476584962c82e0e4063a598405ba5ebbfc9926d28ecb,Tests_passed,True,True,True,True,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,50fc2f836e88f66eb1d7957375f5a5be553c331825bbdea821ae65ac33208149,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,869671c2e8e1d8c8aacafbc50ada9ec3a37ca2ae084aea83b6f314e49e690fad,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,7054db495199d9d46978645b99738f11de27cddf336021c76733ea94b6edd9de,Merge_failed,a6c59d867317a086ef0e233c1db15909a925cf34087c52f24f99f3fcc0475933,Merge_failed,b2bc7ab1c356067c1ef4ae7e1aca39ff1647465b19d3c3a2b5c1d8af46764087,Merge_failed,b2bc7ab1c356067c1ef4ae7e1aca39ff1647465b19d3c3a2b5c1d8af46764087,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,c9edd0af6e769d396aeea0b46845f6378915226f36068778a39ba3a28b73673f,Merge_failed,abcabb3916461fcb662d05ef70dcec27cffd58ae2cea4c73abbfa8c0b95c473a,0.04320240020751953,0.05004167556762695,0.05167126655578613,0.04486274719238281,0.0444490909576416,0.044400691986083984,0.04057502746582031,0.44109177589416504,0.13198328018188477,0.2657439708709717,0.26621246337890625,0.3487052917480469,2.311600923538208,0.21742820739746094 diff --git a/results/combined/merges_timed/chrisvest/stormpot.csv b/results/combined/merges_timed/chrisvest/stormpot.csv index a9663cff39..1c71885cb4 100644 --- a/results/combined/merges_timed/chrisvest/stormpot.csv +++ b/results/combined/merges_timed/chrisvest/stormpot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/heads/3.2,375e8c807ffca5524e6333b5ba602e2ce430300f,5d5d75105eb5407939194035646bb312a0bc0769,58cab5d53fc9267a54c392c1cf72bcd98b268379,,bdf643a5e41853b19b664f4ed5658e33ebe16e2316bf0f9e896873a23c9a31e5,Tests_passed,5accb39e8d00069cb07512aa018a56f63c11f53c47234f5689e604a840703d4f,Tests_passed,True,True,True,True,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,dacdcd5c85338c05554894549274e56f328207b8e934008180336206071a006b,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,30adf01d02471b8cd835c1ed0d685df8d1ed8b3a31e935633633b25c187c4af3,Merge_failed,30adf01d02471b8cd835c1ed0d685df8d1ed8b3a31e935633633b25c187c4af3,Merge_failed,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,7cb1f3a1cf71c33621e6ce922c409d5e63ba1bb3d2f1fcce8b1244f4946d343f,Merge_failed,1658d6a108e34730c783cec7a947c3233611f55593fcf0793814b1e00e109f13,0.015425920486450195,0.015787601470947266,0.01669001579284668,0.016431093215942383,0.016301631927490234,0.01630997657775879,0.01653432846069336,0.10386514663696289,0.03434395790100098,0.5527808666229248,0.5505058765411377,0.30410051345825195,5.251710653305054,0.24223041534423828 +23,refs/heads/3.2,375e8c807ffca5524e6333b5ba602e2ce430300f,5d5d75105eb5407939194035646bb312a0bc0769,58cab5d53fc9267a54c392c1cf72bcd98b268379,,bdf643a5e41853b19b664f4ed5658e33ebe16e2316bf0f9e896873a23c9a31e5,Tests_passed,5accb39e8d00069cb07512aa018a56f63c11f53c47234f5689e604a840703d4f,Tests_passed,True,True,True,True,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,dacdcd5c85338c05554894549274e56f328207b8e934008180336206071a006b,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,30adf01d02471b8cd835c1ed0d685df8d1ed8b3a31e935633633b25c187c4af3,Merge_failed,30adf01d02471b8cd835c1ed0d685df8d1ed8b3a31e935633633b25c187c4af3,Merge_failed,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,7cb1f3a1cf71c33621e6ce922c409d5e63ba1bb3d2f1fcce8b1244f4946d343f,Merge_failed,1658d6a108e34730c783cec7a947c3233611f55593fcf0793814b1e00e109f13,0.015425920486450195,0.015787601470947266,0.01669001579284668,0.016431093215942383,0.016301631927490234,0.01630997657775879,0.01653432846069336,0.10386514663696289,0.03434395790100098,0.5416226387023926,0.545090913772583,0.30410051345825195,5.251710653305054,0.24223041534423828 diff --git a/results/combined/merges_timed/chrsan/css-selectors.csv b/results/combined/merges_timed/chrsan/css-selectors.csv index c38d503763..568f528bd0 100644 --- a/results/combined/merges_timed/chrsan/css-selectors.csv +++ b/results/combined/merges_timed/chrsan/css-selectors.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/12,0f725a05d197ffc54c091362bf84c34ad9654b06,861fa596d6df2e2e03f9378e39ffbd0b0515ef55,5f66d39ef4d3578146c81f4827bfde4dc7a0430a,,ed83ca9bae0f7458caea0c624c0f1424a988fac9d675e50a98201d6810d933d1,Tests_passed,2d12a444fd1c5795985ba1c35d320d06da697c105efb83a32b17c6b977aded3d,Tests_passed,True,True,True,True,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,0.044500112533569336,0.026561975479125977,0.04722404479980469,0.04422307014465332,0.04936385154724121,0.04936933517456055,0.040087223052978516,0.16732048988342285,0.01066279411315918,0.14771270751953125,0.14805102348327637,0.11932873725891113,0.5018410682678223,0.22468972206115723 +3,refs/remotes/origin/pull/12,0f725a05d197ffc54c091362bf84c34ad9654b06,861fa596d6df2e2e03f9378e39ffbd0b0515ef55,5f66d39ef4d3578146c81f4827bfde4dc7a0430a,,ed83ca9bae0f7458caea0c624c0f1424a988fac9d675e50a98201d6810d933d1,Tests_passed,2d12a444fd1c5795985ba1c35d320d06da697c105efb83a32b17c6b977aded3d,Tests_passed,True,True,True,True,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,0.044500112533569336,0.026561975479125977,0.04722404479980469,0.04422307014465332,0.04936385154724121,0.04936933517456055,0.040087223052978516,0.16732048988342285,0.01066279411315918,0.14667034149169922,0.14637422561645508,0.11932873725891113,0.5018410682678223,0.22468972206115723 diff --git a/results/combined/merges_timed/cinovo/cloudconductor-server.csv b/results/combined/merges_timed/cinovo/cloudconductor-server.csv index 47c161dd9b..026d0dead9 100644 --- a/results/combined/merges_timed/cinovo/cloudconductor-server.csv +++ b/results/combined/merges_timed/cinovo/cloudconductor-server.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -69,refs/heads/master,5d364913a33784a026527743d51403af2a85044d,9b07fcdfd959835f66caf79868a8c5fc19eb51ac,51cc03e9d7130262015491537d4eb314d182f22f,,True,True,bf96c5b1260da1152ef373c993b8904f61268593901ffbac6e523ef1dff0db8a,Tests_passed,3dbcfa915bb9a89aac99ed9547e9241036ff4a7f98827753312738ef443ce2a4,Tests_passed,True,True,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,21192d1cc6fa66c28c6ed3827f1f8b919035c1116646d38fbbfa9103cdf6cbc8,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,21192d1cc6fa66c28c6ed3827f1f8b919035c1116646d38fbbfa9103cdf6cbc8,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,cd662df433f505745777ed57eef7d5918dc3c293eea62041ab784d923d9f55bb,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,678b6acc002e0f3a1926b96c888b831865b7f7de93a3304ed427e3cb88b64ca8,Merge_failed,870a204d3b93712418f6c29899a5da023afa4293d2cc6c7241615a0150e10c5f,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,d2256b177962c36d492de4f863be8089ce222d1503b80df9f5bf1ace1ce84d82,Merge_failed,678b6acc002e0f3a1926b96c888b831865b7f7de93a3304ed427e3cb88b64ca8,0.021571874618530273,0.0218660831451416,0.01092672348022461,0.024278640747070312,0.02463817596435547,0.010862588882446289,0.02434515953063965,0.10075139999389648,0.028987407684326172,0.45819568634033203,0.4590625762939453,0.23646163940429688,2.0650675296783447,0.2204277515411377 +69,refs/heads/master,5d364913a33784a026527743d51403af2a85044d,9b07fcdfd959835f66caf79868a8c5fc19eb51ac,51cc03e9d7130262015491537d4eb314d182f22f,,True,True,bf96c5b1260da1152ef373c993b8904f61268593901ffbac6e523ef1dff0db8a,Tests_passed,3dbcfa915bb9a89aac99ed9547e9241036ff4a7f98827753312738ef443ce2a4,Tests_passed,True,True,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,21192d1cc6fa66c28c6ed3827f1f8b919035c1116646d38fbbfa9103cdf6cbc8,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,21192d1cc6fa66c28c6ed3827f1f8b919035c1116646d38fbbfa9103cdf6cbc8,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,cd662df433f505745777ed57eef7d5918dc3c293eea62041ab784d923d9f55bb,Merge_failed,55476180c462b8cab155b117490ecd041d5d8c9b7d15b81bd31f3c5508b2ff85,Merge_failed,678b6acc002e0f3a1926b96c888b831865b7f7de93a3304ed427e3cb88b64ca8,Merge_failed,870a204d3b93712418f6c29899a5da023afa4293d2cc6c7241615a0150e10c5f,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,d2256b177962c36d492de4f863be8089ce222d1503b80df9f5bf1ace1ce84d82,Merge_failed,678b6acc002e0f3a1926b96c888b831865b7f7de93a3304ed427e3cb88b64ca8,0.021571874618530273,0.0218660831451416,0.01092672348022461,0.024278640747070312,0.02463817596435547,0.010862588882446289,0.02434515953063965,0.10075139999389648,0.028987407684326172,0.4526634216308594,0.45079803466796875,0.23646163940429688,2.0650675296783447,0.2204277515411377 diff --git a/results/combined/merges_timed/circuitsoftgroup/slackmc.csv b/results/combined/merges_timed/circuitsoftgroup/slackmc.csv index 434e3cb44d..24e9240032 100644 --- a/results/combined/merges_timed/circuitsoftgroup/slackmc.csv +++ b/results/combined/merges_timed/circuitsoftgroup/slackmc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,6e2ed14486ced20af34a942ad5955026e20adae7,0649a0bbae0099b51d62062d8d5e649f68d3206a,b6d96b761a6927d80ca8864ea8f151076dbb0c99,,db2ae016191cb6c8f16dda043af47ded9cf665d776d3f00a5b449e4440ffca39,Tests_passed,0b810c113bda7a4fa2af72f33b73eb47773cb8b086c587a079788ad1327177a9,Tests_passed,True,True,True,True,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,b846e33a01dc69a6952619845f769feabffd05cd006383152d898f344bf1f715,Merge_failed,4810b7a653a2a80f72cdb1d9c3467062fd5824e5e6073cfc7e5dc3ecb9645ce1,Merge_failed,4810b7a653a2a80f72cdb1d9c3467062fd5824e5e6073cfc7e5dc3ecb9645ce1,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,501bb6e67e48ace4493d66f392d62411d6023b3439e89f56272e6741ccd8fef5,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,be61f58c754bc62b62c11c30f55607c603556da46039c84226fa59ec80f66c4c,Merge_failed,be61f58c754bc62b62c11c30f55607c603556da46039c84226fa59ec80f66c4c,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,5b4614ee3643b55d0f2ec0c275ead8b62a13a85e1697ce2c9c15861423bdd878,0.0386202335357666,0.041524410247802734,0.036334991455078125,0.03660178184509277,0.039449214935302734,0.03630876541137695,0.030121564865112305,0.23308682441711426,0.0783076286315918,0.18398666381835938,0.18437981605529785,0.17371344566345215,1.270369291305542,0.19210219383239746 +4,refs/heads/master,6e2ed14486ced20af34a942ad5955026e20adae7,0649a0bbae0099b51d62062d8d5e649f68d3206a,b6d96b761a6927d80ca8864ea8f151076dbb0c99,,db2ae016191cb6c8f16dda043af47ded9cf665d776d3f00a5b449e4440ffca39,Tests_passed,0b810c113bda7a4fa2af72f33b73eb47773cb8b086c587a079788ad1327177a9,Tests_passed,True,True,True,True,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,b846e33a01dc69a6952619845f769feabffd05cd006383152d898f344bf1f715,Merge_failed,4810b7a653a2a80f72cdb1d9c3467062fd5824e5e6073cfc7e5dc3ecb9645ce1,Merge_failed,4810b7a653a2a80f72cdb1d9c3467062fd5824e5e6073cfc7e5dc3ecb9645ce1,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,501bb6e67e48ace4493d66f392d62411d6023b3439e89f56272e6741ccd8fef5,Merge_failed,e073eaf2cd7903d4276d9d92e3b11c8be363e6e7e3e4263938b859690c19762c,Merge_failed,be61f58c754bc62b62c11c30f55607c603556da46039c84226fa59ec80f66c4c,Merge_failed,be61f58c754bc62b62c11c30f55607c603556da46039c84226fa59ec80f66c4c,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,5b4614ee3643b55d0f2ec0c275ead8b62a13a85e1697ce2c9c15861423bdd878,0.0386202335357666,0.041524410247802734,0.036334991455078125,0.03660178184509277,0.039449214935302734,0.03630876541137695,0.030121564865112305,0.23308682441711426,0.0783076286315918,0.18459248542785645,0.18555569648742676,0.17371344566345215,1.270369291305542,0.19210219383239746 diff --git a/results/combined/merges_timed/citysearch/web-widgets.csv b/results/combined/merges_timed/citysearch/web-widgets.csv index e293043786..5352866c89 100644 --- a/results/combined/merges_timed/citysearch/web-widgets.csv +++ b/results/combined/merges_timed/citysearch/web-widgets.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/master,309d4d30fcf2e785389d98854afe76ce753cef63,aaf7b3ab36f01b80b8f4ce821b6aea7e677903ea,f3d2b8d302d53caf03877c3182d56cf5d2c81417,,51cf28e04439b5ff95ebc169d765dfbf2bf7d3b63da99d857197180105cc54a9,Tests_passed,70f5ccf567095aa86a7da7ce32dce5ae27f8a3f80b9144aab7f1f4129abf4a3f,Tests_passed,True,True,True,True,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,0.050542354583740234,0.04491305351257324,0.05244874954223633,0.028238296508789062,0.06332540512084961,0.040883541107177734,0.04754066467285156,0.16937041282653809,0.01402425765991211,0.15654277801513672,0.1580488681793213,0.0929725170135498,0.6458954811096191,0.2317366600036621 +16,refs/heads/master,309d4d30fcf2e785389d98854afe76ce753cef63,aaf7b3ab36f01b80b8f4ce821b6aea7e677903ea,f3d2b8d302d53caf03877c3182d56cf5d2c81417,,51cf28e04439b5ff95ebc169d765dfbf2bf7d3b63da99d857197180105cc54a9,Tests_passed,70f5ccf567095aa86a7da7ce32dce5ae27f8a3f80b9144aab7f1f4129abf4a3f,Tests_passed,True,True,True,True,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,0.050542354583740234,0.04491305351257324,0.05244874954223633,0.028238296508789062,0.06332540512084961,0.040883541107177734,0.04754066467285156,0.16937041282653809,0.01402425765991211,0.15470123291015625,0.15551161766052246,0.0929725170135498,0.6458954811096191,0.2317366600036621 diff --git a/results/combined/merges_timed/citytechinc/cq-component-maven-plugin.csv b/results/combined/merges_timed/citytechinc/cq-component-maven-plugin.csv index b6cecdca81..257719d2b5 100644 --- a/results/combined/merges_timed/citytechinc/cq-component-maven-plugin.csv +++ b/results/combined/merges_timed/citytechinc/cq-component-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -137,refs/heads/develop,5c6c9e155afc295d410d1cc804d79ceb3d3f0027,dca55982f61de5380c281e5be0d48ce18147b2a8,17553059c6ff04d824fb4ff3816a4d83cbf50d98,,True,True,b8104589f4f845d80fbfb3d2db1bf0046dded477d3c945d0343daca39564756c,Tests_passed,a202203a2daa58081baceec344f65adf52ccc8b8eda6a79892d92958c1fffc27,Tests_passed,True,True,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,1ea41a70043b54d3f3b22b1e8c795accd591a3cdc5f9a9d56176b00eb63f59d3,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,d648c2cad7dbc247151869009e0e7474bee4ac6f75dba5ee9891bd06a150cc41,Merge_failed,9d4bdf7d799a8c413fcbf48e259d73960ac8c74bda76519523a8589d657a1440,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,aafb56d98c067e85304ef26cc464d67a7f483b8c79f6fd74f97c70d129debc35,Merge_failed,aafb56d98c067e85304ef26cc464d67a7f483b8c79f6fd74f97c70d129debc35,Merge_failed,63ba86a828e165f982f48ca0906ad35a33a6782bed70d9bb0cddffea9ebc7292,Merge_failed,a1bf39bbb21f1008b52e3e740b3749977b49676836e0cf902f312fec9ba473c7,Merge_failed,0d9689145fabae86906ab1ad6db0cccceed975805477f0c7a12aeb7c674e2d08,0.046796321868896484,0.04880094528198242,0.04749250411987305,0.058811187744140625,0.05365252494812012,0.04155421257019043,0.045507192611694336,0.3011176586151123,0.09205222129821777,0.3577404022216797,0.3553318977355957,0.2861349582672119,2.683464527130127,0.22419285774230957 +137,refs/heads/develop,5c6c9e155afc295d410d1cc804d79ceb3d3f0027,dca55982f61de5380c281e5be0d48ce18147b2a8,17553059c6ff04d824fb4ff3816a4d83cbf50d98,,True,True,b8104589f4f845d80fbfb3d2db1bf0046dded477d3c945d0343daca39564756c,Tests_passed,a202203a2daa58081baceec344f65adf52ccc8b8eda6a79892d92958c1fffc27,Tests_passed,True,True,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,1ea41a70043b54d3f3b22b1e8c795accd591a3cdc5f9a9d56176b00eb63f59d3,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,d648c2cad7dbc247151869009e0e7474bee4ac6f75dba5ee9891bd06a150cc41,Merge_failed,9d4bdf7d799a8c413fcbf48e259d73960ac8c74bda76519523a8589d657a1440,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,aafb56d98c067e85304ef26cc464d67a7f483b8c79f6fd74f97c70d129debc35,Merge_failed,aafb56d98c067e85304ef26cc464d67a7f483b8c79f6fd74f97c70d129debc35,Merge_failed,63ba86a828e165f982f48ca0906ad35a33a6782bed70d9bb0cddffea9ebc7292,Merge_failed,a1bf39bbb21f1008b52e3e740b3749977b49676836e0cf902f312fec9ba473c7,Merge_failed,0d9689145fabae86906ab1ad6db0cccceed975805477f0c7a12aeb7c674e2d08,0.046796321868896484,0.04880094528198242,0.04749250411987305,0.058811187744140625,0.05365252494812012,0.04155421257019043,0.045507192611694336,0.3011176586151123,0.09205222129821777,0.3574545383453369,0.35969972610473633,0.2861349582672119,2.683464527130127,0.22419285774230957 diff --git a/results/combined/merges_timed/cjwizard/cjwizard.csv b/results/combined/merges_timed/cjwizard/cjwizard.csv index bd1d685367..53a08f25aa 100644 --- a/results/combined/merges_timed/cjwizard/cjwizard.csv +++ b/results/combined/merges_timed/cjwizard/cjwizard.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,Tests_passed,True,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.009887456893920898,0.009513378143310547,0.010169506072998047,0.010102272033691406,0.010179519653320312,0.010202407836914062,0.010339975357055664,0.03479361534118652,0.009409189224243164,0.16193199157714844,0.16037654876708984,0.0650787353515625,1.0320379734039307,0.17144417762756348 +14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,Tests_passed,True,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.009887456893920898,0.009513378143310547,0.010169506072998047,0.010102272033691406,0.010179519653320312,0.010202407836914062,0.010339975357055664,0.03479361534118652,0.009409189224243164,0.16223502159118652,0.16004443168640137,0.0650787353515625,1.0320379734039307,0.17144417762756348 diff --git a/results/combined/merges_timed/clickntap/vimeo.csv b/results/combined/merges_timed/clickntap/vimeo.csv index 9734ec13d9..809ecfa11b 100644 --- a/results/combined/merges_timed/clickntap/vimeo.csv +++ b/results/combined/merges_timed/clickntap/vimeo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,cedaf74fc799691641f83a34a19f8ad479e77108,f40afce905a0cd5b0ff539eae41729e8788038a9,e546bda5980616e4d60bd30fdd5e8773759621b4,,True,True,e857b022fc34a03c41fb289a8695e8b29ee23cab8b116c90ae3274862c6212f7,Tests_passed,5f2cbde4460700db3bbdd235693598aeb321bdd37b9d86f5013bacbbe205ce3e,Tests_passed,True,True,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,0.036110877990722656,0.029940128326416016,0.00931096076965332,0.03453397750854492,0.040049076080322266,0.04227900505065918,0.04246830940246582,0.1423788070678711,0.02460169792175293,0.15424633026123047,0.15627813339233398,0.09981274604797363,1.0457584857940674,0.17302536964416504 +3,refs/heads/master,cedaf74fc799691641f83a34a19f8ad479e77108,f40afce905a0cd5b0ff539eae41729e8788038a9,e546bda5980616e4d60bd30fdd5e8773759621b4,,True,True,e857b022fc34a03c41fb289a8695e8b29ee23cab8b116c90ae3274862c6212f7,Tests_passed,5f2cbde4460700db3bbdd235693598aeb321bdd37b9d86f5013bacbbe205ce3e,Tests_passed,True,True,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,0.036110877990722656,0.029940128326416016,0.00931096076965332,0.03453397750854492,0.040049076080322266,0.04227900505065918,0.04246830940246582,0.1423788070678711,0.02460169792175293,0.15617060661315918,0.1558542251586914,0.09981274604797363,1.0457584857940674,0.17302536964416504 diff --git a/results/combined/merges_timed/clojure/clojure.csv b/results/combined/merges_timed/clojure/clojure.csv index 57babc88fd..4b09220837 100644 --- a/results/combined/merges_timed/clojure/clojure.csv +++ b/results/combined/merges_timed/clojure/clojure.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -60,refs/remotes/origin/dev-array-type-syms,a7286b3ceeddd30571a61bd079d5f0fd1aad5933,c462337da43258aa5dfed0853c696b95786014c3,ffbb09b5ef55b9dfa88d16aedd44319a4b33b666,,True,True,a38b58682530874a2c3b5be2ef8041248658f6b8981aef78ccc2529ee1692bde,Tests_passed,69607893e301ad982908fb580124f0199d386f3a3bfddaae8a81d4c27745597a,Tests_passed,True,True,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_passed,0b4a45c5f38d9027723fc668b55784284b41f593ffbd6ee69385fe4f07c57998,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,0.06612181663513184,0.07367110252380371,0.03695869445800781,0.027616500854492188,0.029742717742919922,0.03697681427001953,0.058371543884277344,0.21283864974975586,0.06045794486999512,0.25936198234558105,0.28259778022766113,0.11454176902770996,12.79997181892395,0.2529881000518799 +60,refs/remotes/origin/dev-array-type-syms,a7286b3ceeddd30571a61bd079d5f0fd1aad5933,c462337da43258aa5dfed0853c696b95786014c3,ffbb09b5ef55b9dfa88d16aedd44319a4b33b666,,True,True,a38b58682530874a2c3b5be2ef8041248658f6b8981aef78ccc2529ee1692bde,Tests_passed,69607893e301ad982908fb580124f0199d386f3a3bfddaae8a81d4c27745597a,Tests_passed,True,True,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_passed,0b4a45c5f38d9027723fc668b55784284b41f593ffbd6ee69385fe4f07c57998,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,0.06612181663513184,0.07367110252380371,0.03695869445800781,0.027616500854492188,0.029742717742919922,0.03697681427001953,0.058371543884277344,0.21283864974975586,0.06045794486999512,0.26729393005371094,0.26877689361572266,0.11454176902770996,12.79997181892395,0.2529881000518799 diff --git a/results/combined/merges_timed/cloudfoundry/cf-java-client.csv b/results/combined/merges_timed/cloudfoundry/cf-java-client.csv index 3b42351900..3363444ecd 100644 --- a/results/combined/merges_timed/cloudfoundry/cf-java-client.csv +++ b/results/combined/merges_timed/cloudfoundry/cf-java-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -419,refs/heads/main,99db809073a23d10e771abaa23f586c1a53567fc,a69078adc84fd359a85ba12f0ebcc1cd05a87c5c,9acd5fd21c97b62b72e0065eff718a26a25af645,,True,True,c3fe1cf280f3b0bd65661f90f95fef9f27ea640c1bbd87f90bdfca1f140d769f,Tests_passed,0d93d8b9ee70627a42f062cbc58d41844ce3a51f3490cb19396036dcc936551e,Tests_passed,True,True,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,79e38bb1bd3abf8edd3eec5b5eb0461f5dfae2216c470dc228e5ef05dc6519be,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,0.030318260192871094,0.02935624122619629,0.038018226623535156,0.03738737106323242,0.03762364387512207,0.03818488121032715,0.038004159927368164,0.07641363143920898,0.030450105667114258,0.17723512649536133,0.1787724494934082,0.08618831634521484,0.606433629989624,0.926891565322876 +419,refs/heads/main,99db809073a23d10e771abaa23f586c1a53567fc,a69078adc84fd359a85ba12f0ebcc1cd05a87c5c,9acd5fd21c97b62b72e0065eff718a26a25af645,,True,True,c3fe1cf280f3b0bd65661f90f95fef9f27ea640c1bbd87f90bdfca1f140d769f,Tests_passed,0d93d8b9ee70627a42f062cbc58d41844ce3a51f3490cb19396036dcc936551e,Tests_passed,True,True,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,79e38bb1bd3abf8edd3eec5b5eb0461f5dfae2216c470dc228e5ef05dc6519be,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,0.030318260192871094,0.02935624122619629,0.038018226623535156,0.03738737106323242,0.03762364387512207,0.03818488121032715,0.038004159927368164,0.07641363143920898,0.030450105667114258,0.17727112770080566,0.1772480010986328,0.08618831634521484,0.606433629989624,0.926891565322876 diff --git a/results/combined/merges_timed/cloudslab/cloudsim.csv b/results/combined/merges_timed/cloudslab/cloudsim.csv index b2a02430a5..4baaa26de9 100644 --- a/results/combined/merges_timed/cloudslab/cloudsim.csv +++ b/results/combined/merges_timed/cloudslab/cloudsim.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,e0205e647461340fcbdf2de516d1cd0ad9fd1154,e0334f468311935d4d6bd424f3e0cfadf04fa8a6,c1ffe5a99703df9a2a03eb738a62b4e06146d732,,True,True,1e5a990cd6230bd1349487409b1f854537dcfc974c057a9fdbacf61e4157aef7,Tests_passed,98721d9325e48626d8685176f77677fc4d81ccd4a5add362fbdff9d9dc06fd37,Tests_passed,True,True,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,99da89f3f36c8e0b30deaec45df2fdd735e12683e9af29bc6c7c7020938ac951,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,7045d352e29d6656306f550f08ef34c0a17e80440ef2ad6575c6ab26e4eb697c,Merge_failed,7045d352e29d6656306f550f08ef34c0a17e80440ef2ad6575c6ab26e4eb697c,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,ae204d2622ff03d2afe0121b924607314dc7c732e2cc217874213699bd6a4cf7,0.057253360748291016,0.07322835922241211,0.0879828929901123,0.07173705101013184,0.08467674255371094,0.07996273040771484,0.09543371200561523,0.430753231048584,0.12957072257995605,0.3126180171966553,0.31416940689086914,0.4353199005126953,2.5534117221832275,0.6682894229888916 +8,refs/heads/master,e0205e647461340fcbdf2de516d1cd0ad9fd1154,e0334f468311935d4d6bd424f3e0cfadf04fa8a6,c1ffe5a99703df9a2a03eb738a62b4e06146d732,,True,True,1e5a990cd6230bd1349487409b1f854537dcfc974c057a9fdbacf61e4157aef7,Tests_passed,98721d9325e48626d8685176f77677fc4d81ccd4a5add362fbdff9d9dc06fd37,Tests_passed,True,True,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,99da89f3f36c8e0b30deaec45df2fdd735e12683e9af29bc6c7c7020938ac951,Merge_failed,4eb8531250b1bba59ba8fda191adfdab2f1b6b44741d460579c9dcb4c6c8b8de,Merge_failed,7045d352e29d6656306f550f08ef34c0a17e80440ef2ad6575c6ab26e4eb697c,Merge_failed,7045d352e29d6656306f550f08ef34c0a17e80440ef2ad6575c6ab26e4eb697c,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,ae204d2622ff03d2afe0121b924607314dc7c732e2cc217874213699bd6a4cf7,0.057253360748291016,0.07322835922241211,0.0879828929901123,0.07173705101013184,0.08467674255371094,0.07996273040771484,0.09543371200561523,0.430753231048584,0.12957072257995605,0.31538987159729004,0.3146488666534424,0.4353199005126953,2.5534117221832275,0.6682894229888916 diff --git a/results/combined/merges_timed/cloudslang/score.csv b/results/combined/merges_timed/cloudslang/score.csv index 1908083d5b..372d3da812 100644 --- a/results/combined/merges_timed/cloudslang/score.csv +++ b/results/combined/merges_timed/cloudslang/score.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -415,refs/remotes/origin/ScoreWorkerMonitor,bfe7c0dad895f1f0fdfbdab5611568a717cab295,c4f3b87e475e3c87d2275a956a3d65e2b04f647a,640eab6d0c491a4c96e04b604d4ff14f34c688f4,,e29a46423a25d1ee59e8135f3d5b6a65264987a0b97fb27fda0dbe27ad315226,Tests_passed,43429ee4c9c8115a2e5564a3951d14ce7aa7461efc0a53304d7c49bb24de29fb,Tests_passed,True,True,True,True,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,31a6bc89e83b18d7806a4188a9027a5c76845dbbb43b53ae0386c560a4698cf8,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,96c88620d3dcc9fcece40d9ba9d59e02ccdce449398e1166910124efb24dea71,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,eb1195b81a6bda73bdd6eaa4674655da57f7f3a09a0feb9d14f52b5ef168333b,Merge_failed,eb1195b81a6bda73bdd6eaa4674655da57f7f3a09a0feb9d14f52b5ef168333b,Merge_failed,208749154a1a368aec28a04ef5f5da48be59d6dda0c6c983715de39812d43892,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,0.06289005279541016,0.04931378364562988,0.053435564041137695,0.0439302921295166,0.06134819984436035,0.05550265312194824,0.06338930130004883,0.24293828010559082,0.08202052116394043,0.18204998970031738,0.1329505443572998,0.189605712890625,0.04369354248046875,0.3319070339202881 +415,refs/remotes/origin/ScoreWorkerMonitor,bfe7c0dad895f1f0fdfbdab5611568a717cab295,c4f3b87e475e3c87d2275a956a3d65e2b04f647a,640eab6d0c491a4c96e04b604d4ff14f34c688f4,,e29a46423a25d1ee59e8135f3d5b6a65264987a0b97fb27fda0dbe27ad315226,Tests_passed,43429ee4c9c8115a2e5564a3951d14ce7aa7461efc0a53304d7c49bb24de29fb,Tests_passed,True,True,True,True,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,31a6bc89e83b18d7806a4188a9027a5c76845dbbb43b53ae0386c560a4698cf8,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,96c88620d3dcc9fcece40d9ba9d59e02ccdce449398e1166910124efb24dea71,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,eb1195b81a6bda73bdd6eaa4674655da57f7f3a09a0feb9d14f52b5ef168333b,Merge_failed,eb1195b81a6bda73bdd6eaa4674655da57f7f3a09a0feb9d14f52b5ef168333b,Merge_failed,208749154a1a368aec28a04ef5f5da48be59d6dda0c6c983715de39812d43892,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,0.06289005279541016,0.04931378364562988,0.053435564041137695,0.0439302921295166,0.06134819984436035,0.05550265312194824,0.06338930130004883,0.24293828010559082,0.08202052116394043,0.13378357887268066,0.13371872901916504,0.189605712890625,0.04369354248046875,0.3319070339202881 diff --git a/results/combined/merges_timed/clusterbench/clusterbench.csv b/results/combined/merges_timed/clusterbench/clusterbench.csv index 00e6db88c9..b9daa74a35 100644 --- a/results/combined/merges_timed/clusterbench/clusterbench.csv +++ b/results/combined/merges_timed/clusterbench/clusterbench.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -64,refs/heads/main,e218cea656fa222ca1ecf2d6fcad6f185b3ec399,19152bf8782512305b25e7fefd2fcf17527e759a,ceca9cb677db82e8317dc707e09ddf5b5facc1d0,,True,True,d001ac878bb52de0ad9138acdb51b9e4031616e8ebdc15ef2e905e5676585f2d,Tests_passed,944b1e2c32707514e6366f503de83de50bb1cd14001df37664706f42ed85a3b8,Tests_passed,True,True,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,0.037717580795288086,0.03677058219909668,0.07264566421508789,0.04570651054382324,0.047582149505615234,0.07420158386230469,0.06534719467163086,0.17192959785461426,0.04824209213256836,0.16092443466186523,0.1601245403289795,0.1217508316040039,0.04115557670593262,0.20579791069030762 +64,refs/heads/main,e218cea656fa222ca1ecf2d6fcad6f185b3ec399,19152bf8782512305b25e7fefd2fcf17527e759a,ceca9cb677db82e8317dc707e09ddf5b5facc1d0,,True,True,d001ac878bb52de0ad9138acdb51b9e4031616e8ebdc15ef2e905e5676585f2d,Tests_passed,944b1e2c32707514e6366f503de83de50bb1cd14001df37664706f42ed85a3b8,Tests_passed,True,True,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,0.037717580795288086,0.03677058219909668,0.07264566421508789,0.04570651054382324,0.047582149505615234,0.07420158386230469,0.06534719467163086,0.17192959785461426,0.04824209213256836,0.1601858139038086,0.15794038772583008,0.1217508316040039,0.04115557670593262,0.20579791069030762 diff --git a/results/combined/merges_timed/code4craft/termblog.csv b/results/combined/merges_timed/code4craft/termblog.csv index 919e49b9fa..11351e2700 100644 --- a/results/combined/merges_timed/code4craft/termblog.csv +++ b/results/combined/merges_timed/code4craft/termblog.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,794189f4401f172745bbc2ab1e17edf70a476b66,8d34534c9a05de46cf723f8cbb6dbaf9235597c3,df6ff5a8611c4a01e4da45590158b0de3b285882,,True,True,17532e417f82faf1ad9f23d8b44387ab4fed6c8936b0a741b4433a1e011516db,Tests_passed,0c73c7a54957b0fab91aaf3b35afd8a76805edb13db411143ba69ca517f3f45d,Tests_passed,True,True,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,c144f95b69e512355210ba1f780da789e90dcae765aadb4aea60838bdbf48d68,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,aa7edfe9e3dc009c39a65dcc1fc1df20fba9a4a0fd19f6e9c5f5b196bedf8400,Merge_failed,aa7edfe9e3dc009c39a65dcc1fc1df20fba9a4a0fd19f6e9c5f5b196bedf8400,Merge_failed,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,920bb270126c8a585dd26403b553487e048858896d15ab40463a001a972ccde9,Merge_failed,793316272118c1a0b2d8cad0de1985c01d24100aaeba3fe2aef6d719cec87a34,0.04150962829589844,0.049869537353515625,0.05292534828186035,0.03526639938354492,0.047705650329589844,0.04695439338684082,0.03488302230834961,0.26352834701538086,0.07135510444641113,0.2035074234008789,0.20424580574035645,0.22367358207702637,1.1094958782196045,0.2133481502532959 +2,refs/heads/master,794189f4401f172745bbc2ab1e17edf70a476b66,8d34534c9a05de46cf723f8cbb6dbaf9235597c3,df6ff5a8611c4a01e4da45590158b0de3b285882,,True,True,17532e417f82faf1ad9f23d8b44387ab4fed6c8936b0a741b4433a1e011516db,Tests_passed,0c73c7a54957b0fab91aaf3b35afd8a76805edb13db411143ba69ca517f3f45d,Tests_passed,True,True,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,c144f95b69e512355210ba1f780da789e90dcae765aadb4aea60838bdbf48d68,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,aa7edfe9e3dc009c39a65dcc1fc1df20fba9a4a0fd19f6e9c5f5b196bedf8400,Merge_failed,aa7edfe9e3dc009c39a65dcc1fc1df20fba9a4a0fd19f6e9c5f5b196bedf8400,Merge_failed,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,920bb270126c8a585dd26403b553487e048858896d15ab40463a001a972ccde9,Merge_failed,793316272118c1a0b2d8cad0de1985c01d24100aaeba3fe2aef6d719cec87a34,0.04150962829589844,0.049869537353515625,0.05292534828186035,0.03526639938354492,0.047705650329589844,0.04695439338684082,0.03488302230834961,0.26352834701538086,0.07135510444641113,0.20259618759155273,0.2023169994354248,0.22367358207702637,1.1094958782196045,0.2133481502532959 diff --git a/results/combined/merges_timed/code4craft/webmagic.csv b/results/combined/merges_timed/code4craft/webmagic.csv index 644919bc62..51709fd42f 100644 --- a/results/combined/merges_timed/code4craft/webmagic.csv +++ b/results/combined/merges_timed/code4craft/webmagic.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,Tests_passed,True,True,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,bb58cb2f36045cc51631e1922e9634dd1cde0346ddfae3f00517c61aad84c2f2,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,4237c3a468cf71c72268a741121339c39877131a6b45fc64c64caa63a9fe9d76,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,e9ed831755b848e8e802ce123d403f6c1b347973bdd76c03db28d64c799f911d,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,e455ac71e25911ba12dba928ffc88ec0134120b5644d3d876bfad13fa5aec65e,Merge_failed,e455ac71e25911ba12dba928ffc88ec0134120b5644d3d876bfad13fa5aec65e,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,0.06307768821716309,0.07529497146606445,0.08739137649536133,0.08552837371826172,0.07785582542419434,0.08044767379760742,0.07998180389404297,0.9370880126953125,0.16465234756469727,0.8287713527679443,0.8234767913818359,0.7516984939575195,4.715071201324463,0.3627636432647705 +163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,Tests_passed,True,True,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,bb58cb2f36045cc51631e1922e9634dd1cde0346ddfae3f00517c61aad84c2f2,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,4237c3a468cf71c72268a741121339c39877131a6b45fc64c64caa63a9fe9d76,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,e9ed831755b848e8e802ce123d403f6c1b347973bdd76c03db28d64c799f911d,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,e455ac71e25911ba12dba928ffc88ec0134120b5644d3d876bfad13fa5aec65e,Merge_failed,e455ac71e25911ba12dba928ffc88ec0134120b5644d3d876bfad13fa5aec65e,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,0.06307768821716309,0.07529497146606445,0.08739137649536133,0.08552837371826172,0.07785582542419434,0.08044767379760742,0.07998180389404297,0.9370880126953125,0.16465234756469727,0.8138673305511475,0.8152871131896973,0.7516984939575195,4.715071201324463,0.3627636432647705 diff --git a/results/combined/merges_timed/codecentric/jmeter-graph-maven-plugin.csv b/results/combined/merges_timed/codecentric/jmeter-graph-maven-plugin.csv index 2a4a01c797..959ff1b794 100644 --- a/results/combined/merges_timed/codecentric/jmeter-graph-maven-plugin.csv +++ b/results/combined/merges_timed/codecentric/jmeter-graph-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/1,9d653ec06f567a6b301d02ba565f3d9023294c3c,59d801302875318e01477fb567789668477b5f98,c92922c382f7f67ee01722e4d05e54d323bdcb4e,,3de1eb6cbe6aae4d61cc88763c3177533caa5fc7d5b50456e0cf2abf306b490d,Tests_passed,e5c0e89ff132330aaf8e8f7ce661d9efaccc878188eb622b92ffb4cfb148cab1,Tests_passed,True,True,True,True,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,ab0e8e18c4397d5b6bf21a0aea2a1f6113e53cb807cab9fb1b04966169d4c572,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,ab0e8e18c4397d5b6bf21a0aea2a1f6113e53cb807cab9fb1b04966169d4c572,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,c50409c5f09544cd3e28f0e8287b893ec1948817c8a331e98ed8759065bca85d,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,af43f80be0d7409471cf363903752e76bc4cb8cb8f9aa65d6469e5987684789d,Merge_failed,af43f80be0d7409471cf363903752e76bc4cb8cb8f9aa65d6469e5987684789d,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,9842c53d96ea8af2d4ac53c8bec8de792ea013deaad6fbf9d6cb1341ac988a51,0.03888297080993652,0.03575253486633301,0.03396010398864746,0.036566972732543945,0.036795616149902344,0.03799915313720703,0.036849260330200195,0.16554021835327148,0.06178855895996094,0.14188241958618164,0.16826105117797852,0.11408233642578125,0.8081326484680176,0.17362642288208008 +4,refs/remotes/origin/pull/1,9d653ec06f567a6b301d02ba565f3d9023294c3c,59d801302875318e01477fb567789668477b5f98,c92922c382f7f67ee01722e4d05e54d323bdcb4e,,3de1eb6cbe6aae4d61cc88763c3177533caa5fc7d5b50456e0cf2abf306b490d,Tests_passed,e5c0e89ff132330aaf8e8f7ce661d9efaccc878188eb622b92ffb4cfb148cab1,Tests_passed,True,True,True,True,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,ab0e8e18c4397d5b6bf21a0aea2a1f6113e53cb807cab9fb1b04966169d4c572,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,ab0e8e18c4397d5b6bf21a0aea2a1f6113e53cb807cab9fb1b04966169d4c572,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,c50409c5f09544cd3e28f0e8287b893ec1948817c8a331e98ed8759065bca85d,Merge_failed,80b4c45d4e20765d3486c779433d72b49a604259c2928c25ef29555a5f1235e3,Merge_failed,af43f80be0d7409471cf363903752e76bc4cb8cb8f9aa65d6469e5987684789d,Merge_failed,af43f80be0d7409471cf363903752e76bc4cb8cb8f9aa65d6469e5987684789d,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,9842c53d96ea8af2d4ac53c8bec8de792ea013deaad6fbf9d6cb1341ac988a51,0.03888297080993652,0.03575253486633301,0.03396010398864746,0.036566972732543945,0.036795616149902344,0.03799915313720703,0.036849260330200195,0.16554021835327148,0.06178855895996094,0.17006325721740723,0.17156434059143066,0.11408233642578125,0.8081326484680176,0.17362642288208008 diff --git a/results/combined/merges_timed/codedance/silken.csv b/results/combined/merges_timed/codedance/silken.csv index 6415bbce74..b96b59cc87 100644 --- a/results/combined/merges_timed/codedance/silken.csv +++ b/results/combined/merges_timed/codedance/silken.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/remotes/origin/pull/8,9f4e8c6f1edd9ad3116ca992b5e530bf16334716,75b5e700533904b1dd44024425e96e1b4a03f4fa,bc7c2090c0f18b962b4ef84b77001749a50e1d53,,27d1dcc005566892b9f568d440e6b95ed5cc4888bf10b67928cbb6fcc10f8485,Tests_passed,22be67c4b2255616e85093565c79c180d005403203f7ee1ebc60510eb0e48891,Tests_passed,True,True,True,True,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b5c3ad1b67706b4f1942a96fc71de86a65c700c9b9c1b7138cd5b725f666885b,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b3e209819a370c12cfc7072dc24f05e52edfccb4f08102280d318fcf2ef2deeb,Merge_failed,b3e209819a370c12cfc7072dc24f05e52edfccb4f08102280d318fcf2ef2deeb,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Merge_failed,158d85d92749ba2c044f882222f7d558be213c77a79cec93fbcb5090e346012a,0.00909423828125,0.009138345718383789,0.008937597274780273,0.008952140808105469,0.008910179138183594,0.008941411972045898,0.009038925170898438,0.04394125938415527,0.015118837356567383,0.13541817665100098,0.13535141944885254,0.12319493293762207,1.6382012367248535,0.15827083587646484 +6,refs/remotes/origin/pull/8,9f4e8c6f1edd9ad3116ca992b5e530bf16334716,75b5e700533904b1dd44024425e96e1b4a03f4fa,bc7c2090c0f18b962b4ef84b77001749a50e1d53,,27d1dcc005566892b9f568d440e6b95ed5cc4888bf10b67928cbb6fcc10f8485,Tests_passed,22be67c4b2255616e85093565c79c180d005403203f7ee1ebc60510eb0e48891,Tests_passed,True,True,True,True,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b5c3ad1b67706b4f1942a96fc71de86a65c700c9b9c1b7138cd5b725f666885b,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b3e209819a370c12cfc7072dc24f05e52edfccb4f08102280d318fcf2ef2deeb,Merge_failed,b3e209819a370c12cfc7072dc24f05e52edfccb4f08102280d318fcf2ef2deeb,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Merge_failed,158d85d92749ba2c044f882222f7d558be213c77a79cec93fbcb5090e346012a,0.00909423828125,0.009138345718383789,0.008937597274780273,0.008952140808105469,0.008910179138183594,0.008941411972045898,0.009038925170898438,0.04394125938415527,0.015118837356567383,0.12524652481079102,0.1341075897216797,0.12319493293762207,1.6382012367248535,0.15827083587646484 diff --git a/results/combined/merges_timed/codeine-cd/codeine.csv b/results/combined/merges_timed/codeine-cd/codeine.csv index 8b84dde16a..05af6041ef 100644 --- a/results/combined/merges_timed/codeine-cd/codeine.csv +++ b/results/combined/merges_timed/codeine-cd/codeine.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -109,refs/remotes/origin/pull/252,e2d8cb4d560d49a12ffb9d53efd7bf10d1867e38,2ad519701f97ad01ab0c14e9a42166ec4d86b41c,ede7bcf188bba00a4fd167385cbab6661e64b26a,,True,True,6fec22c803c70894e82950145f11cf498bba0d5edb682e5e79edd77b5d0f320b,Tests_passed,26430d5f2bb7fe88008dc5f809d79f6868682100907b4146add2432266275416,Tests_passed,True,True,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,4f6d08032d23cd608dfafb0cf43cb54eddeb40dcb081fc3355ef9220619bbc90,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,0aaafa41cec04aa878435952eb00fac0e0c75e03ba5d939b725577a33987f0ef,Merge_failed,0aaafa41cec04aa878435952eb00fac0e0c75e03ba5d939b725577a33987f0ef,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Merge_failed,6774f4410a4d8bae1ace7ad17bf8caf10eab595d8e0ad2cf61ce28bfaea5d49e,0.03825116157531738,0.03835892677307129,0.040407657623291016,0.05039858818054199,0.03997373580932617,0.038826942443847656,0.04228067398071289,0.2515859603881836,0.13058996200561523,0.06560468673706055,0.0657496452331543,0.12093830108642578,0.9364640712738037,0.32718682289123535 +109,refs/remotes/origin/pull/252,e2d8cb4d560d49a12ffb9d53efd7bf10d1867e38,2ad519701f97ad01ab0c14e9a42166ec4d86b41c,ede7bcf188bba00a4fd167385cbab6661e64b26a,,True,True,6fec22c803c70894e82950145f11cf498bba0d5edb682e5e79edd77b5d0f320b,Tests_passed,26430d5f2bb7fe88008dc5f809d79f6868682100907b4146add2432266275416,Tests_passed,True,True,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,4f6d08032d23cd608dfafb0cf43cb54eddeb40dcb081fc3355ef9220619bbc90,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,0aaafa41cec04aa878435952eb00fac0e0c75e03ba5d939b725577a33987f0ef,Merge_failed,0aaafa41cec04aa878435952eb00fac0e0c75e03ba5d939b725577a33987f0ef,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Merge_failed,6774f4410a4d8bae1ace7ad17bf8caf10eab595d8e0ad2cf61ce28bfaea5d49e,0.03825116157531738,0.03835892677307129,0.040407657623291016,0.05039858818054199,0.03997373580932617,0.038826942443847656,0.04228067398071289,0.2515859603881836,0.13058996200561523,0.06657719612121582,0.06564450263977051,0.12093830108642578,0.9364640712738037,0.32718682289123535 diff --git a/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv b/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv index ac73c9a2a2..2469042675 100644 --- a/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv +++ b/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/remotes/origin/pull/63,7f6410361b640207341ac3b31112ad48aa23d64e,62100f1df607cdade1df3fd04f9daafe61cf1f47,204caf84298cf53c61e45b4c5ac34ac07e901e31,,True,True,d20f8040e6a043326853f6ef8136328d7507f1cb3227af41444cd544b17bf7d5,Tests_passed,08dc3b66991e3b9477921a049920006a75c5049117808e931546e7f92c02db88,Tests_passed,True,True,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,ef4df1301353d3b6a9b1880b7f195be7ca2f0700c24878805e9952ae4b9a5955,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,ef4df1301353d3b6a9b1880b7f195be7ca2f0700c24878805e9952ae4b9a5955,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,971b48f784743406f94e7959a7b6dc47ed5e3c8a868f9d1a0ff11cab88dd110d,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,8d5290ac238b66e4e80a2defb9d53dba6463928546f9a80850e7ca1895d46535,Merge_failed,8d5290ac238b66e4e80a2defb9d53dba6463928546f9a80850e7ca1895d46535,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,85a0087200faa9873202ec5fc873e16927b27f217b94ab874853706c07e7b9f0,0.04054689407348633,0.04616904258728027,0.03885316848754883,0.04667949676513672,0.04768061637878418,0.04771780967712402,0.046418190002441406,0.24273037910461426,0.08282804489135742,0.1460118293762207,0.14767670631408691,0.17908692359924316,2.5766348838806152,0.1996748447418213 +23,refs/remotes/origin/pull/63,7f6410361b640207341ac3b31112ad48aa23d64e,62100f1df607cdade1df3fd04f9daafe61cf1f47,204caf84298cf53c61e45b4c5ac34ac07e901e31,,True,True,d20f8040e6a043326853f6ef8136328d7507f1cb3227af41444cd544b17bf7d5,Tests_passed,08dc3b66991e3b9477921a049920006a75c5049117808e931546e7f92c02db88,Tests_passed,True,True,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,ef4df1301353d3b6a9b1880b7f195be7ca2f0700c24878805e9952ae4b9a5955,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,ef4df1301353d3b6a9b1880b7f195be7ca2f0700c24878805e9952ae4b9a5955,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,971b48f784743406f94e7959a7b6dc47ed5e3c8a868f9d1a0ff11cab88dd110d,Merge_failed,f27a7215be4f2f01db4296dc0fbd03edb220d1c928a3dc6f4e7bc577d7a45509,Merge_failed,8d5290ac238b66e4e80a2defb9d53dba6463928546f9a80850e7ca1895d46535,Merge_failed,8d5290ac238b66e4e80a2defb9d53dba6463928546f9a80850e7ca1895d46535,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,85a0087200faa9873202ec5fc873e16927b27f217b94ab874853706c07e7b9f0,0.04054689407348633,0.04616904258728027,0.03885316848754883,0.04667949676513672,0.04768061637878418,0.04771780967712402,0.046418190002441406,0.24273037910461426,0.08282804489135742,0.14674878120422363,0.1466207504272461,0.17908692359924316,2.5766348838806152,0.1996748447418213 diff --git a/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv b/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv index db6b2fd569..4338d6dbeb 100644 --- a/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv +++ b/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,2abe9cc9725a9ec581c0b25f4b6b8465be6ca2bd,bd20a839f948602a01cb0a05c7f27378cd38720e,f66429f2dd399ad0ea0dc65127321e8da4b2b0ce,,013bc7dc36297c07aedfb0a9da4d4995f274e522c71fff4420ef5ad15cef957b,Tests_passed,93fea829e37aa9e397a61e6b342963c471f765dc6e05976753c275cbd5e0e596,Tests_passed,True,True,True,True,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,0.04557633399963379,0.04357576370239258,0.04945206642150879,0.04689621925354004,0.032483816146850586,0.04746532440185547,0.04197216033935547,0.16209840774536133,0.0451350212097168,0.17440366744995117,0.17328095436096191,0.11468172073364258,1.81307053565979,0.18709778785705566 +5,refs/heads/master,2abe9cc9725a9ec581c0b25f4b6b8465be6ca2bd,bd20a839f948602a01cb0a05c7f27378cd38720e,f66429f2dd399ad0ea0dc65127321e8da4b2b0ce,,013bc7dc36297c07aedfb0a9da4d4995f274e522c71fff4420ef5ad15cef957b,Tests_passed,93fea829e37aa9e397a61e6b342963c471f765dc6e05976753c275cbd5e0e596,Tests_passed,True,True,True,True,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,0.04557633399963379,0.04357576370239258,0.04945206642150879,0.04689621925354004,0.032483816146850586,0.04746532440185547,0.04197216033935547,0.16209840774536133,0.0451350212097168,0.17524433135986328,0.17477774620056152,0.11468172073364258,1.81307053565979,0.18709778785705566 diff --git a/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv b/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv index 46ca049165..c48cdc0385 100644 --- a/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv +++ b/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,86d6547781fa856053b7c8778c5b072f3e2d13a6,c1654eb26efa5e84e1ee5ba545723b4f8d5c56c9,27a389ca858f7c681aeb7ca647e71b8195143cbf,,968b77301b0cc1b36d9601389345cea395bb679451638d91006e5bbb14b8f915,Tests_passed,c1f00f7a4ee79a1242c4ac77a4a37045d5cc77e65bafc1acad96bb4638064469,Tests_passed,True,True,True,True,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,cf0a3cacc258a8747d38aca0c6751f62e72295d66d5a9d2b694d97aa77cfb838,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,d7e4d0fa9ea6213bf0056fc5f913818d993d3575e25ad292f3186f0b10e032a3,Merge_failed,d7e4d0fa9ea6213bf0056fc5f913818d993d3575e25ad292f3186f0b10e032a3,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Merge_failed,ea6220b6b830ff99e42ea02b50a4db55fbbcb960a19e7267cddcecbfba2494bc,0.043357133865356445,0.04159688949584961,0.039713144302368164,0.03939700126647949,0.04236721992492676,0.04009199142456055,0.040122270584106445,0.22452092170715332,0.07580018043518066,0.2161853313446045,0.2162008285522461,0.19608473777770996,1.5984892845153809,0.20303606986999512 +3,refs/heads/master,86d6547781fa856053b7c8778c5b072f3e2d13a6,c1654eb26efa5e84e1ee5ba545723b4f8d5c56c9,27a389ca858f7c681aeb7ca647e71b8195143cbf,,968b77301b0cc1b36d9601389345cea395bb679451638d91006e5bbb14b8f915,Tests_passed,c1f00f7a4ee79a1242c4ac77a4a37045d5cc77e65bafc1acad96bb4638064469,Tests_passed,True,True,True,True,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,cf0a3cacc258a8747d38aca0c6751f62e72295d66d5a9d2b694d97aa77cfb838,Merge_failed,63b316d3dc303d939bf0a9ced4881e0feb978da9a1525f67fc886495a415fb24,Merge_failed,d7e4d0fa9ea6213bf0056fc5f913818d993d3575e25ad292f3186f0b10e032a3,Merge_failed,d7e4d0fa9ea6213bf0056fc5f913818d993d3575e25ad292f3186f0b10e032a3,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Merge_failed,ea6220b6b830ff99e42ea02b50a4db55fbbcb960a19e7267cddcecbfba2494bc,0.043357133865356445,0.04159688949584961,0.039713144302368164,0.03939700126647949,0.04236721992492676,0.04009199142456055,0.040122270584106445,0.22452092170715332,0.07580018043518066,0.21737337112426758,0.21700143814086914,0.19608473777770996,1.5984892845153809,0.20303606986999512 diff --git a/results/combined/merges_timed/codingpedia/demo-rest-jersey-spring.csv b/results/combined/merges_timed/codingpedia/demo-rest-jersey-spring.csv index a34e72477f..3634cf4130 100644 --- a/results/combined/merges_timed/codingpedia/demo-rest-jersey-spring.csv +++ b/results/combined/merges_timed/codingpedia/demo-rest-jersey-spring.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,158fc9108d0e0e0b32f9ba636048bc9901ee9e7a,ce83bed1e5da5b643f9967bab4470cfbebbfd897,05f5ee2f97b64ffb774cb8c4e0bc5b4c92374ced,,True,True,acc2d476fc2ba686990e348d54362cd0bc845263cf2288ad429ad61cc65c0a23,Tests_passed,3539dfced015a9491ab87e00b89700d5a91dd009831772f5952d0b5cebf40daa,Tests_passed,True,True,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,0.010289192199707031,0.010288476943969727,0.011412382125854492,0.011418342590332031,0.01153421401977539,0.011619806289672852,0.011581659317016602,0.03693222999572754,0.010339975357055664,0.14875388145446777,0.14815092086791992,0.06628584861755371,0.013889551162719727,0.16199851036071777 +1,refs/heads/master,158fc9108d0e0e0b32f9ba636048bc9901ee9e7a,ce83bed1e5da5b643f9967bab4470cfbebbfd897,05f5ee2f97b64ffb774cb8c4e0bc5b4c92374ced,,True,True,acc2d476fc2ba686990e348d54362cd0bc845263cf2288ad429ad61cc65c0a23,Tests_passed,3539dfced015a9491ab87e00b89700d5a91dd009831772f5952d0b5cebf40daa,Tests_passed,True,True,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,0.010289192199707031,0.010288476943969727,0.011412382125854492,0.011418342590332031,0.01153421401977539,0.011619806289672852,0.011581659317016602,0.03693222999572754,0.010339975357055664,0.14901041984558105,0.14633536338806152,0.06628584861755371,0.013889551162719727,0.16199851036071777 diff --git a/results/combined/merges_timed/cognifide/sling-dynamic-include.csv b/results/combined/merges_timed/cognifide/sling-dynamic-include.csv index 76d27ec02f..1a44c28e5c 100644 --- a/results/combined/merges_timed/cognifide/sling-dynamic-include.csv +++ b/results/combined/merges_timed/cognifide/sling-dynamic-include.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,4ede3baa98d3f20b494ca339783b40903ee9054d,93f68ae098594bf234f2d5249bbf2a4ac2516c04,883b0fe25d50ae895901c4650f23bfe15a78836a,,True,True,95320c9357acf85011ac02378bd82948e49eee6d42f01917b0b7568d5591b1d3,Tests_passed,53ea631dfcfde5849e453b83a8dc19c3ab5492d3cb7355eb782a5be4f0137e97,Tests_passed,True,True,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Tests_passed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Tests_passed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,0.010549783706665039,0.011467695236206055,0.013290166854858398,0.011179924011230469,0.012944459915161133,0.010731935501098633,0.010038375854492188,0.05205345153808594,0.013603925704956055,0.007058858871459961,0.008530616760253906,0.0701298713684082,0.025482177734375,0.18905091285705566 +5,refs/heads/master,4ede3baa98d3f20b494ca339783b40903ee9054d,93f68ae098594bf234f2d5249bbf2a4ac2516c04,883b0fe25d50ae895901c4650f23bfe15a78836a,,True,True,95320c9357acf85011ac02378bd82948e49eee6d42f01917b0b7568d5591b1d3,Tests_passed,53ea631dfcfde5849e453b83a8dc19c3ab5492d3cb7355eb782a5be4f0137e97,Tests_passed,True,True,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Tests_passed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Tests_passed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,0.010549783706665039,0.011467695236206055,0.013290166854858398,0.011179924011230469,0.012944459915161133,0.010731935501098633,0.010038375854492188,0.05205345153808594,0.013603925704956055,0.006195545196533203,0.006306648254394531,0.0701298713684082,0.025482177734375,0.18905091285705566 diff --git a/results/combined/merges_timed/cognitect-labs/transducers-java.csv b/results/combined/merges_timed/cognitect-labs/transducers-java.csv index 8fa5e496ad..a5542daa31 100644 --- a/results/combined/merges_timed/cognitect-labs/transducers-java.csv +++ b/results/combined/merges_timed/cognitect-labs/transducers-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/remotes/origin/java8,b13061ed151598fd886572abbcf5576d8f701d44,37b7aace2623152cab33db7390d2546ca8901436,a1897ce7865dcc6ffeea78e1c3bfed26f713bcc7,,True,True,3955c23c9230ace087f77163a8f346abe008dfffc19ae9cfbff967f519d547e9,Tests_passed,4abb9548c02cfe5493ca83356fe2614e5e8b555a3afd8d0de166dc3c8edbdd30,Tests_passed,True,True,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Tests_passed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Tests_passed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,0.04203534126281738,0.04046988487243652,0.03931903839111328,0.038440704345703125,0.037323713302612305,0.03833127021789551,0.037595272064208984,0.15863680839538574,0.04868793487548828,0.006632328033447266,0.00669550895690918,0.03843331336975098,0.044553279876708984,0.18959450721740723 +6,refs/remotes/origin/java8,b13061ed151598fd886572abbcf5576d8f701d44,37b7aace2623152cab33db7390d2546ca8901436,a1897ce7865dcc6ffeea78e1c3bfed26f713bcc7,,True,True,3955c23c9230ace087f77163a8f346abe008dfffc19ae9cfbff967f519d547e9,Tests_passed,4abb9548c02cfe5493ca83356fe2614e5e8b555a3afd8d0de166dc3c8edbdd30,Tests_passed,True,True,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Tests_passed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Tests_passed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,0.04203534126281738,0.04046988487243652,0.03931903839111328,0.038440704345703125,0.037323713302612305,0.03833127021789551,0.037595272064208984,0.15863680839538574,0.04868793487548828,0.006105899810791016,0.006102323532104492,0.03843331336975098,0.044553279876708984,0.18959450721740723 diff --git a/results/combined/merges_timed/cognitect/transit-java.csv b/results/combined/merges_timed/cognitect/transit-java.csv index beaa2a29bc..d42dff5a8f 100644 --- a/results/combined/merges_timed/cognitect/transit-java.csv +++ b/results/combined/merges_timed/cognitect/transit-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,641ef0f68dcd139f4bdbb55b8618f6f6d26a0257,f4146b0a0d72a3b5bb2a0363a88b670428da2241,49f9534927b70ce5882b160d216f49a951753b81,,True,True,76823149f28ada25ff05f29753e70d69a36f35131754456f64575bc992bae96f,Tests_passed,2aa09c053c09ef2ad21d8c23667d174d13d9343d850f201bbeb27e1644d5837d,Tests_passed,True,True,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,0.042586326599121094,0.04252457618713379,0.043727874755859375,0.044794559478759766,0.05334830284118652,0.04994511604309082,0.05172443389892578,0.2388594150543213,0.050424814224243164,0.3076939582824707,0.309126615524292,0.16956567764282227,1.7480864524841309,0.21555876731872559 +2,refs/heads/master,641ef0f68dcd139f4bdbb55b8618f6f6d26a0257,f4146b0a0d72a3b5bb2a0363a88b670428da2241,49f9534927b70ce5882b160d216f49a951753b81,,True,True,76823149f28ada25ff05f29753e70d69a36f35131754456f64575bc992bae96f,Tests_passed,2aa09c053c09ef2ad21d8c23667d174d13d9343d850f201bbeb27e1644d5837d,Tests_passed,True,True,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,0.042586326599121094,0.04252457618713379,0.043727874755859375,0.044794559478759766,0.05334830284118652,0.04994511604309082,0.05172443389892578,0.2388594150543213,0.050424814224243164,0.3116416931152344,0.30945491790771484,0.16956567764282227,1.7480864524841309,0.21555876731872559 diff --git a/results/combined/merges_timed/comatoes/ftl-profile-editor.csv b/results/combined/merges_timed/comatoes/ftl-profile-editor.csv index b85190bf5a..6f2baa8547 100644 --- a/results/combined/merges_timed/comatoes/ftl-profile-editor.csv +++ b/results/combined/merges_timed/comatoes/ftl-profile-editor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,e87fe65818e726d317ec93c036d48205ed914f09,025d675787b49b2cdf34ee216d205248afa45f47,0e45353030b440fd729284b632da85770d40b73c,,02a8c8a970b3f22d0251013d33c814db2609c1b0400441fd3b103054537fa8ec,Tests_passed,c98eef96740827a9a7d2b7f4e8807d20866c469c7d6259673fd538466c641c3e,Tests_passed,True,True,True,True,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,87c963c092bca9004dd8d18fc1d1f750f9c22b23ae89920e3da6990acdb9da76,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,337586cacf08bf1eee18784fd19f7702112d70f1fb9f7d7fc8d2572703439092,Merge_failed,337586cacf08bf1eee18784fd19f7702112d70f1fb9f7d7fc8d2572703439092,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,b4481a94ff8057373f1a2fb4c9a9a479cab1bf5e6dd3be2e0d6eb86668fbfa3d,0.010855674743652344,0.011154890060424805,0.01185154914855957,0.011249780654907227,0.011424541473388672,0.011464834213256836,0.010877609252929688,0.04105949401855469,0.01861882209777832,0.09571981430053711,0.09112167358398438,0.07241702079772949,2.098428726196289,0.1787395477294922 +10,refs/heads/master,e87fe65818e726d317ec93c036d48205ed914f09,025d675787b49b2cdf34ee216d205248afa45f47,0e45353030b440fd729284b632da85770d40b73c,,02a8c8a970b3f22d0251013d33c814db2609c1b0400441fd3b103054537fa8ec,Tests_passed,c98eef96740827a9a7d2b7f4e8807d20866c469c7d6259673fd538466c641c3e,Tests_passed,True,True,True,True,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,87c963c092bca9004dd8d18fc1d1f750f9c22b23ae89920e3da6990acdb9da76,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,337586cacf08bf1eee18784fd19f7702112d70f1fb9f7d7fc8d2572703439092,Merge_failed,337586cacf08bf1eee18784fd19f7702112d70f1fb9f7d7fc8d2572703439092,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,b4481a94ff8057373f1a2fb4c9a9a479cab1bf5e6dd3be2e0d6eb86668fbfa3d,0.010855674743652344,0.011154890060424805,0.01185154914855957,0.011249780654907227,0.011424541473388672,0.011464834213256836,0.010877609252929688,0.04105949401855469,0.01861882209777832,0.0883176326751709,0.08716249465942383,0.07241702079772949,2.098428726196289,0.1787395477294922 diff --git a/results/combined/merges_timed/comcast/jrugged.csv b/results/combined/merges_timed/comcast/jrugged.csv index d548767501..4503ec5858 100644 --- a/results/combined/merges_timed/comcast/jrugged.csv +++ b/results/combined/merges_timed/comcast/jrugged.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,01f77a72310610356739f066c6babf6bf29940db,ad2d4eb4c563ccf75a7790afbbbd7810ff0fa598,6c99d15ec7ecfe7a60fa9dbaf0624b4ee9630bcc,,True,True,fbc679085039c61cef7947bd9a3577d1658c9181d7c6d4c2f1bc7c20d657355e,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,Tests_passed,True,True,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,9ebb37cc5a97d14d791889b6a941975597eda3b747d594b329f296cd19b6451b,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Merge_failed,997fb0b0c7c71686a091f451103e139e2784e1b02168f31ab33b287e80c5ad31,0.043529510498046875,0.04539823532104492,0.04171252250671387,0.04211926460266113,0.042873382568359375,0.047979116439819336,0.04828333854675293,0.17359447479248047,0.04098939895629883,0.1742877960205078,0.1835925579071045,0.1260390281677246,0.938474178314209,0.2205038070678711 +5,refs/heads/master,01f77a72310610356739f066c6babf6bf29940db,ad2d4eb4c563ccf75a7790afbbbd7810ff0fa598,6c99d15ec7ecfe7a60fa9dbaf0624b4ee9630bcc,,True,True,fbc679085039c61cef7947bd9a3577d1658c9181d7c6d4c2f1bc7c20d657355e,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,Tests_passed,True,True,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Merge_failed,9ebb37cc5a97d14d791889b6a941975597eda3b747d594b329f296cd19b6451b,Merge_failed,a246ef0218a2f11bb5f2a2c0a46ae639837d5d3b43143d50783b8cd4482aeb48,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Merge_failed,997fb0b0c7c71686a091f451103e139e2784e1b02168f31ab33b287e80c5ad31,0.043529510498046875,0.04539823532104492,0.04171252250671387,0.04211926460266113,0.042873382568359375,0.047979116439819336,0.04828333854675293,0.17359447479248047,0.04098939895629883,0.1694931983947754,0.1945204734802246,0.1260390281677246,0.938474178314209,0.2205038070678711 diff --git a/results/combined/merges_timed/commons-rdf/commons-rdf.csv b/results/combined/merges_timed/commons-rdf/commons-rdf.csv index 86dfb8612c..7aae0de62e 100644 --- a/results/combined/merges_timed/commons-rdf/commons-rdf.csv +++ b/results/combined/merges_timed/commons-rdf/commons-rdf.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/old-master-before-asf,c3d344324564a68fdf91b0f2bca3574c3cf80951,e6b93fc8680e0d2cbba50b83c15767e6a4e64916,f3bf1b79225f243e7ebf6ebd0c8d455cc64aca00,,1305c48cfffbe5937d39e24e5cdf779fafeb79cbb9980fa54894dc43b21a4a72,Tests_passed,7426c88b5b0e09b51b09236e85e057f3660fb247ba15748b8a50539fc0ddc9fb,Tests_passed,True,True,True,True,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,1fbd8f8192179fd1292403d9f3d8f997659772b3df12b800e6cc6a40c33177fe,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,687a1e3c4b7abfda8f8f7c371e88103bdd10981832e30d01b4a4af30e68ada2c,Tests_passed,4fded0328bb9ccbeab7ffb5c4c4004462b9b6d4c571f4c24a7c2dac8ff21821f,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,b59051ac3312cf15737719f7e02feed92a99a46c9028af4f2a21d78977ecc2fe,Merge_failed,687a1e3c4b7abfda8f8f7c371e88103bdd10981832e30d01b4a4af30e68ada2c,0.04026532173156738,0.0465090274810791,0.0353550910949707,0.046347856521606445,0.03623199462890625,0.0364222526550293,0.0369105339050293,0.13366413116455078,0.06250476837158203,0.15500497817993164,0.15617752075195312,0.16765642166137695,0.4779548645019531,0.18940305709838867 +17,refs/heads/old-master-before-asf,c3d344324564a68fdf91b0f2bca3574c3cf80951,e6b93fc8680e0d2cbba50b83c15767e6a4e64916,f3bf1b79225f243e7ebf6ebd0c8d455cc64aca00,,1305c48cfffbe5937d39e24e5cdf779fafeb79cbb9980fa54894dc43b21a4a72,Tests_passed,7426c88b5b0e09b51b09236e85e057f3660fb247ba15748b8a50539fc0ddc9fb,Tests_passed,True,True,True,True,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,1fbd8f8192179fd1292403d9f3d8f997659772b3df12b800e6cc6a40c33177fe,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,687a1e3c4b7abfda8f8f7c371e88103bdd10981832e30d01b4a4af30e68ada2c,Tests_passed,4fded0328bb9ccbeab7ffb5c4c4004462b9b6d4c571f4c24a7c2dac8ff21821f,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,b59051ac3312cf15737719f7e02feed92a99a46c9028af4f2a21d78977ecc2fe,Merge_failed,687a1e3c4b7abfda8f8f7c371e88103bdd10981832e30d01b4a4af30e68ada2c,0.04026532173156738,0.0465090274810791,0.0353550910949707,0.046347856521606445,0.03623199462890625,0.0364222526550293,0.0369105339050293,0.13366413116455078,0.06250476837158203,0.15522122383117676,0.15700340270996094,0.16765642166137695,0.4779548645019531,0.18940305709838867 diff --git a/results/combined/merges_timed/connorlinfoot/cratesplus.csv b/results/combined/merges_timed/connorlinfoot/cratesplus.csv index f4f1970b17..630c746f96 100644 --- a/results/combined/merges_timed/connorlinfoot/cratesplus.csv +++ b/results/combined/merges_timed/connorlinfoot/cratesplus.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,50dfeb59338bf094290dbcd1bbea1112ec966900,3e1450cf764cf02d72f03b9490f9b10fa0ae7a8b,6e15f7b0367e0ae03b9e5727d2812247d8b81c4a,,cb4d31e39601ab5685a8f26dd8fb87628d4f9e8865210400252c74471cdb4227,Tests_passed,6e6ddcfb87b6fed2d8f4681bfe9cd527c094efb7f1dc6abda6e33f308a84c912,Tests_passed,True,True,True,True,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,dc6ebc980ffd787da495df7720bd1fd30f2d718bb32975e704621ed7d558840b,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,3a76cd21838be6aa724d28ce14503b39445d8a0542dc46bb53b917fe1ff9710b,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,0.009582996368408203,0.009786605834960938,0.01015472412109375,0.01007533073425293,0.009912729263305664,0.010360002517700195,0.01027369499206543,0.04749417304992676,0.014061927795410156,0.13972711563110352,0.13967180252075195,0.12041687965393066,0.4206259250640869,0.1772935390472412 +9,refs/heads/master,50dfeb59338bf094290dbcd1bbea1112ec966900,3e1450cf764cf02d72f03b9490f9b10fa0ae7a8b,6e15f7b0367e0ae03b9e5727d2812247d8b81c4a,,cb4d31e39601ab5685a8f26dd8fb87628d4f9e8865210400252c74471cdb4227,Tests_passed,6e6ddcfb87b6fed2d8f4681bfe9cd527c094efb7f1dc6abda6e33f308a84c912,Tests_passed,True,True,True,True,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,dc6ebc980ffd787da495df7720bd1fd30f2d718bb32975e704621ed7d558840b,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,3a76cd21838be6aa724d28ce14503b39445d8a0542dc46bb53b917fe1ff9710b,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,0.009582996368408203,0.009786605834960938,0.01015472412109375,0.01007533073425293,0.009912729263305664,0.010360002517700195,0.01027369499206543,0.04749417304992676,0.014061927795410156,0.14018750190734863,0.13980627059936523,0.12041687965393066,0.4206259250640869,0.1772935390472412 diff --git a/results/combined/merges_timed/conveyal/osm-lib.csv b/results/combined/merges_timed/conveyal/osm-lib.csv index ec78cddcc7..4f31ed5ef2 100644 --- a/results/combined/merges_timed/conveyal/osm-lib.csv +++ b/results/combined/merges_timed/conveyal/osm-lib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,8796ed51f2727a30b1ccff02c8aeaa6331ec318c,c8179fedabe4dc5feea6a566503f3cccda960c4c,9a5ec234ce7670842376e81bca25dd7cdabb9d34,,True,True,1458569d8764a7e02a17b4d489479d50594ccaef09beb9f574335db3b54f1afe,Tests_passed,def300512b18c9960f9b8d8f3bd7d2661dfbfc43c0406b648973b6a989483aa2,Tests_passed,True,True,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,0.047125816345214844,0.04700756072998047,0.06699132919311523,0.0683290958404541,0.06673789024353027,0.06655669212341309,0.06665897369384766,0.11098384857177734,0.047237396240234375,0.19605302810668945,0.1940922737121582,0.10310912132263184,0.6743433475494385,0.21907401084899902 +5,refs/heads/master,8796ed51f2727a30b1ccff02c8aeaa6331ec318c,c8179fedabe4dc5feea6a566503f3cccda960c4c,9a5ec234ce7670842376e81bca25dd7cdabb9d34,,True,True,1458569d8764a7e02a17b4d489479d50594ccaef09beb9f574335db3b54f1afe,Tests_passed,def300512b18c9960f9b8d8f3bd7d2661dfbfc43c0406b648973b6a989483aa2,Tests_passed,True,True,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,0.047125816345214844,0.04700756072998047,0.06699132919311523,0.0683290958404541,0.06673789024353027,0.06655669212341309,0.06665897369384766,0.11098384857177734,0.047237396240234375,0.19465279579162598,0.19367408752441406,0.10310912132263184,0.6743433475494385,0.21907401084899902 diff --git a/results/combined/merges_timed/corentin59/artnetstack.csv b/results/combined/merges_timed/corentin59/artnetstack.csv index 4a2a6b050f..4981594e52 100644 --- a/results/combined/merges_timed/corentin59/artnetstack.csv +++ b/results/combined/merges_timed/corentin59/artnetstack.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,f470681d57c8830ab18bf74db45fc67e8baecaf8,d1d1e64965cb8027fb1819b4e8657ba3f37e49c0,d10b58945b2d4ae6a7e82a83269a919bcf207f90,,True,True,28b20d05bc3cb4d4de0fb2257adee1e81d3e6ee164542fc82ab54e8767ae96f6,Tests_passed,a1e0dc9acf01b695c5708a7f79fb83f12b10c6140df734c66c9924bc1d1e39e3,Tests_passed,True,True,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,719b241a1ffb75b4b03fed8254e81f1e14a229a4241a9b7c465905cd386be384,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4937d664c105a664e5be7c2ad0a60ebe75bfeb543e9c1d40f449351d73cd11c9,Merge_failed,4937d664c105a664e5be7c2ad0a60ebe75bfeb543e9c1d40f449351d73cd11c9,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Merge_failed,28afc4def4fa2d0a0ced233d8a5e38d73a06d27b0c281f4f84e67f4cc090258f,0.04260420799255371,0.04081463813781738,0.04115581512451172,0.03875732421875,0.03542375564575195,0.04297518730163574,0.04316425323486328,0.1633315086364746,0.04830002784729004,0.06427669525146484,0.06573486328125,0.11738395690917969,0.7153482437133789,0.21391749382019043 +4,refs/heads/master,f470681d57c8830ab18bf74db45fc67e8baecaf8,d1d1e64965cb8027fb1819b4e8657ba3f37e49c0,d10b58945b2d4ae6a7e82a83269a919bcf207f90,,True,True,28b20d05bc3cb4d4de0fb2257adee1e81d3e6ee164542fc82ab54e8767ae96f6,Tests_passed,a1e0dc9acf01b695c5708a7f79fb83f12b10c6140df734c66c9924bc1d1e39e3,Tests_passed,True,True,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,719b241a1ffb75b4b03fed8254e81f1e14a229a4241a9b7c465905cd386be384,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4937d664c105a664e5be7c2ad0a60ebe75bfeb543e9c1d40f449351d73cd11c9,Merge_failed,4937d664c105a664e5be7c2ad0a60ebe75bfeb543e9c1d40f449351d73cd11c9,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Merge_failed,28afc4def4fa2d0a0ced233d8a5e38d73a06d27b0c281f4f84e67f4cc090258f,0.04260420799255371,0.04081463813781738,0.04115581512451172,0.03875732421875,0.03542375564575195,0.04297518730163574,0.04316425323486328,0.1633315086364746,0.04830002784729004,0.06490755081176758,0.06404399871826172,0.11738395690917969,0.7153482437133789,0.21391749382019043 diff --git a/results/combined/merges_timed/corfudb/corfudb.csv b/results/combined/merges_timed/corfudb/corfudb.csv index 06ff84c54d..7cd20e7295 100644 --- a/results/combined/merges_timed/corfudb/corfudb.csv +++ b/results/combined/merges_timed/corfudb/corfudb.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -398,refs/heads/master,233e1eb18c40db72da1f101cea0b4935f8c6c880,a9e1a15d2d269f429b31d8ac197850e0321c4652,c18f2955cf32966675b363096e39f18027c51a4f,,d32babc3b8fd3692ba30a7c61d343a42143192f774d57fdc34a66b8aff34d17c,Tests_passed,d9b2dc09d92de5db60297c5d088220370fc8132dbc4de8973016030ba4e01a88,Tests_passed,True,True,True,True,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,04550d800ccc1af2167d29f9747451fac5ad3271f00ab3242fe0d8984925d712,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,294a776e802580ad65db1f243b563a82c5ba039aec8736cb89cdbd62b9f93cce,Merge_failed,294a776e802580ad65db1f243b563a82c5ba039aec8736cb89cdbd62b9f93cce,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,0.08862090110778809,0.09194540977478027,0.10686326026916504,0.10752582550048828,0.1059725284576416,0.10632944107055664,0.1060945987701416,0.28328680992126465,0.24927353858947754,0.06942486763000488,0.06982898712158203,0.15122771263122559,0.0925896167755127,0.8848941326141357 +398,refs/heads/master,233e1eb18c40db72da1f101cea0b4935f8c6c880,a9e1a15d2d269f429b31d8ac197850e0321c4652,c18f2955cf32966675b363096e39f18027c51a4f,,d32babc3b8fd3692ba30a7c61d343a42143192f774d57fdc34a66b8aff34d17c,Tests_passed,d9b2dc09d92de5db60297c5d088220370fc8132dbc4de8973016030ba4e01a88,Tests_passed,True,True,True,True,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,04550d800ccc1af2167d29f9747451fac5ad3271f00ab3242fe0d8984925d712,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,294a776e802580ad65db1f243b563a82c5ba039aec8736cb89cdbd62b9f93cce,Merge_failed,294a776e802580ad65db1f243b563a82c5ba039aec8736cb89cdbd62b9f93cce,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,0.08862090110778809,0.09194540977478027,0.10686326026916504,0.10752582550048828,0.1059725284576416,0.10632944107055664,0.1060945987701416,0.28328680992126465,0.24927353858947754,0.12592840194702148,0.10584402084350586,0.15122771263122559,0.0925896167755127,0.8848941326141357 diff --git a/results/combined/merges_timed/couchbase/couchbasemock.csv b/results/combined/merges_timed/couchbase/couchbasemock.csv index 1886ef67b0..36dbafd9b7 100644 --- a/results/combined/merges_timed/couchbase/couchbasemock.csv +++ b/results/combined/merges_timed/couchbase/couchbasemock.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/remotes/origin/pull/34,8a2592ff627f404c008bc22f5a62773f787b288a,2585b651a9a91599b3e264ed630242e734bce980,b49b3867e48f677ac07e870e440f1e5c3793cd5f,,38b4ed1436a351259c499525cc437d9d2cd6e677bb774b7b4e4f41f2dca2e3ff,Tests_passed,df0a161946aabca831ea842e5365e622b1ec60c703e209c03dccfbb59d215c66,Tests_passed,True,True,True,True,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,728eaaadf245656f912a954db38edddcdf91c18ed9a28481a5d5227ab4e4a4c6,Merge_failed,728eaaadf245656f912a954db38edddcdf91c18ed9a28481a5d5227ab4e4a4c6,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,697aad2461df12c1c41dabea8cb0eecc9e8624b23ab33a925e15b162da87fc15,0.01977992057800293,0.010582685470581055,0.022034168243408203,0.01040196418762207,0.02167344093322754,0.022333860397338867,0.02231311798095703,0.13669657707214355,0.04257988929748535,0.5738584995269775,0.5670297145843506,0.44589710235595703,3.9203929901123047,0.20211172103881836 +5,refs/remotes/origin/pull/34,8a2592ff627f404c008bc22f5a62773f787b288a,2585b651a9a91599b3e264ed630242e734bce980,b49b3867e48f677ac07e870e440f1e5c3793cd5f,,38b4ed1436a351259c499525cc437d9d2cd6e677bb774b7b4e4f41f2dca2e3ff,Tests_passed,df0a161946aabca831ea842e5365e622b1ec60c703e209c03dccfbb59d215c66,Tests_passed,True,True,True,True,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,b17184c7148371f520974dfb0f7c374c37e022ba96438e098decf20bdc855e38,Merge_failed,728eaaadf245656f912a954db38edddcdf91c18ed9a28481a5d5227ab4e4a4c6,Merge_failed,728eaaadf245656f912a954db38edddcdf91c18ed9a28481a5d5227ab4e4a4c6,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,697aad2461df12c1c41dabea8cb0eecc9e8624b23ab33a925e15b162da87fc15,0.01977992057800293,0.010582685470581055,0.022034168243408203,0.01040196418762207,0.02167344093322754,0.022333860397338867,0.02231311798095703,0.13669657707214355,0.04257988929748535,0.5750069618225098,0.5751259326934814,0.44589710235595703,3.9203929901123047,0.20211172103881836 diff --git a/results/combined/merges_timed/coutume/imageonmap.csv b/results/combined/merges_timed/coutume/imageonmap.csv index 67f3debe67..ed56f21c60 100644 --- a/results/combined/merges_timed/coutume/imageonmap.csv +++ b/results/combined/merges_timed/coutume/imageonmap.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/indev,094905324ef45772cf98c7887958202acf69e581,ac51032e1a0426cc4e40b525433cca4e270a9273,a45638b86c302cc93967a737e87b6e2c8412c186,,True,True,27dd1f4dc5b5b025019eaddfbbd70028792f943ddbb8505ef61e1d54113d26aa,Tests_passed,776e10b34c839faf6745b02462fa65f4a39ee8c91093f0d199c0d070f4663f5a,Tests_passed,True,True,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,0.01196146011352539,0.012525796890258789,0.013127565383911133,0.013471126556396484,0.013625383377075195,0.013167619705200195,0.013176918029785156,0.03880476951599121,0.011483192443847656,0.15360450744628906,0.15401721000671387,0.06641340255737305,0.5729920864105225,0.1818711757659912 +8,refs/heads/indev,094905324ef45772cf98c7887958202acf69e581,ac51032e1a0426cc4e40b525433cca4e270a9273,a45638b86c302cc93967a737e87b6e2c8412c186,,True,True,27dd1f4dc5b5b025019eaddfbbd70028792f943ddbb8505ef61e1d54113d26aa,Tests_passed,776e10b34c839faf6745b02462fa65f4a39ee8c91093f0d199c0d070f4663f5a,Tests_passed,True,True,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,0.01196146011352539,0.012525796890258789,0.013127565383911133,0.013471126556396484,0.013625383377075195,0.013167619705200195,0.013176918029785156,0.03880476951599121,0.011483192443847656,0.14962220191955566,0.15150785446166992,0.06641340255737305,0.5729920864105225,0.1818711757659912 diff --git a/results/combined/merges_timed/coverity/coverity-security-library.csv b/results/combined/merges_timed/coverity/coverity-security-library.csv index 831a331665..931cc1b941 100644 --- a/results/combined/merges_timed/coverity/coverity-security-library.csv +++ b/results/combined/merges_timed/coverity/coverity-security-library.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/develop,87f5b259742c8db2aec081be12efedf6c3b76577,06b372aebec440bc64141af4a83ad077b8b4ba45,8656ab536af9a8547ed58a3178170bf3f482813f,,True,True,e98057c6694e44a17de3da44397ae4eb571296c7882d93ff6e393118019cf105,Tests_passed,5b84b4fbfb4e112f3ffebd65df62dbc17215bad3b7df9f061e15fbfbf143b11a,Tests_passed,True,True,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_failed,be2e22d98728cd2e94eb0a9f712294df3bb1c3e1d9872de485c9b31b6d2bc620,Tests_failed,be2e22d98728cd2e94eb0a9f712294df3bb1c3e1d9872de485c9b31b6d2bc620,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,0.05778098106384277,0.05587196350097656,0.051700592041015625,0.0532987117767334,0.013437509536743164,0.05094766616821289,0.052858829498291016,0.17708039283752441,0.05525398254394531,0.1743462085723877,0.16991090774536133,0.11895370483398438,0.616478681564331,0.19910025596618652 +2,refs/heads/develop,87f5b259742c8db2aec081be12efedf6c3b76577,06b372aebec440bc64141af4a83ad077b8b4ba45,8656ab536af9a8547ed58a3178170bf3f482813f,,True,True,e98057c6694e44a17de3da44397ae4eb571296c7882d93ff6e393118019cf105,Tests_passed,5b84b4fbfb4e112f3ffebd65df62dbc17215bad3b7df9f061e15fbfbf143b11a,Tests_passed,True,True,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_failed,be2e22d98728cd2e94eb0a9f712294df3bb1c3e1d9872de485c9b31b6d2bc620,Tests_failed,be2e22d98728cd2e94eb0a9f712294df3bb1c3e1d9872de485c9b31b6d2bc620,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,0.05778098106384277,0.05587196350097656,0.051700592041015625,0.0532987117767334,0.013437509536743164,0.05094766616821289,0.052858829498291016,0.17708039283752441,0.05525398254394531,0.16271328926086426,0.16294479370117188,0.11895370483398438,0.616478681564331,0.19910025596618652 diff --git a/results/combined/merges_timed/cowtowncoder/java-classmate.csv b/results/combined/merges_timed/cowtowncoder/java-classmate.csv index 07a62c5006..bf10a81a47 100644 --- a/results/combined/merges_timed/cowtowncoder/java-classmate.csv +++ b/results/combined/merges_timed/cowtowncoder/java-classmate.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,b6f993cddcb4cac4f1b8aa250f3e020e9727aaea,8aebf88f4c8bb9773a3fbdf1ca906bc83caf01b4,6f670f7db7b053c4690402fbfa60ace167b9e0d9,,13426d420a43d9ae3c0924aeb207bd43e3993b9d4f9deb9d081420c8f1a72a21,Tests_passed,d9a6105f540e37aa74b7a1708f6432accc8f3f08835fc490da4afacf4e25421d,Tests_passed,True,True,True,True,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,0.04842329025268555,0.056157588958740234,0.04538774490356445,0.061743736267089844,0.06424593925476074,0.0466303825378418,0.044721126556396484,0.17714929580688477,0.04174613952636719,0.16896343231201172,0.16555476188659668,0.11199951171875,0.9171280860900879,0.2130565643310547 +13,refs/heads/master,b6f993cddcb4cac4f1b8aa250f3e020e9727aaea,8aebf88f4c8bb9773a3fbdf1ca906bc83caf01b4,6f670f7db7b053c4690402fbfa60ace167b9e0d9,,13426d420a43d9ae3c0924aeb207bd43e3993b9d4f9deb9d081420c8f1a72a21,Tests_passed,d9a6105f540e37aa74b7a1708f6432accc8f3f08835fc490da4afacf4e25421d,Tests_passed,True,True,True,True,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,0.04842329025268555,0.056157588958740234,0.04538774490356445,0.061743736267089844,0.06424593925476074,0.0466303825378418,0.044721126556396484,0.17714929580688477,0.04174613952636719,0.16404151916503906,0.1636505126953125,0.11199951171875,0.9171280860900879,0.2130565643310547 diff --git a/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv b/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv index 691d3426a0..4cac3cb3c6 100644 --- a/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv +++ b/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,259857f3675ea88d0f2d6361904e085ed91dafe7,37c22d00607f5618cab9a81eeb00dad848e041c2,af0c5ae57383b584ca1eca7cd5bcab218ca3046d,,360643ef385c697e8e3adaeeea9449caecc7c3d799cb76850143b9d23d57398f,Tests_passed,19fad57bd5b751c6b2304ab92cb545eb13a5a2b98993b055dc04b9d9fa623537,Tests_passed,True,True,True,True,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,0.009517431259155273,0.010026693344116211,0.009897708892822266,0.01006174087524414,0.010400772094726562,0.010065555572509766,0.009891033172607422,0.036084651947021484,0.009729146957397461,0.16265869140625,0.16419053077697754,0.06820487976074219,0.7103888988494873,0.1593475341796875 +3,refs/heads/master,259857f3675ea88d0f2d6361904e085ed91dafe7,37c22d00607f5618cab9a81eeb00dad848e041c2,af0c5ae57383b584ca1eca7cd5bcab218ca3046d,,360643ef385c697e8e3adaeeea9449caecc7c3d799cb76850143b9d23d57398f,Tests_passed,19fad57bd5b751c6b2304ab92cb545eb13a5a2b98993b055dc04b9d9fa623537,Tests_passed,True,True,True,True,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,0.009517431259155273,0.010026693344116211,0.009897708892822266,0.01006174087524414,0.010400772094726562,0.010065555572509766,0.009891033172607422,0.036084651947021484,0.009729146957397461,0.15912461280822754,0.15875911712646484,0.06820487976074219,0.7103888988494873,0.1593475341796875 diff --git a/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv b/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv index abbe798572..093d85d40c 100644 --- a/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv +++ b/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,47f4b70d8392a721d18827121cde1be0179484c9,2a9673cf1473ed5f0abf901df6ab79687bb62029,54db1d59909096e3d6c843f2d5338b18a93f6df1,,True,True,44c7ba77106e5af0b0728e09032143b11c7b810bc83a3567838b528e0ea4179e,Tests_passed,78de4abb536eb2e184a2147ca779b6cc7b102fd3977af97be2ed570e3ad57d23,Tests_passed,True,True,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Merge_failed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,0.04688620567321777,0.044298648834228516,0.046773433685302734,0.04509162902832031,0.05207180976867676,0.05414462089538574,0.059834957122802734,0.16636252403259277,0.03887295722961426,0.15990567207336426,0.15745854377746582,0.11523890495300293,0.6558089256286621,0.19266271591186523 +7,refs/heads/master,47f4b70d8392a721d18827121cde1be0179484c9,2a9673cf1473ed5f0abf901df6ab79687bb62029,54db1d59909096e3d6c843f2d5338b18a93f6df1,,True,True,44c7ba77106e5af0b0728e09032143b11c7b810bc83a3567838b528e0ea4179e,Tests_passed,78de4abb536eb2e184a2147ca779b6cc7b102fd3977af97be2ed570e3ad57d23,Tests_passed,True,True,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Merge_failed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,0.04688620567321777,0.044298648834228516,0.046773433685302734,0.04509162902832031,0.05207180976867676,0.05414462089538574,0.059834957122802734,0.16636252403259277,0.03887295722961426,0.15692996978759766,0.15536022186279297,0.11523890495300293,0.6558089256286621,0.19266271591186523 diff --git a/results/combined/merges_timed/craigwblake/redline.csv b/results/combined/merges_timed/craigwblake/redline.csv index 29ce05885a..e345496808 100644 --- a/results/combined/merges_timed/craigwblake/redline.csv +++ b/results/combined/merges_timed/craigwblake/redline.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/heads/master,93d8982d66c56a3d198aaf792b4c5737295aedbd,d1720810ea8a53f15e01332d4d8cf31ad46bb381,71e1ca243fa959797728bb09c0abf3c6c2d9a697,,True,True,d2d8a0203ef4aaa9877fcec35430e310efb7a665f2dee1effe6a7adefdfae625,Tests_passed,9ed3135958ce290c0bbc1910c1f3756206ae48b0787154dd6998e8cfe34c084b,Tests_passed,True,True,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,7627d34b8ad0e5a3a8cda6409653016e055d00793f9a8332acf2c2ecd1f06509,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,7ff82c62020813e81815b5e3f7d70dc02e384ee4cf0a2f0e55ce5eee527e50de,Merge_failed,7ff82c62020813e81815b5e3f7d70dc02e384ee4cf0a2f0e55ce5eee527e50de,Merge_failed,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Merge_failed,c711d5d16131f875d0ae1f597489a826c1712ae71c1fef29dfd34e753332f6e5,0.012245655059814453,0.012317657470703125,0.013009309768676758,0.012628555297851562,0.013041019439697266,0.013355255126953125,0.012796878814697266,0.05112409591674805,0.019852638244628906,0.2343158721923828,0.2339620590209961,0.12578892707824707,1.4114482402801514,0.1923530101776123 +25,refs/heads/master,93d8982d66c56a3d198aaf792b4c5737295aedbd,d1720810ea8a53f15e01332d4d8cf31ad46bb381,71e1ca243fa959797728bb09c0abf3c6c2d9a697,,True,True,d2d8a0203ef4aaa9877fcec35430e310efb7a665f2dee1effe6a7adefdfae625,Tests_passed,9ed3135958ce290c0bbc1910c1f3756206ae48b0787154dd6998e8cfe34c084b,Tests_passed,True,True,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,7627d34b8ad0e5a3a8cda6409653016e055d00793f9a8332acf2c2ecd1f06509,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,7ff82c62020813e81815b5e3f7d70dc02e384ee4cf0a2f0e55ce5eee527e50de,Merge_failed,7ff82c62020813e81815b5e3f7d70dc02e384ee4cf0a2f0e55ce5eee527e50de,Merge_failed,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Merge_failed,c711d5d16131f875d0ae1f597489a826c1712ae71c1fef29dfd34e753332f6e5,0.012245655059814453,0.012317657470703125,0.013009309768676758,0.012628555297851562,0.013041019439697266,0.013355255126953125,0.012796878814697266,0.05112409591674805,0.019852638244628906,0.2322101593017578,0.22805571556091309,0.12578892707824707,1.4114482402801514,0.1923530101776123 diff --git a/results/combined/merges_timed/creswick/cjwizard.csv b/results/combined/merges_timed/creswick/cjwizard.csv index 0aafc4d1bd..7cd61790aa 100644 --- a/results/combined/merges_timed/creswick/cjwizard.csv +++ b/results/combined/merges_timed/creswick/cjwizard.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,Tests_passed,True,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.03646373748779297,0.042362213134765625,0.04679441452026367,0.04868483543395996,0.051816463470458984,0.039258718490600586,0.04535222053527832,0.16601872444152832,0.04773139953613281,0.17103981971740723,0.17424893379211426,0.1098794937133789,1.12184476852417,0.1975116729736328 +14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,Tests_passed,True,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.03646373748779297,0.042362213134765625,0.04679441452026367,0.04868483543395996,0.051816463470458984,0.039258718490600586,0.04535222053527832,0.16601872444152832,0.04773139953613281,0.16094374656677246,0.16148805618286133,0.1098794937133789,1.12184476852417,0.1975116729736328 diff --git a/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv b/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv index 888e72659f..3e057928d0 100644 --- a/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv +++ b/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,0b7df0edc68a40c8d79c903cb86e247f7ec190b4,56a8b97dd8be278ed2636077bc5f1b929d0229b7,3887e2c173f89684b82ab5002499c435ebf3a60f,,True,True,086872243a2eef8176f0ffb013f0f4aed0ba3e060a3a6dce8b9e7c7a098fee47,Tests_passed,fa4dce8419a625b5abb82d41d22a3f2fdcd3bb917dcdd00a9fcc11ce5eacc377,Tests_passed,True,True,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,d20892a6f03200b33cc0e2ed17dac63e6dfb3d1f43f268a4be44de9c7bce2cc1,Tests_passed,d20892a6f03200b33cc0e2ed17dac63e6dfb3d1f43f268a4be44de9c7bce2cc1,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,0.04108881950378418,0.04434514045715332,0.04111909866333008,0.04053759574890137,0.03910684585571289,0.04032325744628906,0.04710793495178223,0.17396998405456543,0.04271721839904785,0.15358638763427734,0.15525460243225098,0.11359310150146484,0.6642420291900635,0.21008539199829102 +15,refs/heads/master,0b7df0edc68a40c8d79c903cb86e247f7ec190b4,56a8b97dd8be278ed2636077bc5f1b929d0229b7,3887e2c173f89684b82ab5002499c435ebf3a60f,,True,True,086872243a2eef8176f0ffb013f0f4aed0ba3e060a3a6dce8b9e7c7a098fee47,Tests_passed,fa4dce8419a625b5abb82d41d22a3f2fdcd3bb917dcdd00a9fcc11ce5eacc377,Tests_passed,True,True,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,d20892a6f03200b33cc0e2ed17dac63e6dfb3d1f43f268a4be44de9c7bce2cc1,Tests_passed,d20892a6f03200b33cc0e2ed17dac63e6dfb3d1f43f268a4be44de9c7bce2cc1,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,0.04108881950378418,0.04434514045715332,0.04111909866333008,0.04053759574890137,0.03910684585571289,0.04032325744628906,0.04710793495178223,0.17396998405456543,0.04271721839904785,0.14592814445495605,0.14643383026123047,0.11359310150146484,0.6642420291900635,0.21008539199829102 diff --git a/results/combined/merges_timed/cternes/openkeepass.csv b/results/combined/merges_timed/cternes/openkeepass.csv index f5a5fff6ff..075ad6619d 100644 --- a/results/combined/merges_timed/cternes/openkeepass.csv +++ b/results/combined/merges_timed/cternes/openkeepass.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,0691954e63c3576146e86809bff0c0c2b77a0f6f,6218ade3f2e50f22e5e263714197f176e856c5a2,18ba96ffbe2acabe644a155ef8c650548f3c7062,,True,True,836933c08f60ae54c30f2e09ddc4c575aeb57ed7d1af55b8930d4eabae3e99f5,Tests_passed,027deee34b639e0ba83921c7135dd06ab6d20889838dda37e4edf841ad8711ae,Tests_passed,True,True,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,9fa7c4fa1e82dc83c9eb85956dc467e81381ec989b84380bb57c649b465f0a9c,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Merge_failed,781ee38c169e40d91321af0ad3f3e274554932ec1f0a9460f3877e21e7b36493,0.044588565826416016,0.04640626907348633,0.02872157096862793,0.04409074783325195,0.03983259201049805,0.047217607498168945,0.04508256912231445,0.24869871139526367,0.047608375549316406,0.3146662712097168,0.3140451908111572,0.17644262313842773,1.592029094696045,0.23750734329223633 +12,refs/heads/master,0691954e63c3576146e86809bff0c0c2b77a0f6f,6218ade3f2e50f22e5e263714197f176e856c5a2,18ba96ffbe2acabe644a155ef8c650548f3c7062,,True,True,836933c08f60ae54c30f2e09ddc4c575aeb57ed7d1af55b8930d4eabae3e99f5,Tests_passed,027deee34b639e0ba83921c7135dd06ab6d20889838dda37e4edf841ad8711ae,Tests_passed,True,True,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,9fa7c4fa1e82dc83c9eb85956dc467e81381ec989b84380bb57c649b465f0a9c,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Merge_failed,781ee38c169e40d91321af0ad3f3e274554932ec1f0a9460f3877e21e7b36493,0.044588565826416016,0.04640626907348633,0.02872157096862793,0.04409074783325195,0.03983259201049805,0.047217607498168945,0.04508256912231445,0.24869871139526367,0.047608375549316406,0.3161613941192627,0.3155968189239502,0.17644262313842773,1.592029094696045,0.23750734329223633 diff --git a/results/combined/merges_timed/ctran/tinyradius.csv b/results/combined/merges_timed/ctran/tinyradius.csv index cda598ff4a..9374501a57 100644 --- a/results/combined/merges_timed/ctran/tinyradius.csv +++ b/results/combined/merges_timed/ctran/tinyradius.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/20,28644bdc78775695857aec787d220e81399454e6,4332168d74101944750e404a65f01664532e1b2f,82d5baf8774ce22e2301d5c856cecd9aa7348553,,True,True,1d380689633a029030220c020d6280aa62adedd1cba5035502ac3ecb62ba0730,Tests_passed,ea373092ad708087253cb44417aa7b84052b06f4e89078ad3b80c7124716bc98,Tests_passed,True,True,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,0.012056589126586914,0.011953353881835938,0.013063192367553711,0.013822555541992188,0.013204336166381836,0.013319253921508789,0.0135955810546875,0.04078555107116699,0.011774539947509766,0.16694092750549316,0.16974472999572754,0.07064104080200195,0.9391317367553711,0.17596173286437988 +3,refs/remotes/origin/pull/20,28644bdc78775695857aec787d220e81399454e6,4332168d74101944750e404a65f01664532e1b2f,82d5baf8774ce22e2301d5c856cecd9aa7348553,,True,True,1d380689633a029030220c020d6280aa62adedd1cba5035502ac3ecb62ba0730,Tests_passed,ea373092ad708087253cb44417aa7b84052b06f4e89078ad3b80c7124716bc98,Tests_passed,True,True,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,0.012056589126586914,0.011953353881835938,0.013063192367553711,0.013822555541992188,0.013204336166381836,0.013319253921508789,0.0135955810546875,0.04078555107116699,0.011774539947509766,0.16026902198791504,0.15966057777404785,0.07064104080200195,0.9391317367553711,0.17596173286437988 diff --git a/results/combined/merges_timed/dabsquared/gitlab-plugin.csv b/results/combined/merges_timed/dabsquared/gitlab-plugin.csv index 3ba98fa953..fd4e1f30bf 100644 --- a/results/combined/merges_timed/dabsquared/gitlab-plugin.csv +++ b/results/combined/merges_timed/dabsquared/gitlab-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -121,refs/heads/master,f2815dcb0482755e4185d2691a3a0cf37b862b26,49b97dfa8f9fdc0f172af04491ba5dbd1b2b5f5b,45e754db357692047e481500269a3b3be764dd82,,True,True,71762fef9b65436d81101674ba3e728166bf44a8c376453ea883e96b58c9e0e3,Tests_passed,abf6299d51eceec06b0287b2c14b80ee7337f3589c6adc121e448779569735bb,Tests_passed,True,True,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,0.012727975845336914,0.01833653450012207,0.0224459171295166,0.022340774536132812,0.021999835968017578,0.014336347579956055,0.021952390670776367,0.05077028274536133,0.017841815948486328,0.16542363166809082,0.17492437362670898,0.07353687286376953,0.8451938629150391,0.24224352836608887 +121,refs/heads/master,f2815dcb0482755e4185d2691a3a0cf37b862b26,49b97dfa8f9fdc0f172af04491ba5dbd1b2b5f5b,45e754db357692047e481500269a3b3be764dd82,,True,True,71762fef9b65436d81101674ba3e728166bf44a8c376453ea883e96b58c9e0e3,Tests_passed,abf6299d51eceec06b0287b2c14b80ee7337f3589c6adc121e448779569735bb,Tests_passed,True,True,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,0.012727975845336914,0.01833653450012207,0.0224459171295166,0.022340774536132812,0.021999835968017578,0.014336347579956055,0.021952390670776367,0.05077028274536133,0.017841815948486328,0.17571806907653809,0.16671967506408691,0.07353687286376953,0.8451938629150391,0.24224352836608887 diff --git a/results/combined/merges_timed/dakusui/jcunit.csv b/results/combined/merges_timed/dakusui/jcunit.csv index a0a6101f91..ed5526ff67 100644 --- a/results/combined/merges_timed/dakusui/jcunit.csv +++ b/results/combined/merges_timed/dakusui/jcunit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -94,refs/remotes/origin/archive-0.8.x-experiment-join,7f2740c44e080329b840996c537f006154566e5a,3f10eff6a4b93dc09797d2105707864577323c46,7c8b99f1e932c6dd8cd3f2bb7a3d6c824001f57f,,True,True,bfffbfa98d1d5e06d2150e4683c3811b8d5175cb62f291515c6b9a26d67755e3,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,True,True,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,bae835e847f920076854d40b15f564b514488d37bfe0154dec8fa80fc9d60ab8,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,0.04571223258972168,0.015544652938842773,0.05146288871765137,0.026289939880371094,0.0527796745300293,0.03360605239868164,0.05479693412780762,0.17933297157287598,0.0474395751953125,0.1797323226928711,0.1836247444152832,0.11561846733093262,1.2018201351165771,0.2556471824645996 +94,refs/remotes/origin/archive-0.8.x-experiment-join,7f2740c44e080329b840996c537f006154566e5a,3f10eff6a4b93dc09797d2105707864577323c46,7c8b99f1e932c6dd8cd3f2bb7a3d6c824001f57f,,True,True,bfffbfa98d1d5e06d2150e4683c3811b8d5175cb62f291515c6b9a26d67755e3,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,True,True,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,bae835e847f920076854d40b15f564b514488d37bfe0154dec8fa80fc9d60ab8,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,0.04571223258972168,0.015544652938842773,0.05146288871765137,0.026289939880371094,0.0527796745300293,0.03360605239868164,0.05479693412780762,0.17933297157287598,0.0474395751953125,0.17735815048217773,0.17766237258911133,0.11561846733093262,1.2018201351165771,0.2556471824645996 diff --git a/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv b/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv index de7d1fc567..9250a8d275 100644 --- a/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv +++ b/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,0bce3a1367ac611fc90a265cee3fc6de53c75943,3330e18f01f39361c7cfbb21d26d44c8f9c21a00,2007bf5f639ec25ca7b30b77ffd3f9701923a57e,,True,True,3d7af16377c293a7d23528eb1afdfe603d662751e175bdf24be4c61e18051ed5,Tests_passed,4e15b33f4310230925b7a35e55d0ddeb1ea0073f6e1bd2387fa5d5a13b400f08,Tests_passed,True,True,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,c1a62f63f057a022f6fbfcd9fb9cf5473fb81a3054a9f649aac2b4e6420ef3b8,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,e1a6a6d8a32402cff772b3458057c18b7c2b01fa7a4f82f9e43c7fff9282c8a1,Merge_failed,e1a6a6d8a32402cff772b3458057c18b7c2b01fa7a4f82f9e43c7fff9282c8a1,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,c75557219c0bdb3ecf1d179f3955073ce44f6e31b81f9a62ce93bf5c3ef24615,0.009885549545288086,0.010724782943725586,0.01417684555053711,0.011085271835327148,0.010121583938598633,0.009806394577026367,0.009602069854736328,0.0691835880279541,0.016228199005126953,0.06856822967529297,0.06833434104919434,0.06885623931884766,0.681602954864502,0.1615009307861328 +14,refs/heads/master,0bce3a1367ac611fc90a265cee3fc6de53c75943,3330e18f01f39361c7cfbb21d26d44c8f9c21a00,2007bf5f639ec25ca7b30b77ffd3f9701923a57e,,True,True,3d7af16377c293a7d23528eb1afdfe603d662751e175bdf24be4c61e18051ed5,Tests_passed,4e15b33f4310230925b7a35e55d0ddeb1ea0073f6e1bd2387fa5d5a13b400f08,Tests_passed,True,True,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,c1a62f63f057a022f6fbfcd9fb9cf5473fb81a3054a9f649aac2b4e6420ef3b8,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,e1a6a6d8a32402cff772b3458057c18b7c2b01fa7a4f82f9e43c7fff9282c8a1,Merge_failed,e1a6a6d8a32402cff772b3458057c18b7c2b01fa7a4f82f9e43c7fff9282c8a1,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,c75557219c0bdb3ecf1d179f3955073ce44f6e31b81f9a62ce93bf5c3ef24615,0.009885549545288086,0.010724782943725586,0.01417684555053711,0.011085271835327148,0.010121583938598633,0.009806394577026367,0.009602069854736328,0.0691835880279541,0.016228199005126953,0.06906747817993164,0.06848740577697754,0.06885623931884766,0.681602954864502,0.1615009307861328 diff --git a/results/combined/merges_timed/danielgronau/highj.csv b/results/combined/merges_timed/danielgronau/highj.csv index 94560c2af3..d623b77517 100644 --- a/results/combined/merges_timed/danielgronau/highj.csv +++ b/results/combined/merges_timed/danielgronau/highj.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,57cae0eb2d9be81f18f7e6f05cb69e68cd731c7d,a0478ba744b7beb5b2c71dea640a6cf6b26f5594,83e3f970c0a9563ba289bc1d35204dfbdfa624b9,,True,True,293ed24c2bdf911155197dcdcd4b66c5add192b0f3ce37628a1a917f45bdbd8e,Tests_passed,69a85ed3e02b92d8bdcb0fe8cd66a630995461d02088a6af88c4c53dfda957b0,Tests_passed,True,True,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,3083130a075ef212ceeeb9adae774512c8dcd7a46d5ffeacfa9eab24c3f91b51,Tests_passed,3083130a075ef212ceeeb9adae774512c8dcd7a46d5ffeacfa9eab24c3f91b51,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,0.07220315933227539,0.06838583946228027,0.04171633720397949,0.07182550430297852,0.07147479057312012,0.06343364715576172,0.06454896926879883,0.2739529609680176,0.05712723731994629,0.32985377311706543,0.32384181022644043,0.22988200187683105,1.5473601818084717,0.621405839920044 +2,refs/heads/master,57cae0eb2d9be81f18f7e6f05cb69e68cd731c7d,a0478ba744b7beb5b2c71dea640a6cf6b26f5594,83e3f970c0a9563ba289bc1d35204dfbdfa624b9,,True,True,293ed24c2bdf911155197dcdcd4b66c5add192b0f3ce37628a1a917f45bdbd8e,Tests_passed,69a85ed3e02b92d8bdcb0fe8cd66a630995461d02088a6af88c4c53dfda957b0,Tests_passed,True,True,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,3083130a075ef212ceeeb9adae774512c8dcd7a46d5ffeacfa9eab24c3f91b51,Tests_passed,3083130a075ef212ceeeb9adae774512c8dcd7a46d5ffeacfa9eab24c3f91b51,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,0.07220315933227539,0.06838583946228027,0.04171633720397949,0.07182550430297852,0.07147479057312012,0.06343364715576172,0.06454896926879883,0.2739529609680176,0.05712723731994629,0.32587718963623047,0.32646656036376953,0.22988200187683105,1.5473601818084717,0.621405839920044 diff --git a/results/combined/merges_timed/danielnorberg/auto-matter.csv b/results/combined/merges_timed/danielnorberg/auto-matter.csv index 93485f0058..10e7f47231 100644 --- a/results/combined/merges_timed/danielnorberg/auto-matter.csv +++ b/results/combined/merges_timed/danielnorberg/auto-matter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,a076352517d328fcb10a4cb9d1dd25e823f47e1a,32b943613299e13becc4ae5ab310d3f911776964,978b269eba9f5fdd9c4b88a98d6236fd03c0e8ab,,True,True,77c4cbc9f7f4215fad0b8f58abf46244e7ab064ac85ad7c8c13e918590a00280,Tests_passed,40e78e274138c689c534014176d9606b965135bb2e47197a9b1b77166d19dfb3,Tests_passed,True,True,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0dc994035403edb4259cd0c3e6fb470a6e18fdc0c560ad9f23a8229dac5ec3a7,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,1595a4e90182371ff02cb073ae63964c5c91b6b65fd8df066b28e1a5505885f5,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,0.04670310020446777,0.050632476806640625,0.05260276794433594,0.05561470985412598,0.05225992202758789,0.04320192337036133,0.046372413635253906,0.5303349494934082,0.09185910224914551,0.18729043006896973,0.1885521411895752,0.3765380382537842,2.546903133392334,0.3086695671081543 +10,refs/heads/master,a076352517d328fcb10a4cb9d1dd25e823f47e1a,32b943613299e13becc4ae5ab310d3f911776964,978b269eba9f5fdd9c4b88a98d6236fd03c0e8ab,,True,True,77c4cbc9f7f4215fad0b8f58abf46244e7ab064ac85ad7c8c13e918590a00280,Tests_passed,40e78e274138c689c534014176d9606b965135bb2e47197a9b1b77166d19dfb3,Tests_passed,True,True,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0dc994035403edb4259cd0c3e6fb470a6e18fdc0c560ad9f23a8229dac5ec3a7,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,1595a4e90182371ff02cb073ae63964c5c91b6b65fd8df066b28e1a5505885f5,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,0.04670310020446777,0.050632476806640625,0.05260276794433594,0.05561470985412598,0.05225992202758789,0.04320192337036133,0.046372413635253906,0.5303349494934082,0.09185910224914551,0.18812942504882812,0.19194793701171875,0.3765380382537842,2.546903133392334,0.3086695671081543 diff --git a/results/combined/merges_timed/dankurka/gwtphonegap.csv b/results/combined/merges_timed/dankurka/gwtphonegap.csv index 7268e4c91e..63c828d21c 100644 --- a/results/combined/merges_timed/dankurka/gwtphonegap.csv +++ b/results/combined/merges_timed/dankurka/gwtphonegap.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,e19aa67e33166f958e2cb1181d5811cbde2ff6ad,72aa0c929b6fb675fa29d56a0daf0405caf85906,9037a4172b06032e5133e95f0fc4f0fc9c3651b5,,True,True,28b9675d2af90cfc8a0741471a1ba40af03a39fbfeb06b5ae912d0259bc27665,Tests_passed,6152f84e95cd50a4fa5d733320cacb3af9ded85e38b0f27aa14be15ef42da51b,Tests_passed,True,True,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,0.01567673683166504,0.010325431823730469,0.019463062286376953,0.01911187171936035,0.01933598518371582,0.01943826675415039,0.010653257369995117,0.04733133316040039,0.01576972007751465,0.15061330795288086,0.15158748626708984,0.07062625885009766,0.4834458827972412,0.21218538284301758 +9,refs/heads/master,e19aa67e33166f958e2cb1181d5811cbde2ff6ad,72aa0c929b6fb675fa29d56a0daf0405caf85906,9037a4172b06032e5133e95f0fc4f0fc9c3651b5,,True,True,28b9675d2af90cfc8a0741471a1ba40af03a39fbfeb06b5ae912d0259bc27665,Tests_passed,6152f84e95cd50a4fa5d733320cacb3af9ded85e38b0f27aa14be15ef42da51b,Tests_passed,True,True,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,0.01567673683166504,0.010325431823730469,0.019463062286376953,0.01911187171936035,0.01933598518371582,0.01943826675415039,0.010653257369995117,0.04733133316040039,0.01576972007751465,0.15142226219177246,0.14922332763671875,0.07062625885009766,0.4834458827972412,0.21218538284301758 diff --git a/results/combined/merges_timed/dankurka/mgwt.csv b/results/combined/merges_timed/dankurka/mgwt.csv index 866c95bb6c..52f5af4ef8 100644 --- a/results/combined/merges_timed/dankurka/mgwt.csv +++ b/results/combined/merges_timed/dankurka/mgwt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,74856a7a070dde80f5ef866eb6de0ec77d4c6baf,49d43a7d9cb9aff1d7409edc47a858653f1773f9,39d049502be0f9b1ecc7dc572b93c5e112d75f08,,True,True,3e8368c81eaa5de1031f85deaefdbb715cfca6abc82d04133f9ee629a9a9cbca,Tests_passed,885e081f41745970e619b1b47a3fc5b497a8d2fbb9bfc43bde26c26c5be6d7ce,Tests_passed,True,True,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,0.014330387115478516,0.013762712478637695,0.01601099967956543,0.016266822814941406,0.015629291534423828,0.016180753707885742,0.015463829040527344,0.045032501220703125,0.01450204849243164,0.1694188117980957,0.1692333221435547,0.06991934776306152,0.6943345069885254,0.29424357414245605 +8,refs/heads/master,74856a7a070dde80f5ef866eb6de0ec77d4c6baf,49d43a7d9cb9aff1d7409edc47a858653f1773f9,39d049502be0f9b1ecc7dc572b93c5e112d75f08,,True,True,3e8368c81eaa5de1031f85deaefdbb715cfca6abc82d04133f9ee629a9a9cbca,Tests_passed,885e081f41745970e619b1b47a3fc5b497a8d2fbb9bfc43bde26c26c5be6d7ce,Tests_passed,True,True,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,0.014330387115478516,0.013762712478637695,0.01601099967956543,0.016266822814941406,0.015629291534423828,0.016180753707885742,0.015463829040527344,0.045032501220703125,0.01450204849243164,0.16643381118774414,0.16698646545410156,0.06991934776306152,0.6943345069885254,0.29424357414245605 diff --git a/results/combined/merges_timed/darcy-framework/darcy-ui.csv b/results/combined/merges_timed/darcy-framework/darcy-ui.csv index d37dab3b62..e5259b13ba 100644 --- a/results/combined/merges_timed/darcy-framework/darcy-ui.csv +++ b/results/combined/merges_timed/darcy-framework/darcy-ui.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -29,refs/heads/master,5e1d93a56c5c0ba82cfa8adcd706b1fc0214493a,3c9c0fdf31a278bbd8c65071ef901aaa731c0bc9,9ee241447d187a0dc5bfd5d05c9c89fdd196205d,,True,True,12eedf2cdaa4653d0c84a03ff15518a526bb15fc690d073248b54b19fd5d689d,Tests_passed,97486b57bf593bf5c7c5c2c12f1dae25eb306ee1219502ccf54bc0f376457cbb,Tests_passed,True,True,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,e27624f563db2e54d24551340a2db12bf9b4d3dcf92eb97623dc424aef108358,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,a26abd4f0a29873d8e8a7e08c73d329ed2ffe5b5f87f8009b91003b30e5ddeb5,Merge_failed,a26abd4f0a29873d8e8a7e08c73d329ed2ffe5b5f87f8009b91003b30e5ddeb5,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,2ce79117ac6e5d7412efe54c83d6833c58751a338b09891d839ae67f678e0ca3,0.010597467422485352,0.032956600189208984,0.051917314529418945,0.034049272537231445,0.03530168533325195,0.035765886306762695,0.03473067283630371,0.12940573692321777,0.016244173049926758,0.06721758842468262,0.06743121147155762,0.11754155158996582,0.6139423847198486,0.20540618896484375 +29,refs/heads/master,5e1d93a56c5c0ba82cfa8adcd706b1fc0214493a,3c9c0fdf31a278bbd8c65071ef901aaa731c0bc9,9ee241447d187a0dc5bfd5d05c9c89fdd196205d,,True,True,12eedf2cdaa4653d0c84a03ff15518a526bb15fc690d073248b54b19fd5d689d,Tests_passed,97486b57bf593bf5c7c5c2c12f1dae25eb306ee1219502ccf54bc0f376457cbb,Tests_passed,True,True,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,e27624f563db2e54d24551340a2db12bf9b4d3dcf92eb97623dc424aef108358,Merge_failed,8c0422d413770d3d8e6550d7becd51a80863aa1763dbfe625b9395e032724bde,Merge_failed,a26abd4f0a29873d8e8a7e08c73d329ed2ffe5b5f87f8009b91003b30e5ddeb5,Merge_failed,a26abd4f0a29873d8e8a7e08c73d329ed2ffe5b5f87f8009b91003b30e5ddeb5,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,2ce79117ac6e5d7412efe54c83d6833c58751a338b09891d839ae67f678e0ca3,0.010597467422485352,0.032956600189208984,0.051917314529418945,0.034049272537231445,0.03530168533325195,0.035765886306762695,0.03473067283630371,0.12940573692321777,0.016244173049926758,0.06666183471679688,0.06597733497619629,0.11754155158996582,0.6139423847198486,0.20540618896484375 diff --git a/results/combined/merges_timed/datanucleus/datanucleus-core.csv b/results/combined/merges_timed/datanucleus/datanucleus-core.csv index 1c5456b62b..9d3a3f80c7 100644 --- a/results/combined/merges_timed/datanucleus/datanucleus-core.csv +++ b/results/combined/merges_timed/datanucleus/datanucleus-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,8bff557466f08b633c5e33856b83518ca6ab1a60,3828238f6d5647f4d38692745ee1cee610700ca7,95c9e42c5d1c33906f3b3bf8dd1218577ad2d8fe,,True,True,781c23b0f581e0170e248f4c68c6fb707713644e2e114e271a338bc81b72ec22,Tests_passed,238863cbf8b631ff4466907b2733c4402699ad2ab404f9167deb36a043e37be6,Tests_passed,True,True,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,4e23a911f1851abacebc0d881766a8a30d2551f25adb36a5ddd09cc0c8c78386,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,21b970d4e4f4bb98be5f13a225f989ae5deeebe72b76cb5c04184d9f6f652491,Merge_failed,21b970d4e4f4bb98be5f13a225f989ae5deeebe72b76cb5c04184d9f6f652491,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,8d7b6aa9ab010e23e96ea9f6c1e83398ace48c9676ba982e27eca64d16895f7f,0.05369377136230469,0.05219888687133789,0.047452688217163086,0.04802441596984863,0.05171465873718262,0.04989314079284668,0.052297353744506836,0.20630550384521484,0.08232545852661133,0.0663611888885498,0.06653547286987305,0.12472343444824219,0.8847665786743164,0.22748017311096191 +9,refs/heads/master,8bff557466f08b633c5e33856b83518ca6ab1a60,3828238f6d5647f4d38692745ee1cee610700ca7,95c9e42c5d1c33906f3b3bf8dd1218577ad2d8fe,,True,True,781c23b0f581e0170e248f4c68c6fb707713644e2e114e271a338bc81b72ec22,Tests_passed,238863cbf8b631ff4466907b2733c4402699ad2ab404f9167deb36a043e37be6,Tests_passed,True,True,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,4e23a911f1851abacebc0d881766a8a30d2551f25adb36a5ddd09cc0c8c78386,Merge_failed,1263530262b4a5c00c3194d0277173c37216c7c6869eac627b3000871f1ea933,Merge_failed,21b970d4e4f4bb98be5f13a225f989ae5deeebe72b76cb5c04184d9f6f652491,Merge_failed,21b970d4e4f4bb98be5f13a225f989ae5deeebe72b76cb5c04184d9f6f652491,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,8d7b6aa9ab010e23e96ea9f6c1e83398ace48c9676ba982e27eca64d16895f7f,0.05369377136230469,0.05219888687133789,0.047452688217163086,0.04802441596984863,0.05171465873718262,0.04989314079284668,0.052297353744506836,0.20630550384521484,0.08232545852661133,0.0663139820098877,0.06601810455322266,0.12472343444824219,0.8847665786743164,0.22748017311096191 diff --git a/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv b/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv index fc6defaab7..b74a2530c2 100644 --- a/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv +++ b/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,8b0f2651b6768a96482214f18b37ed8e7db530ef,90bc13f2a6e17c7342db60332ffbfbc57352e46f,1e531d71634ca9c6c04014e18d22be290fcaa95b,,True,True,bfa4017456838c35160dfabad2fb9e4f83ea05a13206de95c7d1a60119f7beb7,Tests_passed,3524b702f68ea620a94b34751a753bc714565ba1c5b8a6a9ac779d58e457825d,Tests_passed,True,True,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,0.04441094398498535,0.0469517707824707,0.04565143585205078,0.04806828498840332,0.0476531982421875,0.052951812744140625,0.05333232879638672,0.18529081344604492,0.05399441719055176,0.173630952835083,0.1732926368713379,0.11692953109741211,1.5724849700927734,0.23677945137023926 +14,refs/heads/master,8b0f2651b6768a96482214f18b37ed8e7db530ef,90bc13f2a6e17c7342db60332ffbfbc57352e46f,1e531d71634ca9c6c04014e18d22be290fcaa95b,,True,True,bfa4017456838c35160dfabad2fb9e4f83ea05a13206de95c7d1a60119f7beb7,Tests_passed,3524b702f68ea620a94b34751a753bc714565ba1c5b8a6a9ac779d58e457825d,Tests_passed,True,True,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,0.04441094398498535,0.0469517707824707,0.04565143585205078,0.04806828498840332,0.0476531982421875,0.052951812744140625,0.05333232879638672,0.18529081344604492,0.05399441719055176,0.16988587379455566,0.17172479629516602,0.11692953109741211,1.5724849700927734,0.23677945137023926 diff --git a/results/combined/merges_timed/datasift/datasift-java.csv b/results/combined/merges_timed/datasift/datasift-java.csv index cfab7a69c5..8fabf7ac70 100644 --- a/results/combined/merges_timed/datasift/datasift-java.csv +++ b/results/combined/merges_timed/datasift/datasift-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,8a3d7f4df80693d7f2b43942ab2a2007640d6ea9,09b4a92a47b65a10df0cc273ec6a79b38ddfa2d6,3824498688796efaa27a58166063065537107c2b,,efd79430b35c7a9994ee73ba6dc230c81987b99ae3b8f99dffc0f7effb1b9c97,Tests_passed,d68fd444e23d12793b4d82d394ab0a169c7932d4015c8e62eda59ed1cb4c28e3,Tests_passed,True,True,True,True,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,5c015ea10fe9ca6f41d8faf51337e20d80c536225a1294ea27d5c3aee9a8fb18,Tests_passed,5c015ea10fe9ca6f41d8faf51337e20d80c536225a1294ea27d5c3aee9a8fb18,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_failed,8bc5c1822ed72ae6995389c2f289c6f3fb984a7cb782fbb875ded5f01e3c645a,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,0.039620161056518555,0.0393214225769043,0.03835320472717285,0.03041243553161621,0.02881479263305664,0.02776336669921875,0.03304266929626465,0.1709909439086914,0.04349803924560547,0.15130257606506348,0.1517930030822754,0.11799907684326172,0.7182028293609619,0.23344087600708008 +2,refs/heads/master,8a3d7f4df80693d7f2b43942ab2a2007640d6ea9,09b4a92a47b65a10df0cc273ec6a79b38ddfa2d6,3824498688796efaa27a58166063065537107c2b,,efd79430b35c7a9994ee73ba6dc230c81987b99ae3b8f99dffc0f7effb1b9c97,Tests_passed,d68fd444e23d12793b4d82d394ab0a169c7932d4015c8e62eda59ed1cb4c28e3,Tests_passed,True,True,True,True,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,5c015ea10fe9ca6f41d8faf51337e20d80c536225a1294ea27d5c3aee9a8fb18,Tests_passed,5c015ea10fe9ca6f41d8faf51337e20d80c536225a1294ea27d5c3aee9a8fb18,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_failed,8bc5c1822ed72ae6995389c2f289c6f3fb984a7cb782fbb875ded5f01e3c645a,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,0.039620161056518555,0.0393214225769043,0.03835320472717285,0.03041243553161621,0.02881479263305664,0.02776336669921875,0.03304266929626465,0.1709909439086914,0.04349803924560547,0.14911365509033203,0.1495356559753418,0.11799907684326172,0.7182028293609619,0.23344087600708008 diff --git a/results/combined/merges_timed/datastax/java-driver.csv b/results/combined/merges_timed/datastax/java-driver.csv index 846a8357c0..5f95dfee9f 100644 --- a/results/combined/merges_timed/datastax/java-driver.csv +++ b/results/combined/merges_timed/datastax/java-driver.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -538,refs/remotes/origin/2.1,0dd96ea21f85de3a8323926450891971cb36d2e1,1f25c7e3a0bf10b65765b3b23bdcf9a5de30888a,9a4a207038a7ccf60bd70cc3bc71d517337f40f3,,56bb658eeb56b947489fa5d22d290404c17059832dd967db3a913bd832f3f8f2,Tests_passed,7772c3712b94da9d5b66f85b99bf764206c4ed6576210ee3887fc1422068ad74,Tests_passed,True,True,True,True,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,8bdaf004a7fc7beb7638b4639f6f51f9a14af35306495dbd9bfbbd3b10621598,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,69bfc7f73f60307e5cb5c630809cbf2a2f1bfa13e8e54302fbcb1bbc58615c89,Merge_failed,69bfc7f73f60307e5cb5c630809cbf2a2f1bfa13e8e54302fbcb1bbc58615c89,Merge_failed,cd0b00262df0f80d9d0d7296cec168c297d291d59f734ee856305bea5ecbb3b8,Tests_passed,ac7755f46c04b17f31c30fbd7f51ef5f560d6c64739080b3c05202dc1be25890,Merge_failed,dfb9528b359575359a3d1be571bfd04a9a26db5d444d66d5fcf0d89037dd0a75,0.02502918243408203,0.02506279945373535,0.02640676498413086,0.02759718894958496,0.02792525291442871,0.020661115646362305,0.02782750129699707,0.07098126411437988,0.0455012321472168,0.10286760330200195,0.10396909713745117,0.08426976203918457,1.2053499221801758,0.32507801055908203 +538,refs/remotes/origin/2.1,0dd96ea21f85de3a8323926450891971cb36d2e1,1f25c7e3a0bf10b65765b3b23bdcf9a5de30888a,9a4a207038a7ccf60bd70cc3bc71d517337f40f3,,56bb658eeb56b947489fa5d22d290404c17059832dd967db3a913bd832f3f8f2,Tests_passed,7772c3712b94da9d5b66f85b99bf764206c4ed6576210ee3887fc1422068ad74,Tests_passed,True,True,True,True,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,8bdaf004a7fc7beb7638b4639f6f51f9a14af35306495dbd9bfbbd3b10621598,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,69bfc7f73f60307e5cb5c630809cbf2a2f1bfa13e8e54302fbcb1bbc58615c89,Merge_failed,69bfc7f73f60307e5cb5c630809cbf2a2f1bfa13e8e54302fbcb1bbc58615c89,Merge_failed,cd0b00262df0f80d9d0d7296cec168c297d291d59f734ee856305bea5ecbb3b8,Tests_passed,ac7755f46c04b17f31c30fbd7f51ef5f560d6c64739080b3c05202dc1be25890,Merge_failed,dfb9528b359575359a3d1be571bfd04a9a26db5d444d66d5fcf0d89037dd0a75,0.02502918243408203,0.02506279945373535,0.02640676498413086,0.02759718894958496,0.02792525291442871,0.020661115646362305,0.02782750129699707,0.07098126411437988,0.0455012321472168,0.09516119956970215,0.09373903274536133,0.08426976203918457,1.2053499221801758,0.32507801055908203 diff --git a/results/combined/merges_timed/datumbox/datumbox-framework.csv b/results/combined/merges_timed/datumbox/datumbox-framework.csv index 837a50a5d6..f8cd563768 100644 --- a/results/combined/merges_timed/datumbox/datumbox-framework.csv +++ b/results/combined/merges_timed/datumbox/datumbox-framework.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/develop,5e74399e9e7d77bd82dc672ac73d17ac124f2eef,1f17e05fc3a9ae66322a9f33d34f40e2fc0de7ff,173ec6e155639b676c0ab57b22e17e5696039899,,True,True,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,cb67313a5f1acd7c804d0d6b530db5601ceeb99f67ce9350af8a88bd6ad9a5b3,Tests_passed,True,True,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,0.0392603874206543,0.03528738021850586,0.06343817710876465,0.024880647659301758,0.04829668998718262,0.04682803153991699,0.06702804565429688,0.2009410858154297,0.055022239685058594,0.16769051551818848,0.16835474967956543,0.13255691528320312,0.6172270774841309,0.3785281181335449 +1,refs/heads/develop,5e74399e9e7d77bd82dc672ac73d17ac124f2eef,1f17e05fc3a9ae66322a9f33d34f40e2fc0de7ff,173ec6e155639b676c0ab57b22e17e5696039899,,True,True,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,cb67313a5f1acd7c804d0d6b530db5601ceeb99f67ce9350af8a88bd6ad9a5b3,Tests_passed,True,True,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,0.0392603874206543,0.03528738021850586,0.06343817710876465,0.024880647659301758,0.04829668998718262,0.04682803153991699,0.06702804565429688,0.2009410858154297,0.055022239685058594,0.1676042079925537,0.16831588745117188,0.13255691528320312,0.6172270774841309,0.3785281181335449 diff --git a/results/combined/merges_timed/davidb/scala-maven-plugin.csv b/results/combined/merges_timed/davidb/scala-maven-plugin.csv index 007e36e526..80e02421cd 100644 --- a/results/combined/merges_timed/davidb/scala-maven-plugin.csv +++ b/results/combined/merges_timed/davidb/scala-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -117,refs/remotes/origin/pull/322,c74fda72e2ad911abeef339d9503dbff1b4926e2,4c96c81343ff125d9d49ab19285a63dc2518a032,2c9ef6494c144cd7b23ce44fa64ef84fcb6f02fe,,True,True,250b5c4ca9c1651c23dd24f33423a2c65ccd3fc6be8cf6122f2194ab7bdcf7ba,Tests_passed,fc805a2095666ac7e4c49269e7d023d59111cc91b86643412ac81606dea2bb63,Tests_passed,True,True,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,fbb71acf8904bfc3281edc293ee6737529715cc45d783abcc5a9456215fca24a,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3e01703c313dd75cea14c6ef040a204bb3987f6782db6d33c230770eed315c30,Merge_failed,3e01703c313dd75cea14c6ef040a204bb3987f6782db6d33c230770eed315c30,Merge_failed,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Merge_failed,1015ff02dd286c255d71870551930d8a60f210147ef30bcc2d41d1b7b9291629,0.044088125228881836,0.051320552825927734,0.01881694793701172,0.04593205451965332,0.033965349197387695,0.037827491760253906,0.04458427429199219,0.20367765426635742,0.06005120277404785,0.2225351333618164,0.22163891792297363,0.13909053802490234,1.531367540359497,0.2310643196105957 +117,refs/remotes/origin/pull/322,c74fda72e2ad911abeef339d9503dbff1b4926e2,4c96c81343ff125d9d49ab19285a63dc2518a032,2c9ef6494c144cd7b23ce44fa64ef84fcb6f02fe,,True,True,250b5c4ca9c1651c23dd24f33423a2c65ccd3fc6be8cf6122f2194ab7bdcf7ba,Tests_passed,fc805a2095666ac7e4c49269e7d023d59111cc91b86643412ac81606dea2bb63,Tests_passed,True,True,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,fbb71acf8904bfc3281edc293ee6737529715cc45d783abcc5a9456215fca24a,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3e01703c313dd75cea14c6ef040a204bb3987f6782db6d33c230770eed315c30,Merge_failed,3e01703c313dd75cea14c6ef040a204bb3987f6782db6d33c230770eed315c30,Merge_failed,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Merge_failed,1015ff02dd286c255d71870551930d8a60f210147ef30bcc2d41d1b7b9291629,0.044088125228881836,0.051320552825927734,0.01881694793701172,0.04593205451965332,0.033965349197387695,0.037827491760253906,0.04458427429199219,0.20367765426635742,0.06005120277404785,0.2203691005706787,0.21993279457092285,0.13909053802490234,1.531367540359497,0.2310643196105957 diff --git a/results/combined/merges_timed/davidmoten/geo.csv b/results/combined/merges_timed/davidmoten/geo.csv index 6da116bd7a..f49f596396 100644 --- a/results/combined/merges_timed/davidmoten/geo.csv +++ b/results/combined/merges_timed/davidmoten/geo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,7427c57b931e1c9548227a7a0ea10dbead15edef,faab400a3cdc78dc7f9ef221d79129043c414baa,54f7ed3a72afe1ab1626269655ad64d824d7a5e2,,cc78c9a90f15cc1af397195afbcf2b287a34dc4f4e134f09c31fb54756d78c6a,Tests_passed,db69dc60d0c8900ab08d3cb70719f8e82fb9b22d2f9e46c62d1ccef4cceb15a7,Tests_passed,True,True,True,True,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,b0b64715e41c9a72598909d9694fcaabd689b0f571004c4cc8d8e2a97494e3cb,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Tests_passed,0f6dfb5db8c8fd4a963d88dcf6596529b0e4b39b7c9a22087e2e3cc76a892ab2,Tests_passed,0f6dfb5db8c8fd4a963d88dcf6596529b0e4b39b7c9a22087e2e3cc76a892ab2,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Merge_failed,86f9c454725650f60d52d44c9cea7d0c5f31586c4938d239f7effc2077c9f34b,0.04286456108093262,0.042931318283081055,0.04335212707519531,0.032811880111694336,0.04061532020568848,0.0407261848449707,0.03599238395690918,0.21411800384521484,0.0635836124420166,0.30490851402282715,0.3043644428253174,0.1702103614807129,1.520573377609253,0.18219304084777832 +18,refs/heads/master,7427c57b931e1c9548227a7a0ea10dbead15edef,faab400a3cdc78dc7f9ef221d79129043c414baa,54f7ed3a72afe1ab1626269655ad64d824d7a5e2,,cc78c9a90f15cc1af397195afbcf2b287a34dc4f4e134f09c31fb54756d78c6a,Tests_passed,db69dc60d0c8900ab08d3cb70719f8e82fb9b22d2f9e46c62d1ccef4cceb15a7,Tests_passed,True,True,True,True,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Merge_failed,b0b64715e41c9a72598909d9694fcaabd689b0f571004c4cc8d8e2a97494e3cb,Merge_failed,fec2de64afc6194c8c5beed5d17c412d2fbcaa53fa28957211bb9286a6cacbe3,Tests_passed,0f6dfb5db8c8fd4a963d88dcf6596529b0e4b39b7c9a22087e2e3cc76a892ab2,Tests_passed,0f6dfb5db8c8fd4a963d88dcf6596529b0e4b39b7c9a22087e2e3cc76a892ab2,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Merge_failed,86f9c454725650f60d52d44c9cea7d0c5f31586c4938d239f7effc2077c9f34b,0.04286456108093262,0.042931318283081055,0.04335212707519531,0.032811880111694336,0.04061532020568848,0.0407261848449707,0.03599238395690918,0.21411800384521484,0.0635836124420166,0.3000774383544922,0.3009171485900879,0.1702103614807129,1.520573377609253,0.18219304084777832 diff --git a/results/combined/merges_timed/davidmoten/rtree.csv b/results/combined/merges_timed/davidmoten/rtree.csv index af02a87659..6308773337 100644 --- a/results/combined/merges_timed/davidmoten/rtree.csv +++ b/results/combined/merges_timed/davidmoten/rtree.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,dd478c4ea8eeeede9848bc596dda5454a648541d,5671a0f6b7ac05c2b09f66facb7068ee40ef2113,ef97ceedf041d60b1cd421c8d16cec707b120960,,True,True,7eda454d833a50fd276efca4f4f90170d87db6c427c9b75db01e5ae7bf1620bc,Tests_passed,3e286b168432f16fa4ea261527e79de4300088f4807386b4e493b15b239438a0,Tests_passed,True,True,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,f06a0f71977cca65741851eb47aaaa420bd091f0eaaf203e71d8863b85bebc31,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,a859373e99eae1afc309fe3f683d415cfc28de3384fb825ea36d44ca6557996d,Merge_failed,a859373e99eae1afc309fe3f683d415cfc28de3384fb825ea36d44ca6557996d,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,a40378ca43e93179c6cee0544ef5d1962a8090e846fbfb45921bd2dc5d3ad217,Merge_failed,b3e39f6ccc2a4b2eb6b6a790c66ca9464bc0950381ef178e6099119b1d0e3bc9,0.013810157775878906,0.014359474182128906,0.014834880828857422,0.014894485473632812,0.015056610107421875,0.014359712600708008,0.014902591705322266,0.05412650108337402,0.022106409072875977,0.06842470169067383,0.06884479522705078,0.12867259979248047,0.9283463954925537,0.18787002563476562 +4,refs/heads/master,dd478c4ea8eeeede9848bc596dda5454a648541d,5671a0f6b7ac05c2b09f66facb7068ee40ef2113,ef97ceedf041d60b1cd421c8d16cec707b120960,,True,True,7eda454d833a50fd276efca4f4f90170d87db6c427c9b75db01e5ae7bf1620bc,Tests_passed,3e286b168432f16fa4ea261527e79de4300088f4807386b4e493b15b239438a0,Tests_passed,True,True,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,f06a0f71977cca65741851eb47aaaa420bd091f0eaaf203e71d8863b85bebc31,Merge_failed,0eae8a9ab6ee8d273f0a02175ba339c0b8232dcfae850c818539b91ac5d6c4fd,Merge_failed,a859373e99eae1afc309fe3f683d415cfc28de3384fb825ea36d44ca6557996d,Merge_failed,a859373e99eae1afc309fe3f683d415cfc28de3384fb825ea36d44ca6557996d,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,a40378ca43e93179c6cee0544ef5d1962a8090e846fbfb45921bd2dc5d3ad217,Merge_failed,b3e39f6ccc2a4b2eb6b6a790c66ca9464bc0950381ef178e6099119b1d0e3bc9,0.013810157775878906,0.014359474182128906,0.014834880828857422,0.014894485473632812,0.015056610107421875,0.014359712600708008,0.014902591705322266,0.05412650108337402,0.022106409072875977,0.06899261474609375,0.06892871856689453,0.12867259979248047,0.9283463954925537,0.18787002563476562 diff --git a/results/combined/merges_timed/davidmoten/rxjava-extras.csv b/results/combined/merges_timed/davidmoten/rxjava-extras.csv index 28fb7c9fd8..01c54aaa52 100644 --- a/results/combined/merges_timed/davidmoten/rxjava-extras.csv +++ b/results/combined/merges_timed/davidmoten/rxjava-extras.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -44,refs/heads/master,f26ebf28972a5e850b038932360c89bd703d5a63,30a492f6aa66bfbe6dbf5f37a1fd20a575a49d46,ede7921057b88302676cb975e159b6240079b81a,,True,True,f4c07085564a583cb7c3985b3b73bae3b6b4e6640e0e9edcebd133a546a8cee4,Tests_passed,fc004f335bf0a19fb93780b64f594b07cafe5454d681267cff5cb1e4d5284342,Tests_passed,True,True,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,0.03865456581115723,0.03053450584411621,0.022022008895874023,0.04082775115966797,0.028805971145629883,0.040602922439575195,0.03810000419616699,0.16277170181274414,0.03561878204345703,0.14257431030273438,0.14287662506103516,0.10243558883666992,0.5040750503540039,0.20807433128356934 +44,refs/heads/master,f26ebf28972a5e850b038932360c89bd703d5a63,30a492f6aa66bfbe6dbf5f37a1fd20a575a49d46,ede7921057b88302676cb975e159b6240079b81a,,True,True,f4c07085564a583cb7c3985b3b73bae3b6b4e6640e0e9edcebd133a546a8cee4,Tests_passed,fc004f335bf0a19fb93780b64f594b07cafe5454d681267cff5cb1e4d5284342,Tests_passed,True,True,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,0.03865456581115723,0.03053450584411621,0.022022008895874023,0.04082775115966797,0.028805971145629883,0.040602922439575195,0.03810000419616699,0.16277170181274414,0.03561878204345703,0.14259648323059082,0.14328765869140625,0.10243558883666992,0.5040750503540039,0.20807433128356934 diff --git a/results/combined/merges_timed/davidmoten/rxjava-file.csv b/results/combined/merges_timed/davidmoten/rxjava-file.csv index 2cf1ff54c9..43b1d738eb 100644 --- a/results/combined/merges_timed/davidmoten/rxjava-file.csv +++ b/results/combined/merges_timed/davidmoten/rxjava-file.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,c7c2b3aa06bf4f2d022360aa6a0270798ea3590a,dda511e5d55e736906986d7fc3041896b04de9f1,d40c31053d8f9bec3b3d62465884559649ec1dd3,,True,True,0318cbf469e559fb1528941c75de16ced0613ce7a205e71aa16ea9a0686e4304,Tests_passed,96452bd1137dada929286aedefb343a7d23babb3ef6e7c1850478aff8c67472d,Tests_passed,True,True,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,229d330da1d567006a68610ab0f717f4e7ef547c057b301c9bacf7d40f98e9ef,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,f550e2e2c76a16e9b5236c6c42e3f9172d6561732485eb0fa6310cb439fe1322,Merge_failed,f550e2e2c76a16e9b5236c6c42e3f9172d6561732485eb0fa6310cb439fe1322,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,a2bc0a570772e66814134889d1383ecc64eefb8af97b697139ad0ee7004a5e53,0.043610572814941406,0.04028034210205078,0.0408937931060791,0.03769969940185547,0.04272270202636719,0.009502649307250977,0.04327869415283203,0.29689812660217285,0.08021664619445801,0.13194894790649414,0.13195276260375977,0.23575735092163086,1.725569725036621,0.20857477188110352 +5,refs/heads/master,c7c2b3aa06bf4f2d022360aa6a0270798ea3590a,dda511e5d55e736906986d7fc3041896b04de9f1,d40c31053d8f9bec3b3d62465884559649ec1dd3,,True,True,0318cbf469e559fb1528941c75de16ced0613ce7a205e71aa16ea9a0686e4304,Tests_passed,96452bd1137dada929286aedefb343a7d23babb3ef6e7c1850478aff8c67472d,Tests_passed,True,True,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,229d330da1d567006a68610ab0f717f4e7ef547c057b301c9bacf7d40f98e9ef,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,f550e2e2c76a16e9b5236c6c42e3f9172d6561732485eb0fa6310cb439fe1322,Merge_failed,f550e2e2c76a16e9b5236c6c42e3f9172d6561732485eb0fa6310cb439fe1322,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,a2bc0a570772e66814134889d1383ecc64eefb8af97b697139ad0ee7004a5e53,0.043610572814941406,0.04028034210205078,0.0408937931060791,0.03769969940185547,0.04272270202636719,0.009502649307250977,0.04327869415283203,0.29689812660217285,0.08021664619445801,0.13204312324523926,0.1324605941772461,0.23575735092163086,1.725569725036621,0.20857477188110352 diff --git a/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv b/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv index 4c617dc38b..00ccd2909a 100644 --- a/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv +++ b/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -36,refs/heads/master,d14cea6ff1fd8032ddd006f555ae2f599bc85015,2a14e99e2eb35aec8476030458a4952b48260de2,9a3f632e59b95ee08fa175127269cdaad5e09fd7,,True,True,230362b3fe1e8a8c8e2edab7824b2d519e4ec12c2faa1c2f3cefd9c13555306c,Tests_passed,179efcd744e1ad3859053044fb2cbc29691d5e9f5ce0080c4265e54ca3b9307f,Tests_passed,True,True,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,0.05400848388671875,0.04473471641540527,0.04491877555847168,0.044469356536865234,0.05138516426086426,0.05712604522705078,0.0476224422454834,0.16247272491455078,0.048783302307128906,0.1760692596435547,0.17609930038452148,0.10708856582641602,1.1559185981750488,0.21829628944396973 +36,refs/heads/master,d14cea6ff1fd8032ddd006f555ae2f599bc85015,2a14e99e2eb35aec8476030458a4952b48260de2,9a3f632e59b95ee08fa175127269cdaad5e09fd7,,True,True,230362b3fe1e8a8c8e2edab7824b2d519e4ec12c2faa1c2f3cefd9c13555306c,Tests_passed,179efcd744e1ad3859053044fb2cbc29691d5e9f5ce0080c4265e54ca3b9307f,Tests_passed,True,True,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,0.05400848388671875,0.04473471641540527,0.04491877555847168,0.044469356536865234,0.05138516426086426,0.05712604522705078,0.0476224422454834,0.16247272491455078,0.048783302307128906,0.16489577293395996,0.16287612915039062,0.10708856582641602,1.1559185981750488,0.21829628944396973 diff --git a/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv b/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv index f3c8426a74..da192c5ed3 100644 --- a/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv +++ b/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,fbe2fde40ff49bfd3c7454e4e9a21c33f1929f5f,a5182bc62d261c1cb8ec42d0260602248151876e,e0e2a3a97fbb66f524ff624a52ea40629de09bb4,,True,True,9ed5426a2f180bf448bba74a95e7d90a7d5276710f0f6c79e7f5a59ede9a5953,Tests_passed,5f3b4e55baceaf572ffeed201f7d4830bdd03d13dccf990b0024bfb9ed1b3bd4,Tests_passed,True,True,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,75cc1da22ddc1c8c8ed8d1c757228164a49fe82d1fa9bd9df19d8ce9e04c5fa1,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,75cc1da22ddc1c8c8ed8d1c757228164a49fe82d1fa9bd9df19d8ce9e04c5fa1,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,ef684bd36a5ac9b2f1d34819f1f1d49aec0110b2fcef94bebdc203ec386bf93b,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f4de4eeb241e73ee7ee89ef5c60f3202672dc7cdfbb7092db1ab39d688d20bd9,Merge_failed,f4de4eeb241e73ee7ee89ef5c60f3202672dc7cdfbb7092db1ab39d688d20bd9,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Merge_failed,f355c0c57c474851e5cae8eadde1bb5dbba2609d94b71b75cebbadf7c3ff25ab,0.03907155990600586,0.04024505615234375,0.04071235656738281,0.03821420669555664,0.040732383728027344,0.03822803497314453,0.039261579513549805,0.16308999061584473,0.061284780502319336,0.22179651260375977,0.19147562980651855,0.10891222953796387,0.668973445892334,0.1864008903503418 +1,refs/heads/master,fbe2fde40ff49bfd3c7454e4e9a21c33f1929f5f,a5182bc62d261c1cb8ec42d0260602248151876e,e0e2a3a97fbb66f524ff624a52ea40629de09bb4,,True,True,9ed5426a2f180bf448bba74a95e7d90a7d5276710f0f6c79e7f5a59ede9a5953,Tests_passed,5f3b4e55baceaf572ffeed201f7d4830bdd03d13dccf990b0024bfb9ed1b3bd4,Tests_passed,True,True,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,75cc1da22ddc1c8c8ed8d1c757228164a49fe82d1fa9bd9df19d8ce9e04c5fa1,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,75cc1da22ddc1c8c8ed8d1c757228164a49fe82d1fa9bd9df19d8ce9e04c5fa1,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,ef684bd36a5ac9b2f1d34819f1f1d49aec0110b2fcef94bebdc203ec386bf93b,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f4de4eeb241e73ee7ee89ef5c60f3202672dc7cdfbb7092db1ab39d688d20bd9,Merge_failed,f4de4eeb241e73ee7ee89ef5c60f3202672dc7cdfbb7092db1ab39d688d20bd9,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Merge_failed,f355c0c57c474851e5cae8eadde1bb5dbba2609d94b71b75cebbadf7c3ff25ab,0.03907155990600586,0.04024505615234375,0.04071235656738281,0.03821420669555664,0.040732383728027344,0.03822803497314453,0.039261579513549805,0.16308999061584473,0.061284780502319336,0.19178032875061035,0.19968533515930176,0.10891222953796387,0.668973445892334,0.1864008903503418 diff --git a/results/combined/merges_timed/dbaeli/conf4j.csv b/results/combined/merges_timed/dbaeli/conf4j.csv index 7fb748377a..23fc161921 100644 --- a/results/combined/merges_timed/dbaeli/conf4j.csv +++ b/results/combined/merges_timed/dbaeli/conf4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,aa63090d1c2b404d752cbc1369184db7766ae53f,a720763413c0f438b8ce65dcbb19cc4ca0e2b057,c4880a9bbc645b96354db770fe69c7c6c891a96f,,292d070cf4a8dfa4c851b6228b97178f47454eef92b57f42994f4bdf7af283ac,Tests_passed,517245c84132729ae6157e74769ba0d570782d45706e2e85978bf253e918f84e,Tests_passed,True,True,True,True,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,0.05125594139099121,0.05033230781555176,0.04727458953857422,0.05077171325683594,0.04987144470214844,0.044879913330078125,0.04539823532104492,0.23071599006652832,0.04277157783508301,0.1486501693725586,0.14938831329345703,0.16560149192810059,0.4476356506347656,0.18924236297607422 +3,refs/heads/master,aa63090d1c2b404d752cbc1369184db7766ae53f,a720763413c0f438b8ce65dcbb19cc4ca0e2b057,c4880a9bbc645b96354db770fe69c7c6c891a96f,,292d070cf4a8dfa4c851b6228b97178f47454eef92b57f42994f4bdf7af283ac,Tests_passed,517245c84132729ae6157e74769ba0d570782d45706e2e85978bf253e918f84e,Tests_passed,True,True,True,True,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,0.05125594139099121,0.05033230781555176,0.04727458953857422,0.05077171325683594,0.04987144470214844,0.044879913330078125,0.04539823532104492,0.23071599006652832,0.04277157783508301,0.14281868934631348,0.14193367958068848,0.16560149192810059,0.4476356506347656,0.18924236297607422 diff --git a/results/combined/merges_timed/dbaeli/ez18n.csv b/results/combined/merges_timed/dbaeli/ez18n.csv index 284805d6f9..8dfc4999d5 100644 --- a/results/combined/merges_timed/dbaeli/ez18n.csv +++ b/results/combined/merges_timed/dbaeli/ez18n.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,acee2a6039d3810a8424f77fb7b72017b31bd92d,b7cadc87f3b62d0e6ebf49608417a50f8666da7b,5c913b3a4e8dfeb9b9c1d268fc5684f327ffcfad,,True,True,21c6ab0738fd31764a062cc042512ab56e788e185d49b740351ce545bdda8876,Tests_passed,b841f396d1a9c547184733966766702278a7563ac24838816532764ef68abfba,Tests_passed,True,True,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,0.05963587760925293,0.059424400329589844,0.06212806701660156,0.061106204986572266,0.06174588203430176,0.06126809120178223,0.061420440673828125,0.13104963302612305,0.058968305587768555,0.21478772163391113,0.2168889045715332,0.11665463447570801,0.8256447315216064,0.29403018951416016 +18,refs/heads/master,acee2a6039d3810a8424f77fb7b72017b31bd92d,b7cadc87f3b62d0e6ebf49608417a50f8666da7b,5c913b3a4e8dfeb9b9c1d268fc5684f327ffcfad,,True,True,21c6ab0738fd31764a062cc042512ab56e788e185d49b740351ce545bdda8876,Tests_passed,b841f396d1a9c547184733966766702278a7563ac24838816532764ef68abfba,Tests_passed,True,True,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,0.05963587760925293,0.059424400329589844,0.06212806701660156,0.061106204986572266,0.06174588203430176,0.06126809120178223,0.061420440673828125,0.13104963302612305,0.058968305587768555,0.20987510681152344,0.2097926139831543,0.11665463447570801,0.8256447315216064,0.29403018951416016 diff --git a/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv b/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv index 68be8f7bd0..95f717605e 100644 --- a/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv +++ b/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -39,refs/heads/master,8383277430b4034662ab125edca8e76621b1e240,ebd0ac2c904e88dcff5e9440560846476b70eac6,518711af7d86fedfe00ccea08f9e9a2d53e72ae4,,True,True,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,a4bee8680284c7a209ebaf204490cf121bda5091554e5c9bb309dbef8cb55a2a,Tests_passed,True,True,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,ca04ce9ab90ee7db56e6c55a0ad478bc6e7840221d0c99cfa8bd74fccbd3de93,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,0.010861873626708984,0.011110305786132812,0.012339353561401367,0.011634588241577148,0.012198448181152344,0.012130498886108398,0.012181758880615234,0.03583192825317383,0.010710716247558594,0.2282576560974121,0.22813177108764648,0.06681966781616211,1.892404317855835,0.1686415672302246 +39,refs/heads/master,8383277430b4034662ab125edca8e76621b1e240,ebd0ac2c904e88dcff5e9440560846476b70eac6,518711af7d86fedfe00ccea08f9e9a2d53e72ae4,,True,True,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,a4bee8680284c7a209ebaf204490cf121bda5091554e5c9bb309dbef8cb55a2a,Tests_passed,True,True,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,ca04ce9ab90ee7db56e6c55a0ad478bc6e7840221d0c99cfa8bd74fccbd3de93,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,0.010861873626708984,0.011110305786132812,0.012339353561401367,0.011634588241577148,0.012198448181152344,0.012130498886108398,0.012181758880615234,0.03583192825317383,0.010710716247558594,0.22736382484436035,0.22599315643310547,0.06681966781616211,1.892404317855835,0.1686415672302246 diff --git a/results/combined/merges_timed/dblock/oshi.csv b/results/combined/merges_timed/dblock/oshi.csv index 2789988e70..1355186245 100644 --- a/results/combined/merges_timed/dblock/oshi.csv +++ b/results/combined/merges_timed/dblock/oshi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -34,refs/heads/master,7de1f90a6aa5317e87e60c690c16565eda7d3b09,7d0e1a4d9d90b3ebb916e69a71dbe767423ba4a9,74d7f29da9cc3b2da6cf73f746e2c2a282905f12,,True,True,5a7132f58b18c6f1bb6593edb7e4d75bd647c0c121341e88d3c01b88e094031f,Tests_passed,7b058140dca0f282834f7053414c14e4eb116312b0d61c2c3e4f3addf1d93366,Tests_passed,True,True,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,8470efe749ec52d6a99c7e0915f400fa14ac01c746c4db85355b2dd15ceca8f5,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,de9f3c1a5f79a70361532cc468c4700efcfa5162e4a5ed4d085f523f6ea62549,Merge_failed,de9f3c1a5f79a70361532cc468c4700efcfa5162e4a5ed4d085f523f6ea62549,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Merge_failed,b32a698b21f8ba29cac966d1bd1ad3b78755381fe29e1556f0244b28972f16c9,0.047088623046875,0.04172015190124512,0.04158306121826172,0.05089163780212402,0.050446271896362305,0.05903506278991699,0.05275845527648926,0.39342737197875977,0.10434579849243164,0.536461353302002,0.5306761264801025,0.31026434898376465,2.633826732635498,0.3161354064941406 +34,refs/heads/master,7de1f90a6aa5317e87e60c690c16565eda7d3b09,7d0e1a4d9d90b3ebb916e69a71dbe767423ba4a9,74d7f29da9cc3b2da6cf73f746e2c2a282905f12,,True,True,5a7132f58b18c6f1bb6593edb7e4d75bd647c0c121341e88d3c01b88e094031f,Tests_passed,7b058140dca0f282834f7053414c14e4eb116312b0d61c2c3e4f3addf1d93366,Tests_passed,True,True,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,8470efe749ec52d6a99c7e0915f400fa14ac01c746c4db85355b2dd15ceca8f5,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,de9f3c1a5f79a70361532cc468c4700efcfa5162e4a5ed4d085f523f6ea62549,Merge_failed,de9f3c1a5f79a70361532cc468c4700efcfa5162e4a5ed4d085f523f6ea62549,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Merge_failed,b32a698b21f8ba29cac966d1bd1ad3b78755381fe29e1556f0244b28972f16c9,0.047088623046875,0.04172015190124512,0.04158306121826172,0.05089163780212402,0.050446271896362305,0.05903506278991699,0.05275845527648926,0.39342737197875977,0.10434579849243164,0.5181889533996582,0.516930103302002,0.31026434898376465,2.633826732635498,0.3161354064941406 diff --git a/results/combined/merges_timed/dcm4che/dcm4che.csv b/results/combined/merges_timed/dcm4che/dcm4che.csv index 7e4da8eac3..48a68428b7 100644 --- a/results/combined/merges_timed/dcm4che/dcm4che.csv +++ b/results/combined/merges_timed/dcm4che/dcm4che.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -57,refs/heads/master,af57bb9f016f2b44ecbb7650d26ad18591158627,887dc0240c2406c7f0f70f34851011067989e02a,4c9b37d5dc57cd421dcaee476b58a2360886d7c3,,True,True,e4b63575d285f78e3b5cc7fbdc4923dede25fe523732225c66f1ad2dbb8e6837,Tests_passed,ba35885f07f3bf5d7f98fadd2cf624fe47bfba3aa2b308a10120bf55ca920d9e,Tests_passed,True,True,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,2d173248d02c876ec1b0548d4ad9f0728ee38d11cfacc7a7523a0540eb958972,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,2d173248d02c876ec1b0548d4ad9f0728ee38d11cfacc7a7523a0540eb958972,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,afbb70cae207599c0e54b87b84b15963b4871261047cc95d120c53cdb4337f3f,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,5828a4f3d604b619788b8b9e48763cb9647087e5e997a5ef74be5c36532909c4,Merge_failed,5828a4f3d604b619788b8b9e48763cb9647087e5e997a5ef74be5c36532909c4,Merge_failed,964a1a88961be83c8f50e4c89c71f37102af0df35b95d4a995dfbcea07f2384c,Tests_passed,5d53a658e5d82993c3a9c25d695193a2c1f7bd4d434ee4f94158d7175f04b9c5,Merge_failed,45e6c58e3714fcd79ecb0f67ddea1d7222bed4d3ecea2842734d93bec648dff0,0.013808488845825195,0.0137176513671875,0.014709949493408203,0.014435529708862305,0.014685869216918945,0.014853954315185547,0.015162229537963867,0.08209490776062012,0.05724954605102539,0.08206510543823242,0.08242130279541016,0.07277774810791016,0.8650610446929932,0.32230091094970703 +57,refs/heads/master,af57bb9f016f2b44ecbb7650d26ad18591158627,887dc0240c2406c7f0f70f34851011067989e02a,4c9b37d5dc57cd421dcaee476b58a2360886d7c3,,True,True,e4b63575d285f78e3b5cc7fbdc4923dede25fe523732225c66f1ad2dbb8e6837,Tests_passed,ba35885f07f3bf5d7f98fadd2cf624fe47bfba3aa2b308a10120bf55ca920d9e,Tests_passed,True,True,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,2d173248d02c876ec1b0548d4ad9f0728ee38d11cfacc7a7523a0540eb958972,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,2d173248d02c876ec1b0548d4ad9f0728ee38d11cfacc7a7523a0540eb958972,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,afbb70cae207599c0e54b87b84b15963b4871261047cc95d120c53cdb4337f3f,Merge_failed,215a76e9dd95197c6f78fbb9396d53b3ed6d720d3d4058baf0326cdf0f8affc5,Merge_failed,5828a4f3d604b619788b8b9e48763cb9647087e5e997a5ef74be5c36532909c4,Merge_failed,5828a4f3d604b619788b8b9e48763cb9647087e5e997a5ef74be5c36532909c4,Merge_failed,964a1a88961be83c8f50e4c89c71f37102af0df35b95d4a995dfbcea07f2384c,Tests_passed,5d53a658e5d82993c3a9c25d695193a2c1f7bd4d434ee4f94158d7175f04b9c5,Merge_failed,45e6c58e3714fcd79ecb0f67ddea1d7222bed4d3ecea2842734d93bec648dff0,0.013808488845825195,0.0137176513671875,0.014709949493408203,0.014435529708862305,0.014685869216918945,0.014853954315185547,0.015162229537963867,0.08209490776062012,0.05724954605102539,0.08196854591369629,0.08184528350830078,0.07277774810791016,0.8650610446929932,0.32230091094970703 diff --git a/results/combined/merges_timed/deathmarine/luyten.csv b/results/combined/merges_timed/deathmarine/luyten.csv index 52af04f010..52fdbb1575 100644 --- a/results/combined/merges_timed/deathmarine/luyten.csv +++ b/results/combined/merges_timed/deathmarine/luyten.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/remotes/origin/pull/130,fc86bc1229c69966e56c737e4d56f8c1fdcc4fd4,6d255bec8b137886ac3be3305f775b1467fc412e,ba68ee10ef017cc92bcffdb3c7a33c64397e84bb,,True,True,d0121556342394f04dccc77d4d3bdbdabdafe867113e5a48cc9eba0ae39e129f,Tests_passed,308ec2594da2ff02fc40e524921ddecfd669215d339f40d5f715c93982396738,Tests_passed,True,True,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,f99aa30790233e62f9a2f7b0640846a01cff0f66770282c9bb36ac007334ee77,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,6e6b9c5f4cdc4072edecdec46506c96fda5e377390e785ad74806d20483a2f77,Merge_failed,6e6b9c5f4cdc4072edecdec46506c96fda5e377390e785ad74806d20483a2f77,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,806e28e79a3287ea3bb63d592aa5e00a804c3dac66594ea387c8080e474ded27,0.050156354904174805,0.04946017265319824,0.04407072067260742,0.03726649284362793,0.05259966850280762,0.03802061080932617,0.04709768295288086,0.4507267475128174,0.05830740928649902,0.5374207496643066,0.5349500179290771,0.32177090644836426,5.275756359100342,0.20791983604431152 +19,refs/remotes/origin/pull/130,fc86bc1229c69966e56c737e4d56f8c1fdcc4fd4,6d255bec8b137886ac3be3305f775b1467fc412e,ba68ee10ef017cc92bcffdb3c7a33c64397e84bb,,True,True,d0121556342394f04dccc77d4d3bdbdabdafe867113e5a48cc9eba0ae39e129f,Tests_passed,308ec2594da2ff02fc40e524921ddecfd669215d339f40d5f715c93982396738,Tests_passed,True,True,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,f99aa30790233e62f9a2f7b0640846a01cff0f66770282c9bb36ac007334ee77,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,6e6b9c5f4cdc4072edecdec46506c96fda5e377390e785ad74806d20483a2f77,Merge_failed,6e6b9c5f4cdc4072edecdec46506c96fda5e377390e785ad74806d20483a2f77,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,806e28e79a3287ea3bb63d592aa5e00a804c3dac66594ea387c8080e474ded27,0.050156354904174805,0.04946017265319824,0.04407072067260742,0.03726649284362793,0.05259966850280762,0.03802061080932617,0.04709768295288086,0.4507267475128174,0.05830740928649902,0.5289928913116455,0.5335562229156494,0.32177090644836426,5.275756359100342,0.20791983604431152 diff --git a/results/combined/merges_timed/deemopen/zkui.csv b/results/combined/merges_timed/deemopen/zkui.csv index fd1972b3f9..297835249d 100644 --- a/results/combined/merges_timed/deemopen/zkui.csv +++ b/results/combined/merges_timed/deemopen/zkui.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,Tests_passed,True,True,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,109bcc155f93f4c7318760ac764d0a2a4cbd44b5bf7871f2c6be98c40704e0f4,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Tests_failed,f53c56861ccd9b65b83423fea7f02c2e29908bebecebabeda5480ca394cfc569,Tests_failed,f53c56861ccd9b65b83423fea7f02c2e29908bebecebabeda5480ca394cfc569,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Merge_failed,c84901af3d21ebeb9fd081ad375c66f8bd2960f41d9d3d58ee3954849f3a2ba0,0.014339923858642578,0.014275550842285156,0.015705108642578125,0.015341520309448242,0.015495538711547852,0.015753507614135742,0.015804529190063477,0.05568671226501465,0.018767595291137695,0.30706214904785156,0.30794215202331543,0.12610960006713867,1.2856645584106445,0.18334245681762695 +16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,Tests_passed,True,True,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,109bcc155f93f4c7318760ac764d0a2a4cbd44b5bf7871f2c6be98c40704e0f4,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Tests_failed,f53c56861ccd9b65b83423fea7f02c2e29908bebecebabeda5480ca394cfc569,Tests_failed,f53c56861ccd9b65b83423fea7f02c2e29908bebecebabeda5480ca394cfc569,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Merge_failed,c84901af3d21ebeb9fd081ad375c66f8bd2960f41d9d3d58ee3954849f3a2ba0,0.014339923858642578,0.014275550842285156,0.015705108642578125,0.015341520309448242,0.015495538711547852,0.015753507614135742,0.015804529190063477,0.05568671226501465,0.018767595291137695,0.304640531539917,0.30428433418273926,0.12610960006713867,1.2856645584106445,0.18334245681762695 diff --git a/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv b/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv index 2de665df28..6150ed3a9e 100644 --- a/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv +++ b/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,a0fa55093e7066a5356535bdbcc382f78daf23ef,c138b79d228f266a79b3e1059e0d717cb3059574,48843d4966dddb16e0af6ec69b8ed200638b2e0d,,True,True,21d70804264e5add543795452bc2179fa93b8e1e75f40701605d7717678013bd,Tests_passed,13ef0184078bd2cfca4da13fadf9e95ae83842fd291ac6e2f8c5caadf845836d,Tests_passed,True,True,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,0.04255342483520508,0.0408320426940918,0.037216901779174805,0.039017677307128906,0.0455479621887207,0.045958518981933594,0.04616999626159668,0.1689751148223877,0.0467228889465332,0.16945171356201172,0.17035269737243652,0.07167863845825195,0.6277680397033691,0.21619081497192383 +7,refs/heads/master,a0fa55093e7066a5356535bdbcc382f78daf23ef,c138b79d228f266a79b3e1059e0d717cb3059574,48843d4966dddb16e0af6ec69b8ed200638b2e0d,,True,True,21d70804264e5add543795452bc2179fa93b8e1e75f40701605d7717678013bd,Tests_passed,13ef0184078bd2cfca4da13fadf9e95ae83842fd291ac6e2f8c5caadf845836d,Tests_passed,True,True,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,0.04255342483520508,0.0408320426940918,0.037216901779174805,0.039017677307128906,0.0455479621887207,0.045958518981933594,0.04616999626159668,0.1689751148223877,0.0467228889465332,0.1681981086730957,0.1678452491760254,0.07167863845825195,0.6277680397033691,0.21619081497192383 diff --git a/results/combined/merges_timed/dfabulich/sitemapgen4j.csv b/results/combined/merges_timed/dfabulich/sitemapgen4j.csv index 9de0a896ae..d7b21ef186 100644 --- a/results/combined/merges_timed/dfabulich/sitemapgen4j.csv +++ b/results/combined/merges_timed/dfabulich/sitemapgen4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,a46ea9ffe51e0f77969a39cecfb2fc9fd479b19b,5ea973b161dd9f9606305784c087afdfc1e71803,54138163cee4508b3f2b28c461e75c6b20c9d7fe,,True,True,2f9c9c6d06d8a0c22de8f31b953d81d872c52de2484c19312142667e68393c25,Tests_passed,95b879c19e25cf8b5540b01982587d2f63b8af67ee159e81f51b8e57f8abe004,Tests_passed,True,True,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,0.0481715202331543,0.04665827751159668,0.04548931121826172,0.04579019546508789,0.04624128341674805,0.050652503967285156,0.05146479606628418,0.31298828125,0.013315200805664062,0.44018030166625977,0.44089603424072266,0.22630023956298828,2.1235806941986084,0.19781875610351562 +9,refs/heads/master,a46ea9ffe51e0f77969a39cecfb2fc9fd479b19b,5ea973b161dd9f9606305784c087afdfc1e71803,54138163cee4508b3f2b28c461e75c6b20c9d7fe,,True,True,2f9c9c6d06d8a0c22de8f31b953d81d872c52de2484c19312142667e68393c25,Tests_passed,95b879c19e25cf8b5540b01982587d2f63b8af67ee159e81f51b8e57f8abe004,Tests_passed,True,True,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,0.0481715202331543,0.04665827751159668,0.04548931121826172,0.04579019546508789,0.04624128341674805,0.050652503967285156,0.05146479606628418,0.31298828125,0.013315200805664062,0.43881988525390625,0.4349546432495117,0.22630023956298828,2.1235806941986084,0.19781875610351562 diff --git a/results/combined/merges_timed/dgarijo/widoco.csv b/results/combined/merges_timed/dgarijo/widoco.csv index 6740089d90..8e7226bc72 100644 --- a/results/combined/merges_timed/dgarijo/widoco.csv +++ b/results/combined/merges_timed/dgarijo/widoco.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -109,refs/heads/master,dfa60976ada8bdced21ff043fe763dd86314b7cc,d57b8de32106b44b9ca3e00ecab1b20998a4a703,6f217334138887945085c9b24924f881f8cb1232,,True,True,36d963fc2e67f2073cda9b2cffc2917f0059b4d2396f16ca33b45731994fcad3,Tests_passed,9772c3d82fc1f914621d7cff668b1c14da39d1ad3c4fd9c3c4e9ad0cab75f4b9,Tests_passed,True,True,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,f1400af762691284f6ae1453549d42bb18427913582350db6e79a455fea2e1e4,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,d8471b29618b7a0cd48f65f5fcbb3a98ee9ea7a2f9d151b977853eb2e0d58263,Merge_failed,d8471b29618b7a0cd48f65f5fcbb3a98ee9ea7a2f9d151b977853eb2e0d58263,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,0.043245553970336914,0.027059078216552734,0.01644158363342285,0.01614522933959961,0.015887022018432617,0.021167755126953125,0.06280088424682617,0.21898579597473145,0.09723424911499023,0.19220852851867676,0.19208312034606934,0.12728095054626465,0.0517733097076416,0.2791612148284912 +109,refs/heads/master,dfa60976ada8bdced21ff043fe763dd86314b7cc,d57b8de32106b44b9ca3e00ecab1b20998a4a703,6f217334138887945085c9b24924f881f8cb1232,,True,True,36d963fc2e67f2073cda9b2cffc2917f0059b4d2396f16ca33b45731994fcad3,Tests_passed,9772c3d82fc1f914621d7cff668b1c14da39d1ad3c4fd9c3c4e9ad0cab75f4b9,Tests_passed,True,True,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,f1400af762691284f6ae1453549d42bb18427913582350db6e79a455fea2e1e4,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,d8471b29618b7a0cd48f65f5fcbb3a98ee9ea7a2f9d151b977853eb2e0d58263,Merge_failed,d8471b29618b7a0cd48f65f5fcbb3a98ee9ea7a2f9d151b977853eb2e0d58263,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,0.043245553970336914,0.027059078216552734,0.01644158363342285,0.01614522933959961,0.015887022018432617,0.021167755126953125,0.06280088424682617,0.21898579597473145,0.09723424911499023,0.2430582046508789,0.2977597713470459,0.12728095054626465,0.0517733097076416,0.2791612148284912 diff --git a/results/combined/merges_timed/dgradecak/alfresco-mvc.csv b/results/combined/merges_timed/dgradecak/alfresco-mvc.csv index 6e6c42e4cb..b19b9d7d9d 100644 --- a/results/combined/merges_timed/dgradecak/alfresco-mvc.csv +++ b/results/combined/merges_timed/dgradecak/alfresco-mvc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,042d59bed8b1651367380523918f4e1145c9d9c0,ee2bb44d6352d83a1f6e322f464b326e90fc571b,18d4beb52eda96ae1898937be0539732b0757254,,True,True,bbdefa6792386b5057bca2cb5075bbfea0a5a9469e7bbc2f630500f7b532cd23,Tests_passed,cb7f688e83e2a7f7af20a83a98379bd5aa1fd11f425f5606771bcf27efe0a9d5,Tests_passed,True,True,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,b76a640c49ae347c444620dd1e075f5864f232b5e5a2c74f5ec64235390e3957,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,c33e9d36949d85b0dfe1fe1a9b8a66e48bac988a5c262cf251331e1813a447e7,Merge_failed,b68126ef9692308ad4c80f4fd46b57a76c5aeb04cf875c01c7eb6ce2fdbca645,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,25ee4db9cbb1181c979a6bd58ef2d592cb8d963df24aa120cb18d559fc1dd75e,Merge_failed,49d0eb5111a9200963af3c883afa5beb4bfaffe5ca4b0903ca909d89a5464de5,0.04387259483337402,0.0507349967956543,0.052436113357543945,0.04329180717468262,0.04560565948486328,0.048725128173828125,0.05033588409423828,0.4705078601837158,0.12054800987243652,0.16453218460083008,0.1646115779876709,0.3805997371673584,0.957942008972168,0.216874361038208 +7,refs/heads/master,042d59bed8b1651367380523918f4e1145c9d9c0,ee2bb44d6352d83a1f6e322f464b326e90fc571b,18d4beb52eda96ae1898937be0539732b0757254,,True,True,bbdefa6792386b5057bca2cb5075bbfea0a5a9469e7bbc2f630500f7b532cd23,Tests_passed,cb7f688e83e2a7f7af20a83a98379bd5aa1fd11f425f5606771bcf27efe0a9d5,Tests_passed,True,True,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,b76a640c49ae347c444620dd1e075f5864f232b5e5a2c74f5ec64235390e3957,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,c33e9d36949d85b0dfe1fe1a9b8a66e48bac988a5c262cf251331e1813a447e7,Merge_failed,b68126ef9692308ad4c80f4fd46b57a76c5aeb04cf875c01c7eb6ce2fdbca645,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,25ee4db9cbb1181c979a6bd58ef2d592cb8d963df24aa120cb18d559fc1dd75e,Merge_failed,49d0eb5111a9200963af3c883afa5beb4bfaffe5ca4b0903ca909d89a5464de5,0.04387259483337402,0.0507349967956543,0.052436113357543945,0.04329180717468262,0.04560565948486328,0.048725128173828125,0.05033588409423828,0.4705078601837158,0.12054800987243652,0.16143560409545898,0.1603868007659912,0.3805997371673584,0.957942008972168,0.216874361038208 diff --git a/results/combined/merges_timed/dieselpoint/norm.csv b/results/combined/merges_timed/dieselpoint/norm.csv index f933d1b537..874a714a12 100644 --- a/results/combined/merges_timed/dieselpoint/norm.csv +++ b/results/combined/merges_timed/dieselpoint/norm.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -30,refs/heads/master,f8d53daf63a983bf21265165ea8b129400f132ec,a4a52133ef089e488bea27496ff0be716a6cc477,d1d69a623dedc255fbe98a446e1f29054bd475f4,,True,True,f3e3b7ae5e0ebc970955a30e835d301ab79715f6ac40edc3d2bf63894b96068e,Tests_passed,d0fe1f6b5e869dae8d572c51fe962ec3d395520e39fd9f3c9fe0e28fac10f4ce,Tests_passed,True,True,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,165eaf1384bdeae0a034ca29e0531e3c7744af60f8457329a6eb6849362bd609,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Tests_failed,c7d4ed7f3d2f91ed2a17eed8f44fee18566f0c1a06f496a60496a5bbbfd51663,Tests_failed,c7d4ed7f3d2f91ed2a17eed8f44fee18566f0c1a06f496a60496a5bbbfd51663,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Merge_failed,2074e014cc630ad3af79a1b7904ffa464f21245ec78af04d377f4ab52195ef56,0.009078264236450195,0.009577274322509766,0.008986234664916992,0.008676290512084961,0.009011268615722656,0.008988142013549805,0.009605169296264648,0.03590869903564453,0.014295101165771484,0.16347122192382812,0.16487669944763184,0.06898260116577148,0.9315841197967529,0.1619715690612793 +30,refs/heads/master,f8d53daf63a983bf21265165ea8b129400f132ec,a4a52133ef089e488bea27496ff0be716a6cc477,d1d69a623dedc255fbe98a446e1f29054bd475f4,,True,True,f3e3b7ae5e0ebc970955a30e835d301ab79715f6ac40edc3d2bf63894b96068e,Tests_passed,d0fe1f6b5e869dae8d572c51fe962ec3d395520e39fd9f3c9fe0e28fac10f4ce,Tests_passed,True,True,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,165eaf1384bdeae0a034ca29e0531e3c7744af60f8457329a6eb6849362bd609,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Tests_failed,c7d4ed7f3d2f91ed2a17eed8f44fee18566f0c1a06f496a60496a5bbbfd51663,Tests_failed,c7d4ed7f3d2f91ed2a17eed8f44fee18566f0c1a06f496a60496a5bbbfd51663,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Merge_failed,2074e014cc630ad3af79a1b7904ffa464f21245ec78af04d377f4ab52195ef56,0.009078264236450195,0.009577274322509766,0.008986234664916992,0.008676290512084961,0.009011268615722656,0.008988142013549805,0.009605169296264648,0.03590869903564453,0.014295101165771484,0.16041874885559082,0.16280674934387207,0.06898260116577148,0.9315841197967529,0.1619715690612793 diff --git a/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv b/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv index 5ee1c32735..ec7df200ca 100644 --- a/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv +++ b/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,6279f85f74a80a9f651b3fdd0228fa0ec737060d,b359ecc56ceb9719bf00ade9d4beee4fef6fe3c8,96eead5f9fa275c93be11b9af8317c777828cebe,,e8b67e8e0794fc762fd35cc628592f7615cbc9629588f6523206ff57a045e8c8,Tests_passed,8b6d9cf1e529a48406b0b9ff6ae9b670bc6606ee103607e77c765da736e1faae,Tests_passed,True,True,True,True,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,ccf012fac1cb6ddc6d72d7c7509f35e1bfe6fbfb9d44084427ada7f380cbe431,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6bd0a7877f33e322b80956c097b8467577bbeaff968e87d0907dc681c306d82b,Merge_failed,6bd0a7877f33e322b80956c097b8467577bbeaff968e87d0907dc681c306d82b,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Merge_failed,55da12315ef45f0ddd499dba640809e93c9a337fb8321868f55793282c4f74bc,0.04504036903381348,0.04452061653137207,0.05915117263793945,0.06353640556335449,0.04470467567443848,0.04290938377380371,0.04634451866149902,0.17945146560668945,0.07503294944763184,0.09790587425231934,0.09098505973815918,0.10410213470458984,1.5442256927490234,0.27524757385253906 +20,refs/heads/master,6279f85f74a80a9f651b3fdd0228fa0ec737060d,b359ecc56ceb9719bf00ade9d4beee4fef6fe3c8,96eead5f9fa275c93be11b9af8317c777828cebe,,e8b67e8e0794fc762fd35cc628592f7615cbc9629588f6523206ff57a045e8c8,Tests_passed,8b6d9cf1e529a48406b0b9ff6ae9b670bc6606ee103607e77c765da736e1faae,Tests_passed,True,True,True,True,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,ccf012fac1cb6ddc6d72d7c7509f35e1bfe6fbfb9d44084427ada7f380cbe431,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6bd0a7877f33e322b80956c097b8467577bbeaff968e87d0907dc681c306d82b,Merge_failed,6bd0a7877f33e322b80956c097b8467577bbeaff968e87d0907dc681c306d82b,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Merge_failed,55da12315ef45f0ddd499dba640809e93c9a337fb8321868f55793282c4f74bc,0.04504036903381348,0.04452061653137207,0.05915117263793945,0.06353640556335449,0.04470467567443848,0.04290938377380371,0.04634451866149902,0.17945146560668945,0.07503294944763184,0.09130263328552246,0.09278011322021484,0.10410213470458984,1.5442256927490234,0.27524757385253906 diff --git a/results/combined/merges_timed/digital-preservation/droid.csv b/results/combined/merges_timed/digital-preservation/droid.csv index 426601e518..fa286dbd1c 100644 --- a/results/combined/merges_timed/digital-preservation/droid.csv +++ b/results/combined/merges_timed/digital-preservation/droid.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -437,refs/remotes/origin/pull/907,884dcf7cf3988311f20fd94dd84ead7a9b6ecf2f,2fdeab05e76191e920e91aadf0c4add3a3169f40,d2a137537d96599342213ac9976c7cff38aefb20,,True,True,8266dbd6e11343bcccae65c3b897ae0931b6c2299ae13f5f18c706af7247d7dd,Tests_passed,7f1ec6c6f28c70f39259ba7653ac31cf9abad3b42c7d894064296403763d364a,Tests_passed,True,True,Merge_failed,cca3a79336b5e189391bc4aede4d00678770e91768ab0e01b5883e441898aee9,Merge_failed,0937d0b63e1a096fec3564ba18af1a638d00545018215ea922660761f307b74e,Merge_failed,cca3a79336b5e189391bc4aede4d00678770e91768ab0e01b5883e441898aee9,Merge_failed,f696f2800c91c2b912ac578d526d0a17dd8685f33947f7986cbab0c0a179ed6d,Merge_failed,4642f4c34ae4849037ba483002379cb451c4bd62d070a44f0d81416aa6c1ccfc,Merge_failed,4642f4c34ae4849037ba483002379cb451c4bd62d070a44f0d81416aa6c1ccfc,Merge_failed,17fe86bb7904950b23ad9c9d830da974aad72bfb41308d7eda7ef181694a6d46,Merge_failed,252ac71f7672e50eb9daaf08a5199ea116740ddc364c42f48a221226e0e5869c,Merge_failed,cca3a79336b5e189391bc4aede4d00678770e91768ab0e01b5883e441898aee9,Merge_failed,2d89a3ec4577c07cf7659ce9ad49365e24ba59c5a6181eb9af6cac3a8c28ca2a,Merge_failed,2d89a3ec4577c07cf7659ce9ad49365e24ba59c5a6181eb9af6cac3a8c28ca2a,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,0.0714263916015625,0.07446050643920898,0.08878707885742188,0.07451105117797852,0.09215831756591797,0.08580183982849121,0.07419657707214355,1.6202576160430908,0.23588252067565918,0.3869967460632324,0.38904500007629395,1.4103388786315918,0.06419563293457031,0.44960880279541016 +437,refs/remotes/origin/pull/907,884dcf7cf3988311f20fd94dd84ead7a9b6ecf2f,2fdeab05e76191e920e91aadf0c4add3a3169f40,d2a137537d96599342213ac9976c7cff38aefb20,,True,True,8266dbd6e11343bcccae65c3b897ae0931b6c2299ae13f5f18c706af7247d7dd,Tests_passed,7f1ec6c6f28c70f39259ba7653ac31cf9abad3b42c7d894064296403763d364a,Tests_passed,True,True,Merge_failed,cca3a79336b5e189391bc4aede4d00678770e91768ab0e01b5883e441898aee9,Merge_failed,0937d0b63e1a096fec3564ba18af1a638d00545018215ea922660761f307b74e,Merge_failed,cca3a79336b5e189391bc4aede4d00678770e91768ab0e01b5883e441898aee9,Merge_failed,f696f2800c91c2b912ac578d526d0a17dd8685f33947f7986cbab0c0a179ed6d,Merge_failed,4642f4c34ae4849037ba483002379cb451c4bd62d070a44f0d81416aa6c1ccfc,Merge_failed,4642f4c34ae4849037ba483002379cb451c4bd62d070a44f0d81416aa6c1ccfc,Merge_failed,17fe86bb7904950b23ad9c9d830da974aad72bfb41308d7eda7ef181694a6d46,Merge_failed,252ac71f7672e50eb9daaf08a5199ea116740ddc364c42f48a221226e0e5869c,Merge_failed,cca3a79336b5e189391bc4aede4d00678770e91768ab0e01b5883e441898aee9,Merge_failed,2d89a3ec4577c07cf7659ce9ad49365e24ba59c5a6181eb9af6cac3a8c28ca2a,Merge_failed,2d89a3ec4577c07cf7659ce9ad49365e24ba59c5a6181eb9af6cac3a8c28ca2a,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,0.0714263916015625,0.07446050643920898,0.08878707885742188,0.07451105117797852,0.09215831756591797,0.08580183982849121,0.07419657707214355,1.6202576160430908,0.23588252067565918,0.3840808868408203,0.38408780097961426,1.4103388786315918,0.06419563293457031,0.44960880279541016 diff --git a/results/combined/merges_timed/dius/java-faker.csv b/results/combined/merges_timed/dius/java-faker.csv index d4eb1830be..250d910eb9 100644 --- a/results/combined/merges_timed/dius/java-faker.csv +++ b/results/combined/merges_timed/dius/java-faker.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -64,refs/heads/master,54149209be7428d6580269758b5a0a01d945bd11,0e4a4b8af5968a26b6354e1f7d4de2922d63835c,1ebdf4f9dbdaae373c3a070069bf70f4616fd30a,,True,True,b7197dbe7403115f908c3895f1943fe99770750c393ff4636ca558a46062b0c3,Tests_passed,7d3950bff925778dd860dbfe7205e033b2d13114bcb4225e3e777d1a449869b5,Tests_passed,True,True,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,51fe7b78f9a2d231bdcb400219e0989a32977a51408451ec77184b6e1c18a520,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,51fe7b78f9a2d231bdcb400219e0989a32977a51408451ec77184b6e1c18a520,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,471fa4781ca012476051516c3a02e6f5207755fb033e73f28caa3c6012013edf,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,68cccd0c7212de388c2811c26d1e0d723732d27b4107c6b3628b40b0858fabcb,Merge_failed,68cccd0c7212de388c2811c26d1e0d723732d27b4107c6b3628b40b0858fabcb,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Merge_failed,1dccb2b71fd99689484662610acc7d3d49c9e6ba6c73b3a0d5170b6d48f453d6,0.029715538024902344,0.05209827423095703,0.04571127891540527,0.04636192321777344,0.03383326530456543,0.03962063789367676,0.048421621322631836,0.3156876564025879,0.06786370277404785,0.1330249309539795,0.13341426849365234,0.2385845184326172,1.9065899848937988,0.26624298095703125 +64,refs/heads/master,54149209be7428d6580269758b5a0a01d945bd11,0e4a4b8af5968a26b6354e1f7d4de2922d63835c,1ebdf4f9dbdaae373c3a070069bf70f4616fd30a,,True,True,b7197dbe7403115f908c3895f1943fe99770750c393ff4636ca558a46062b0c3,Tests_passed,7d3950bff925778dd860dbfe7205e033b2d13114bcb4225e3e777d1a449869b5,Tests_passed,True,True,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,51fe7b78f9a2d231bdcb400219e0989a32977a51408451ec77184b6e1c18a520,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,51fe7b78f9a2d231bdcb400219e0989a32977a51408451ec77184b6e1c18a520,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,471fa4781ca012476051516c3a02e6f5207755fb033e73f28caa3c6012013edf,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,68cccd0c7212de388c2811c26d1e0d723732d27b4107c6b3628b40b0858fabcb,Merge_failed,68cccd0c7212de388c2811c26d1e0d723732d27b4107c6b3628b40b0858fabcb,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Merge_failed,1dccb2b71fd99689484662610acc7d3d49c9e6ba6c73b3a0d5170b6d48f453d6,0.029715538024902344,0.05209827423095703,0.04571127891540527,0.04636192321777344,0.03383326530456543,0.03962063789367676,0.048421621322631836,0.3156876564025879,0.06786370277404785,0.1340639591217041,0.15976357460021973,0.2385845184326172,1.9065899848937988,0.26624298095703125 diff --git a/results/combined/merges_timed/dkunzler/esperandro.csv b/results/combined/merges_timed/dkunzler/esperandro.csv index b00a06aaf1..5628bff11b 100644 --- a/results/combined/merges_timed/dkunzler/esperandro.csv +++ b/results/combined/merges_timed/dkunzler/esperandro.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,a504784178f32a425ca7bd38f97b9a77a2eb6dfa,e156637fdb31048b51adc5755955513eb79dd2bf,ea419131fe919ea4348d96d36120dd6691b9c4c4,,True,True,918de87a6baf9ecfd333d88564636d8efde9d724ba231dcc737ac5794e9225f4,Tests_passed,ae1837beeb423f43a5d7c85097ee3cb8768f1243faac88ba40af58233fc5ec95,Tests_passed,True,True,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,56758ee32fe167edea5a6964ec8a4403a531ebc86a49bedc65d8a9a8ff126d2f,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,1d4288c46e67132693f42c519cb8cd1cf940a81b71bca013d618583a9ef7eead,Merge_failed,1d4288c46e67132693f42c519cb8cd1cf940a81b71bca013d618583a9ef7eead,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,17cd4b1c2c5ec36b0fb026d0597b0cf63aecfea3d80988d8d56e6347a268c819,Merge_failed,109773588707330c1e6e0b45eccd556c6c571fa2ed64a37d6f8600ba323b19fb,0.013509511947631836,0.01413869857788086,0.014510393142700195,0.014476776123046875,0.015007972717285156,0.015017032623291016,0.015179634094238281,0.14395380020141602,0.03670382499694824,0.07223701477050781,0.07183122634887695,0.571819543838501,0.4676089286804199,0.21248269081115723 +3,refs/heads/master,a504784178f32a425ca7bd38f97b9a77a2eb6dfa,e156637fdb31048b51adc5755955513eb79dd2bf,ea419131fe919ea4348d96d36120dd6691b9c4c4,,True,True,918de87a6baf9ecfd333d88564636d8efde9d724ba231dcc737ac5794e9225f4,Tests_passed,ae1837beeb423f43a5d7c85097ee3cb8768f1243faac88ba40af58233fc5ec95,Tests_passed,True,True,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,56758ee32fe167edea5a6964ec8a4403a531ebc86a49bedc65d8a9a8ff126d2f,Merge_failed,38696d7bfe7d73dd5b6b58d60b8a652fbab889c93713de419d935242f5bd568a,Merge_failed,1d4288c46e67132693f42c519cb8cd1cf940a81b71bca013d618583a9ef7eead,Merge_failed,1d4288c46e67132693f42c519cb8cd1cf940a81b71bca013d618583a9ef7eead,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,17cd4b1c2c5ec36b0fb026d0597b0cf63aecfea3d80988d8d56e6347a268c819,Merge_failed,109773588707330c1e6e0b45eccd556c6c571fa2ed64a37d6f8600ba323b19fb,0.013509511947631836,0.01413869857788086,0.014510393142700195,0.014476776123046875,0.015007972717285156,0.015017032623291016,0.015179634094238281,0.14395380020141602,0.03670382499694824,0.07172441482543945,0.07189679145812988,0.571819543838501,0.4676089286804199,0.21248269081115723 diff --git a/results/combined/merges_timed/docopt/docopt.java.csv b/results/combined/merges_timed/docopt/docopt.java.csv index 7956125c5f..44740d16df 100644 --- a/results/combined/merges_timed/docopt/docopt.java.csv +++ b/results/combined/merges_timed/docopt/docopt.java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,2802ccf5c458dc747b15d3ceaa89889d41a4d0d6,2d23774813b99bb9edd75bbe7e9cd6370ac5f7ee,85e1eff2c7d4b171c5dc2139e484ed4dfe7d443b,,06b2ab0fbb0ed241e3c5d54cc447839d3ad1540efd29e12e625b54b6e85a1a72,Tests_passed,ba91a7277eb2fef18a6cc6e603c9908577fb1b96f951dc260979fe67c29e10df,Tests_passed,True,True,True,True,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Merge_failed,9add2d88443646823f1358ff6aada8837b071a28e9db13a01a60672f55d115ac,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Merge_failed,da9e050133a997c04a9f1259fd0a0b63729c0de8fbf9afe1b42d0000f6afc366,Merge_failed,da9e050133a997c04a9f1259fd0a0b63729c0de8fbf9afe1b42d0000f6afc366,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,2639434219ab08d3931d129dbe96bdaff133a861078796b5c021de3dc11fe309,0.03645825386047363,0.0465090274810791,0.03952622413635254,0.04088926315307617,0.042230844497680664,0.0385591983795166,0.036847829818725586,0.16632628440856934,0.058999061584472656,0.08173632621765137,0.08107733726501465,0.11560487747192383,0.4084336757659912,0.19208216667175293 +2,refs/heads/master,2802ccf5c458dc747b15d3ceaa89889d41a4d0d6,2d23774813b99bb9edd75bbe7e9cd6370ac5f7ee,85e1eff2c7d4b171c5dc2139e484ed4dfe7d443b,,06b2ab0fbb0ed241e3c5d54cc447839d3ad1540efd29e12e625b54b6e85a1a72,Tests_passed,ba91a7277eb2fef18a6cc6e603c9908577fb1b96f951dc260979fe67c29e10df,Tests_passed,True,True,True,True,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Merge_failed,9add2d88443646823f1358ff6aada8837b071a28e9db13a01a60672f55d115ac,Merge_failed,cb16becf289e1e9312de46bd4049b3d2629472852303f21fcb457824291918ed,Merge_failed,da9e050133a997c04a9f1259fd0a0b63729c0de8fbf9afe1b42d0000f6afc366,Merge_failed,da9e050133a997c04a9f1259fd0a0b63729c0de8fbf9afe1b42d0000f6afc366,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,2639434219ab08d3931d129dbe96bdaff133a861078796b5c021de3dc11fe309,0.03645825386047363,0.0465090274810791,0.03952622413635254,0.04088926315307617,0.042230844497680664,0.0385591983795166,0.036847829818725586,0.16632628440856934,0.058999061584472656,0.0811161994934082,0.0816953182220459,0.11560487747192383,0.4084336757659912,0.19208216667175293 diff --git a/results/combined/merges_timed/doctau/garbagecat.csv b/results/combined/merges_timed/doctau/garbagecat.csv index c6b4884a19..f7116afd9c 100644 --- a/results/combined/merges_timed/doctau/garbagecat.csv +++ b/results/combined/merges_timed/doctau/garbagecat.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,583416b443b6e9679f87705f5b98f0f42e3cd19d,9a6da251a0d88bbd1607fbefb75a2ddc2393d51e,b9db442fb05065af24a43906a02bd4201e9d265a,,True,True,24a27151170cdb00180e48414ce3d9433c051aacadbb769d6b1a0836d5392dee,Tests_passed,3b63e37caf69facfed7fdef20d99533c34e7ab252e24647184698a58014f58f7,Tests_passed,True,True,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,192b129e57ac49a87897b830aebea5e885cfc44e7fbe4a39929c65a641114326,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,192b129e57ac49a87897b830aebea5e885cfc44e7fbe4a39929c65a641114326,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,fe8871843b0fe7953832a2ae1a1ab7953ca546fa54947eda6712a7cb3180bead,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,d9c184a015429d1e91f6aa0c7cca5d0853694afd733674bdbdcf5babf959441d,Merge_failed,d9c184a015429d1e91f6aa0c7cca5d0853694afd733674bdbdcf5babf959441d,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,35d1366b2805181122d3aec3b037f6afde80a37fe89c61b668f6685706f99ce6,0.03556370735168457,0.03444337844848633,0.02719402313232422,0.034110069274902344,0.04885506629943848,0.013214588165283203,0.0388035774230957,0.2362370491027832,0.08655619621276855,0.24051666259765625,0.2401871681213379,0.12767529487609863,1.7932705879211426,0.2232060432434082 +8,refs/heads/master,583416b443b6e9679f87705f5b98f0f42e3cd19d,9a6da251a0d88bbd1607fbefb75a2ddc2393d51e,b9db442fb05065af24a43906a02bd4201e9d265a,,True,True,24a27151170cdb00180e48414ce3d9433c051aacadbb769d6b1a0836d5392dee,Tests_passed,3b63e37caf69facfed7fdef20d99533c34e7ab252e24647184698a58014f58f7,Tests_passed,True,True,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,192b129e57ac49a87897b830aebea5e885cfc44e7fbe4a39929c65a641114326,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,192b129e57ac49a87897b830aebea5e885cfc44e7fbe4a39929c65a641114326,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,fe8871843b0fe7953832a2ae1a1ab7953ca546fa54947eda6712a7cb3180bead,Merge_failed,31105c01e2a3a55df68e421e5f60d4bbfac9cb51cb4c29b4d5df6f2c77a38ad4,Merge_failed,d9c184a015429d1e91f6aa0c7cca5d0853694afd733674bdbdcf5babf959441d,Merge_failed,d9c184a015429d1e91f6aa0c7cca5d0853694afd733674bdbdcf5babf959441d,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,35d1366b2805181122d3aec3b037f6afde80a37fe89c61b668f6685706f99ce6,0.03556370735168457,0.03444337844848633,0.02719402313232422,0.034110069274902344,0.04885506629943848,0.013214588165283203,0.0388035774230957,0.2362370491027832,0.08655619621276855,0.2305150032043457,0.23667144775390625,0.12767529487609863,1.7932705879211426,0.2232060432434082 diff --git a/results/combined/merges_timed/documents4j/documents4j.csv b/results/combined/merges_timed/documents4j/documents4j.csv index 705f3d0e64..b9aa10a56a 100644 --- a/results/combined/merges_timed/documents4j/documents4j.csv +++ b/results/combined/merges_timed/documents4j/documents4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,Tests_passed,True,True,True,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,0.08667922019958496,0.08416008949279785,0.12512469291687012,0.12415623664855957,0.12436032295227051,0.12609052658081055,0.12473607063293457,0.1905078887939453,0.08710527420043945,0.23841381072998047,0.16401219367980957,0.14074993133544922,0.6027977466583252,0.2293415069580078 +12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,Tests_passed,True,True,True,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,0.08667922019958496,0.08416008949279785,0.12512469291687012,0.12415623664855957,0.12436032295227051,0.12609052658081055,0.12473607063293457,0.1905078887939453,0.08710527420043945,0.236314058303833,0.18665122985839844,0.14074993133544922,0.6027977466583252,0.2293415069580078 diff --git a/results/combined/merges_timed/douglasrodrigo/bfmapper.csv b/results/combined/merges_timed/douglasrodrigo/bfmapper.csv index e0da01f39d..372e125b30 100644 --- a/results/combined/merges_timed/douglasrodrigo/bfmapper.csv +++ b/results/combined/merges_timed/douglasrodrigo/bfmapper.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,b0056fd6f8d833d7f7dd54543504f344787b53b2,6639eadfdbdaa63fe81a02bdb3f78ec38123d758,bf85cfee8a96e9e85ab29ea2d1021ec97dbe5e58,two initial commits,b591f19e6b53b09c3202cffe91eebab9c80d020f7afac058e8384079d15f571f,Tests_passed,96efdb52c0f05045d148e13b2e2642ca1330633388aa85c73f3b213d10dcb7c1,Tests_passed,True,True,True,True,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,0.03586220741271973,0.03745388984680176,0.03504657745361328,0.03326058387756348,0.03273415565490723,0.042084455490112305,0.03528022766113281,0.15718555450439453,0.03912806510925293,0.009255647659301758,0.009201288223266602,0.027295827865600586,0.04256582260131836,0.20853686332702637 +6,refs/heads/master,b0056fd6f8d833d7f7dd54543504f344787b53b2,6639eadfdbdaa63fe81a02bdb3f78ec38123d758,bf85cfee8a96e9e85ab29ea2d1021ec97dbe5e58,two initial commits,b591f19e6b53b09c3202cffe91eebab9c80d020f7afac058e8384079d15f571f,Tests_passed,96efdb52c0f05045d148e13b2e2642ca1330633388aa85c73f3b213d10dcb7c1,Tests_passed,True,True,True,True,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,0.03586220741271973,0.03745388984680176,0.03504657745361328,0.03326058387756348,0.03273415565490723,0.042084455490112305,0.03528022766113281,0.15718555450439453,0.03912806510925293,0.008968591690063477,0.008769035339355469,0.027295827865600586,0.04256582260131836,0.20853686332702637 diff --git a/results/combined/merges_timed/dozedoff/similarimage.csv b/results/combined/merges_timed/dozedoff/similarimage.csv index 1c703427a1..f36ee9e73a 100644 --- a/results/combined/merges_timed/dozedoff/similarimage.csv +++ b/results/combined/merges_timed/dozedoff/similarimage.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/develop,8137e10d6d6882c6461a20848c0699404328c767,65dc547c6168c01e2399106e022edf1aa6bc8711,33070ec5138938496f3349197d8e0f0d84bce790,,True,True,4a5639825ed45d13ad085d24d4b845a17db97c219feb349cd5be18d964332041,Tests_passed,dbfb2449c2152c7cccad58a1aadc3f8196ecbb40e832a6423e8cb0d2aeb265b4,Tests_passed,True,True,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,3652127264d5d533b1a1b92589603227ef3e5f6d39911f4ca63721a55d87ab59,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,f4085ef0ae75fc7ace65d297e70c0aee47af28b1389a3f198ca27cb670c57cd7,Merge_failed,f4085ef0ae75fc7ace65d297e70c0aee47af28b1389a3f198ca27cb670c57cd7,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Merge_failed,e1f945bf15ee2777c8630e1eeaacd10319a3b8ee92041758a873b169721bc461,0.026057004928588867,0.026169538497924805,0.029022216796875,0.02951812744140625,0.029026031494140625,0.029664993286132812,0.029549837112426758,0.07350707054138184,0.03519320487976074,0.21571993827819824,0.20958280563354492,0.13980817794799805,1.487844705581665,0.19208288192749023 +24,refs/heads/develop,8137e10d6d6882c6461a20848c0699404328c767,65dc547c6168c01e2399106e022edf1aa6bc8711,33070ec5138938496f3349197d8e0f0d84bce790,,True,True,4a5639825ed45d13ad085d24d4b845a17db97c219feb349cd5be18d964332041,Tests_passed,dbfb2449c2152c7cccad58a1aadc3f8196ecbb40e832a6423e8cb0d2aeb265b4,Tests_passed,True,True,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,3652127264d5d533b1a1b92589603227ef3e5f6d39911f4ca63721a55d87ab59,Merge_failed,b186a50f93d7cfed778480c086b21163ffbe3678862c8f93c6d25f0572fb9b7b,Merge_failed,f4085ef0ae75fc7ace65d297e70c0aee47af28b1389a3f198ca27cb670c57cd7,Merge_failed,f4085ef0ae75fc7ace65d297e70c0aee47af28b1389a3f198ca27cb670c57cd7,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Merge_failed,e1f945bf15ee2777c8630e1eeaacd10319a3b8ee92041758a873b169721bc461,0.026057004928588867,0.026169538497924805,0.029022216796875,0.02951812744140625,0.029026031494140625,0.029664993286132812,0.029549837112426758,0.07350707054138184,0.03519320487976074,0.19783806800842285,0.21484947204589844,0.13980817794799805,1.487844705581665,0.19208288192749023 diff --git a/results/combined/merges_timed/driesschulten/dozer-model.csv b/results/combined/merges_timed/driesschulten/dozer-model.csv index 7c2b278bc4..ec232f4169 100644 --- a/results/combined/merges_timed/driesschulten/dozer-model.csv +++ b/results/combined/merges_timed/driesschulten/dozer-model.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/remotes/origin/hibernate3,c7260c73f58d242b6181dfb05d588bbd0b23d5a1,1ad2803395b57bb2caf6d866f8afc1e8283712c8,00dc759c0edb8defa788bf42ef8888fb40e913a1,,cbdffd8a86739d9a1c7ddbe2698323e4a6ed294312a141d82cc14bd61e879b8c,Tests_passed,d688e4dbbe71181e65399e6d5440602208e3ef8f9c48251c74165fb95ac5f353,Tests_passed,True,True,True,True,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8bff437674b2a1923b335a5236bdc465a1fcc7000fbf10746b3a8b972bb24a3e,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Merge_failed,6ecf14908b3177522527725ec3f59f10461964095ff5148715a5d013d84b6469,0.008745431900024414,0.008878707885742188,0.008901596069335938,0.008735895156860352,0.008888959884643555,0.008908271789550781,0.008788108825683594,0.05600738525390625,0.013486385345458984,0.46816277503967285,0.46849918365478516,0.17241263389587402,1.9921414852142334,0.16388177871704102 +9,refs/remotes/origin/hibernate3,c7260c73f58d242b6181dfb05d588bbd0b23d5a1,1ad2803395b57bb2caf6d866f8afc1e8283712c8,00dc759c0edb8defa788bf42ef8888fb40e913a1,,cbdffd8a86739d9a1c7ddbe2698323e4a6ed294312a141d82cc14bd61e879b8c,Tests_passed,d688e4dbbe71181e65399e6d5440602208e3ef8f9c48251c74165fb95ac5f353,Tests_passed,True,True,True,True,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8bff437674b2a1923b335a5236bdc465a1fcc7000fbf10746b3a8b972bb24a3e,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Merge_failed,6ecf14908b3177522527725ec3f59f10461964095ff5148715a5d013d84b6469,0.008745431900024414,0.008878707885742188,0.008901596069335938,0.008735895156860352,0.008888959884643555,0.008908271789550781,0.008788108825683594,0.05600738525390625,0.013486385345458984,0.46306490898132324,0.46244049072265625,0.17241263389587402,1.9921414852142334,0.16388177871704102 diff --git a/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv b/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv index 43c39b285b..69a07165d9 100644 --- a/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv +++ b/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/7.x,b7c5e5eb55c90c36520b89c88d4b0886e458cb5e,7a2dc873c017d5e6ee34dafdd7d5e177463a3756,7fd75d8287091e6a2b6d2bd549ca526ef47778e9,,True,True,6baaa34ffb4c33c1c88ace172efcc35d9d205bd27b962d508958501d653ace5b,Tests_passed,429bf44be992718b907b1acb0af1bf9f706328051fd4fcbdfad948f164a41354,Tests_passed,True,True,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,0.013883352279663086,0.013405323028564453,0.016797304153442383,0.015958547592163086,0.01618337631225586,0.01664257049560547,0.01664137840270996,0.04328656196594238,0.02057671546936035,0.17490100860595703,0.1745142936706543,0.07869482040405273,0.7170023918151855,0.3689875602722168 +1,refs/heads/7.x,b7c5e5eb55c90c36520b89c88d4b0886e458cb5e,7a2dc873c017d5e6ee34dafdd7d5e177463a3756,7fd75d8287091e6a2b6d2bd549ca526ef47778e9,,True,True,6baaa34ffb4c33c1c88ace172efcc35d9d205bd27b962d508958501d653ace5b,Tests_passed,429bf44be992718b907b1acb0af1bf9f706328051fd4fcbdfad948f164a41354,Tests_passed,True,True,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,0.013883352279663086,0.013405323028564453,0.016797304153442383,0.015958547592163086,0.01618337631225586,0.01664257049560547,0.01664137840270996,0.04328656196594238,0.02057671546936035,0.17202496528625488,0.17307496070861816,0.07869482040405273,0.7170023918151855,0.3689875602722168 diff --git a/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv b/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv index f438ac5de5..75781cb561 100644 --- a/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv +++ b/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,Tests_passed,True,True,True,True,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,d75f7a5a34e9e6031338d92a6e7c0978e7257b1a810c0d74f375a229bd564826,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,d75f7a5a34e9e6031338d92a6e7c0978e7257b1a810c0d74f375a229bd564826,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,07b5a9fd1ea4d51aa8ef98244f1d16fac2d5cdc8acc8ae9dfcc07367678f26a3,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,81db2f3286671428d0d62f06a6671d7b3fff4d15047603e08e81d3ce0d62bb10,Merge_failed,0f2cbc208db7ec7603b6bc03d8b0fa70579d38f1d92ecb6c67905565fc509751,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,0.045053958892822266,0.045946359634399414,0.04284310340881348,0.03931403160095215,0.042591094970703125,0.03975868225097656,0.04336404800415039,0.36564207077026367,0.09158587455749512,0.11868119239807129,0.11929440498352051,0.29024696350097656,1.1379117965698242,0.20299816131591797 +3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,Tests_passed,True,True,True,True,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,d75f7a5a34e9e6031338d92a6e7c0978e7257b1a810c0d74f375a229bd564826,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,d75f7a5a34e9e6031338d92a6e7c0978e7257b1a810c0d74f375a229bd564826,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,07b5a9fd1ea4d51aa8ef98244f1d16fac2d5cdc8acc8ae9dfcc07367678f26a3,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,81db2f3286671428d0d62f06a6671d7b3fff4d15047603e08e81d3ce0d62bb10,Merge_failed,0f2cbc208db7ec7603b6bc03d8b0fa70579d38f1d92ecb6c67905565fc509751,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,0.045053958892822266,0.045946359634399414,0.04284310340881348,0.03931403160095215,0.042591094970703125,0.03975868225097656,0.04336404800415039,0.36564207077026367,0.09158587455749512,0.11859321594238281,0.11946392059326172,0.29024696350097656,1.1379117965698242,0.20299816131591797 diff --git a/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv b/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv index b65f260e39..a193876285 100644 --- a/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv +++ b/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,Tests_passed,True,True,True,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,9ff21883be4b013010b45d15e5e4ae19a3afeaaaebd204ca711097608e1cd7b1,Merge_failed,9ff21883be4b013010b45d15e5e4ae19a3afeaaaebd204ca711097608e1cd7b1,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,01896943414eb7316ff72b30c61aacb0a39c1f1855ca6891e08147860c1d9684,0.04240727424621582,0.0504145622253418,0.041349172592163086,0.04639148712158203,0.040465593338012695,0.0366513729095459,0.04206562042236328,0.17728829383850098,0.07944107055664062,0.07634902000427246,0.07685613632202148,0.12490582466125488,1.0232815742492676,0.21962809562683105 +7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,Tests_passed,True,True,True,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,9ff21883be4b013010b45d15e5e4ae19a3afeaaaebd204ca711097608e1cd7b1,Merge_failed,9ff21883be4b013010b45d15e5e4ae19a3afeaaaebd204ca711097608e1cd7b1,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,01896943414eb7316ff72b30c61aacb0a39c1f1855ca6891e08147860c1d9684,0.04240727424621582,0.0504145622253418,0.041349172592163086,0.04639148712158203,0.040465593338012695,0.0366513729095459,0.04206562042236328,0.17728829383850098,0.07944107055664062,0.07631111145019531,0.0764780044555664,0.12490582466125488,1.0232815742492676,0.21962809562683105 diff --git a/results/combined/merges_timed/druid-io/druid-api.csv b/results/combined/merges_timed/druid-io/druid-api.csv index c08c085c1a..bbd543c1f6 100644 --- a/results/combined/merges_timed/druid-io/druid-api.csv +++ b/results/combined/merges_timed/druid-io/druid-api.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,ac15c8e6c4baa07aecc2208f13952c0adcce489c,7ed6284ffe6bd5542a2d9060c96e8ff55515c99f,f1486a2f94d2ba816ec5495a0518768ddaa429a6,,True,True,424ff64fcb36e661b96cf7154f4680b4de82167844ebcb395a40756cbdc0ab45,Tests_passed,ca3f47c8223d6b93221232b342ae43abc8217f8150e27ab31e47a3d1c85dbc39,Tests_passed,True,True,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,0.0344693660736084,0.04244208335876465,0.029029369354248047,0.05074262619018555,0.04823112487792969,0.041902780532836914,0.05707955360412598,0.1680145263671875,0.047426462173461914,0.15246176719665527,0.15318775177001953,0.1023557186126709,0.8908791542053223,0.20827221870422363 +3,refs/heads/master,ac15c8e6c4baa07aecc2208f13952c0adcce489c,7ed6284ffe6bd5542a2d9060c96e8ff55515c99f,f1486a2f94d2ba816ec5495a0518768ddaa429a6,,True,True,424ff64fcb36e661b96cf7154f4680b4de82167844ebcb395a40756cbdc0ab45,Tests_passed,ca3f47c8223d6b93221232b342ae43abc8217f8150e27ab31e47a3d1c85dbc39,Tests_passed,True,True,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,0.0344693660736084,0.04244208335876465,0.029029369354248047,0.05074262619018555,0.04823112487792969,0.041902780532836914,0.05707955360412598,0.1680145263671875,0.047426462173461914,0.15023183822631836,0.15037274360656738,0.1023557186126709,0.8908791542053223,0.20827221870422363 diff --git a/results/combined/merges_timed/dschulten/hydra-java.csv b/results/combined/merges_timed/dschulten/hydra-java.csv index ad6445daf6..1f0478fcd9 100644 --- a/results/combined/merges_timed/dschulten/hydra-java.csv +++ b/results/combined/merges_timed/dschulten/hydra-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -22,refs/heads/master,31477c32b5705e46811843bfede533dae9682322,fad819e0f8ca98108ceaf081a108c18f51eedaf8,320e7b3e13f86b6aae1424df7a17bb67d75d96f1,,True,True,e76023079412f3860140021a6b4f64fc5853c8c3068942a9bdf226a2522560e5,Tests_passed,6fa12531d9406c631dfbb6f1a9944961a505e6d176c485c10b0f7f7d9d02af0e,Tests_passed,True,True,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,41a9f6d4f7152fb7bf56139ed97000235c7be351ad8144f3c03166b7e34e8dcd,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,7a10a18b329b321bf765c1d138d652226906f323379f098f8cee550d9168e4e2,Merge_failed,7a10a18b329b321bf765c1d138d652226906f323379f098f8cee550d9168e4e2,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Merge_failed,f7f5479e09bc4c4e5078f90fe2224d2cca4a21b47ecab59ba2f979d97f18e6fa,0.032613515853881836,0.03868913650512695,0.05065751075744629,0.05280804634094238,0.03309512138366699,0.013527631759643555,0.03807187080383301,0.16752076148986816,0.06686687469482422,0.06512951850891113,0.06483244895935059,0.12488985061645508,0.7807540893554688,0.2079448699951172 +22,refs/heads/master,31477c32b5705e46811843bfede533dae9682322,fad819e0f8ca98108ceaf081a108c18f51eedaf8,320e7b3e13f86b6aae1424df7a17bb67d75d96f1,,True,True,e76023079412f3860140021a6b4f64fc5853c8c3068942a9bdf226a2522560e5,Tests_passed,6fa12531d9406c631dfbb6f1a9944961a505e6d176c485c10b0f7f7d9d02af0e,Tests_passed,True,True,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,41a9f6d4f7152fb7bf56139ed97000235c7be351ad8144f3c03166b7e34e8dcd,Merge_failed,204f15815b18610311356f495660a3727aad14eb418466c1281607a8158dd8ef,Merge_failed,7a10a18b329b321bf765c1d138d652226906f323379f098f8cee550d9168e4e2,Merge_failed,7a10a18b329b321bf765c1d138d652226906f323379f098f8cee550d9168e4e2,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Merge_failed,f7f5479e09bc4c4e5078f90fe2224d2cca4a21b47ecab59ba2f979d97f18e6fa,0.032613515853881836,0.03868913650512695,0.05065751075744629,0.05280804634094238,0.03309512138366699,0.013527631759643555,0.03807187080383301,0.16752076148986816,0.06686687469482422,0.0645909309387207,0.06460452079772949,0.12488985061645508,0.7807540893554688,0.2079448699951172 diff --git a/results/combined/merges_timed/dspace/dspace.csv b/results/combined/merges_timed/dspace/dspace.csv index 204db12bac..ee17d731ce 100644 --- a/results/combined/merges_timed/dspace/dspace.csv +++ b/results/combined/merges_timed/dspace/dspace.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -525,refs/heads/main,f715667f36cae09f850977047b48d0da5e6f00a8,aa9880f0f5868fa697fa3c32a5c96e63473bebc5,1f15e032fb2ebe77557d4b3aa97fed64d8acee73,,9b18c8122736fdc7135c01a80fc89c19bbded4e8742455d17526766d9cea6939,Tests_passed,0555121f3466b8a2a4bc1729ed27aba55be882335184e7b9838f7236b8555e92,Tests_passed,True,True,True,True,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,0.07073974609375,0.042960405349731445,0.05804276466369629,0.05079340934753418,0.07265281677246094,0.06050825119018555,0.036457061767578125,0.2519657611846924,0.07120132446289062,0.16298580169677734,0.16809678077697754,0.11930203437805176,0.05240654945373535,0.7468969821929932 +525,refs/heads/main,f715667f36cae09f850977047b48d0da5e6f00a8,aa9880f0f5868fa697fa3c32a5c96e63473bebc5,1f15e032fb2ebe77557d4b3aa97fed64d8acee73,,9b18c8122736fdc7135c01a80fc89c19bbded4e8742455d17526766d9cea6939,Tests_passed,0555121f3466b8a2a4bc1729ed27aba55be882335184e7b9838f7236b8555e92,Tests_passed,True,True,True,True,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,0.07073974609375,0.042960405349731445,0.05804276466369629,0.05079340934753418,0.07265281677246094,0.06050825119018555,0.036457061767578125,0.2519657611846924,0.07120132446289062,0.16549038887023926,0.1639845371246338,0.11930203437805176,0.05240654945373535,0.7468969821929932 diff --git a/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv b/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv index a81f7bb1db..fce1b6994a 100644 --- a/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv +++ b/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/remotes/origin/pull/10,0cab1f593acdfed0347285c8518987a96711236f,3fc1708da72ad61c9066cca02c03bad8d68d4a4c,405ccd79c722155c0065f7d0f5eb676ac6855e66,,07855a510bd356318e5f80a1951ec8054b6d6c05fad7abc9b0cbebb9cea21f9d,Tests_passed,8d6433aba4f09d54a08af06fa7bd22278f17464e23b971f1ba2c7e313a58fb1e,Tests_passed,True,True,True,True,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,4ec3e2fe1204736edae2d265bb631e7bb4c8579d548ee2b1795cb66bbb26c5ae,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Merge_failed,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Merge_failed,771784c9a23f8edf26af79ad2aa3e7db575234fecde6246fdc9759f0b60b55d7,0.04140782356262207,0.046434640884399414,0.04282379150390625,0.03838849067687988,0.0455317497253418,0.0439145565032959,0.04764056205749512,0.17337560653686523,0.07402181625366211,0.17318224906921387,0.17233586311340332,0.11487030982971191,1.1155824661254883,0.21282339096069336 +10,refs/remotes/origin/pull/10,0cab1f593acdfed0347285c8518987a96711236f,3fc1708da72ad61c9066cca02c03bad8d68d4a4c,405ccd79c722155c0065f7d0f5eb676ac6855e66,,07855a510bd356318e5f80a1951ec8054b6d6c05fad7abc9b0cbebb9cea21f9d,Tests_passed,8d6433aba4f09d54a08af06fa7bd22278f17464e23b971f1ba2c7e313a58fb1e,Tests_passed,True,True,True,True,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,4ec3e2fe1204736edae2d265bb631e7bb4c8579d548ee2b1795cb66bbb26c5ae,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Merge_failed,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Merge_failed,771784c9a23f8edf26af79ad2aa3e7db575234fecde6246fdc9759f0b60b55d7,0.04140782356262207,0.046434640884399414,0.04282379150390625,0.03838849067687988,0.0455317497253418,0.0439145565032959,0.04764056205749512,0.17337560653686523,0.07402181625366211,0.16775155067443848,0.16761207580566406,0.11487030982971191,1.1155824661254883,0.21282339096069336 diff --git a/results/combined/merges_timed/dtrules/dtrules.csv b/results/combined/merges_timed/dtrules/dtrules.csv index becf208d11..62e800bb5e 100644 --- a/results/combined/merges_timed/dtrules/dtrules.csv +++ b/results/combined/merges_timed/dtrules/dtrules.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/5.0-SNAPSHOT,6f91cbdda5d9d2ff783833d2b7fd43fcefb81f12,e48a828c7ee4c90f9077beed380282eca16b196d,d83934d0d79aaa1c1dbd84b4009c05f05e222654,,True,True,6a30be910fdeac9495bd74619a2772a404a12c528a7d804d61ce11840206cb53,Tests_passed,c859fa4729382e964d1b8bbd783a4c502c1f2eb4351b20d41be3bdc867a261ae,Tests_passed,True,True,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,6219c070ced46b4eda40de8bbcefdc919a7883210a628e38e618e07f98fda474,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,22180efcb0de9b0a4d7348dbf37e10e8e7e2db6b969129e3b65b4618d955152a,Merge_failed,22180efcb0de9b0a4d7348dbf37e10e8e7e2db6b969129e3b65b4618d955152a,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,ffe40fedf3731d3a9e934d8d6c88930d979c51846c56c53db6f2a7e3bc315ab8,Merge_failed,21332adce4bcec64966ba8f6a027852682d19c79f25c90816987e905944e5787,0.07908248901367188,0.07355642318725586,0.07282209396362305,0.0787808895111084,0.07722902297973633,0.07296228408813477,0.07873964309692383,0.3122692108154297,0.13356304168701172,0.19332051277160645,0.2010498046875,0.2705838680267334,653.4522542953491,0.49052858352661133 +1,refs/heads/5.0-SNAPSHOT,6f91cbdda5d9d2ff783833d2b7fd43fcefb81f12,e48a828c7ee4c90f9077beed380282eca16b196d,d83934d0d79aaa1c1dbd84b4009c05f05e222654,,True,True,6a30be910fdeac9495bd74619a2772a404a12c528a7d804d61ce11840206cb53,Tests_passed,c859fa4729382e964d1b8bbd783a4c502c1f2eb4351b20d41be3bdc867a261ae,Tests_passed,True,True,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,6219c070ced46b4eda40de8bbcefdc919a7883210a628e38e618e07f98fda474,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,22180efcb0de9b0a4d7348dbf37e10e8e7e2db6b969129e3b65b4618d955152a,Merge_failed,22180efcb0de9b0a4d7348dbf37e10e8e7e2db6b969129e3b65b4618d955152a,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,ffe40fedf3731d3a9e934d8d6c88930d979c51846c56c53db6f2a7e3bc315ab8,Merge_failed,21332adce4bcec64966ba8f6a027852682d19c79f25c90816987e905944e5787,0.07908248901367188,0.07355642318725586,0.07282209396362305,0.0787808895111084,0.07722902297973633,0.07296228408813477,0.07873964309692383,0.3122692108154297,0.13356304168701172,0.19034934043884277,0.18921232223510742,0.2705838680267334,653.4522542953491,0.49052858352661133 diff --git a/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv b/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv index 2f8241fced..c85f6636f0 100644 --- a/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv +++ b/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/wicket-1.5,09940b84110f272a498b0956740d17684d48f1c3,fb62ed543a7b7e36412f501ffe1eb4906cb92dc1,eede8623fdeb4c0b07d4a37c6da1e5abe23fe37d,,True,True,b4f0103eb7ebd57aa6c32cc98b88decf44f436d2ed182f2c409c58c4c84c6801,Tests_passed,13cee4d48a55de96ca5dafac1489d9a4af378733434f92b701cfc22eecf1c794,Tests_passed,True,True,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,5e349304cfc4b2683eb4966c9b8e370593d115f0948c9e4eded54962c5fe4e21,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,Merge_failed,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,369fef66ec15a5957089ca27b9dc122d6a8c84d0a4a00a671f948e6545de3703,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,0.038802146911621094,0.03736519813537598,0.03849363327026367,0.038818359375,0.035156965255737305,0.03810930252075195,0.040132761001586914,0.21635937690734863,0.06028008460998535,0.1573038101196289,0.15776515007019043,0.1702268123626709,0.9442393779754639,0.1794414520263672 +2,refs/heads/wicket-1.5,09940b84110f272a498b0956740d17684d48f1c3,fb62ed543a7b7e36412f501ffe1eb4906cb92dc1,eede8623fdeb4c0b07d4a37c6da1e5abe23fe37d,,True,True,b4f0103eb7ebd57aa6c32cc98b88decf44f436d2ed182f2c409c58c4c84c6801,Tests_passed,13cee4d48a55de96ca5dafac1489d9a4af378733434f92b701cfc22eecf1c794,Tests_passed,True,True,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,5e349304cfc4b2683eb4966c9b8e370593d115f0948c9e4eded54962c5fe4e21,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,Merge_failed,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,369fef66ec15a5957089ca27b9dc122d6a8c84d0a4a00a671f948e6545de3703,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,0.038802146911621094,0.03736519813537598,0.03849363327026367,0.038818359375,0.035156965255737305,0.03810930252075195,0.040132761001586914,0.21635937690734863,0.06028008460998535,0.1553347110748291,0.1545553207397461,0.1702268123626709,0.9442393779754639,0.1794414520263672 diff --git a/results/combined/merges_timed/dvcama/lodview.csv b/results/combined/merges_timed/dvcama/lodview.csv index ba87b9a0af..ab88c2726d 100644 --- a/results/combined/merges_timed/dvcama/lodview.csv +++ b/results/combined/merges_timed/dvcama/lodview.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,ce117080514feaa63100345095aa4954a9d6d4bc,39f794baac72a3024ff3ca69a0b0fd9c1e830ad0,9cd0988f15b5adec4454a0527c1933d3154ad4c4,,c43a1da7c4910dad4f7b2434f912ea7792c11c595b890a549052d491d0f60e13,Tests_passed,b460c7acdf763d86f5421153fbd3bdd971e932294f8a8542d98ad55658633e55,Tests_passed,True,True,True,True,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,1fec5b03f1ed12bd31c50cebefc6a2c2ffcea89eb41f87266a17cf41f15800b2,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,1fec5b03f1ed12bd31c50cebefc6a2c2ffcea89eb41f87266a17cf41f15800b2,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,a25946d769c9e38fba92b0b7b2291296e4e5261fc8a73fbb5e7f708a1bceb91f,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,49727900ac0189cf8463e7a3822705d16732373286392c0144013fda33ee119d,Merge_failed,49727900ac0189cf8463e7a3822705d16732373286392c0144013fda33ee119d,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,0.06262397766113281,0.0625770092010498,0.07557106018066406,0.07603716850280762,0.07616901397705078,0.07651996612548828,0.07581019401550293,0.14375758171081543,0.0758364200592041,0.1588742733001709,0.21128368377685547,0.20682644844055176,0.06651067733764648,0.2376422882080078 +3,refs/heads/master,ce117080514feaa63100345095aa4954a9d6d4bc,39f794baac72a3024ff3ca69a0b0fd9c1e830ad0,9cd0988f15b5adec4454a0527c1933d3154ad4c4,,c43a1da7c4910dad4f7b2434f912ea7792c11c595b890a549052d491d0f60e13,Tests_passed,b460c7acdf763d86f5421153fbd3bdd971e932294f8a8542d98ad55658633e55,Tests_passed,True,True,True,True,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,1fec5b03f1ed12bd31c50cebefc6a2c2ffcea89eb41f87266a17cf41f15800b2,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,1fec5b03f1ed12bd31c50cebefc6a2c2ffcea89eb41f87266a17cf41f15800b2,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,a25946d769c9e38fba92b0b7b2291296e4e5261fc8a73fbb5e7f708a1bceb91f,Merge_failed,cf73ef945283ccbe3193641dcc9edd25a45e9525b9a3e0735ceef3de6b0c3229,Merge_failed,49727900ac0189cf8463e7a3822705d16732373286392c0144013fda33ee119d,Merge_failed,49727900ac0189cf8463e7a3822705d16732373286392c0144013fda33ee119d,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,0.06262397766113281,0.0625770092010498,0.07557106018066406,0.07603716850280762,0.07616901397705078,0.07651996612548828,0.07581019401550293,0.14375758171081543,0.0758364200592041,0.20846247673034668,0.20926928520202637,0.20682644844055176,0.06651067733764648,0.2376422882080078 diff --git a/results/combined/merges_timed/dvdme/forecastio-lib-java.csv b/results/combined/merges_timed/dvdme/forecastio-lib-java.csv index 75f079572b..ad2aac6387 100644 --- a/results/combined/merges_timed/dvdme/forecastio-lib-java.csv +++ b/results/combined/merges_timed/dvdme/forecastio-lib-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,60570820cae9c489f6fb00a1c64a73ea7fdfdfae,c5157ff590ecd99bf07058d779a52818af0ce056,de802a0f9736572038a2147ec3cc804f0ef3cf76,,True,True,cde9a0c15a1347cc20c80cfeec748d3e382696333655b691085cdbcf8fd314e6,Tests_passed,6575b7205c3762dc567541e31b58be4586b9db00c23c4275aa28ee71529688fa,Tests_passed,True,True,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,0.03851747512817383,0.04549908638000488,0.049376726150512695,0.050948381423950195,0.058693885803222656,0.04130721092224121,0.05769944190979004,0.17081475257873535,0.04736924171447754,0.16392254829406738,0.16510534286499023,0.11396360397338867,1.031712293624878,0.1889967918395996 +9,refs/heads/master,60570820cae9c489f6fb00a1c64a73ea7fdfdfae,c5157ff590ecd99bf07058d779a52818af0ce056,de802a0f9736572038a2147ec3cc804f0ef3cf76,,True,True,cde9a0c15a1347cc20c80cfeec748d3e382696333655b691085cdbcf8fd314e6,Tests_passed,6575b7205c3762dc567541e31b58be4586b9db00c23c4275aa28ee71529688fa,Tests_passed,True,True,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,0.03851747512817383,0.04549908638000488,0.049376726150512695,0.050948381423950195,0.058693885803222656,0.04130721092224121,0.05769944190979004,0.17081475257873535,0.04736924171447754,0.16226577758789062,0.16177868843078613,0.11396360397338867,1.031712293624878,0.1889967918395996 diff --git a/results/combined/merges_timed/dwslab/dwslib.csv b/results/combined/merges_timed/dwslab/dwslib.csv index c1724e921c..10c9389f05 100644 --- a/results/combined/merges_timed/dwslab/dwslib.csv +++ b/results/combined/merges_timed/dwslab/dwslib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/1,83dc42bd1fb663dcb6e293c7d9a951d373248c12,8cd70aed31c7b4ec1cc67f682b036236a4836e38,511361742f20e57a67560054d0ff634ec2c3e411,,True,True,3f5d60309b958ff710c71b4b883f440b923429a953a2f0c6170fe9e4541bc247,Tests_passed,41304879a7a0d1b7e739bb4130cbe4092b4a3af69404869a4568eaf34959bd5c,Tests_passed,True,True,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,ab4d0b464a7c8d688be4d837b11c8bc807eb1e41c733575bd7ef40d938710cd7,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,8fa0f74ee6df80b5c0de55133db4444a0c12e712af582993e6521cc7dd13cdab,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,0.008374691009521484,0.008433103561401367,0.008753061294555664,0.008000373840332031,0.008295059204101562,0.008578300476074219,0.008325576782226562,0.045380353927612305,0.012744665145874023,0.14856934547424316,0.14870548248291016,0.12120175361633301,0.6084761619567871,0.1522367000579834 +4,refs/remotes/origin/pull/1,83dc42bd1fb663dcb6e293c7d9a951d373248c12,8cd70aed31c7b4ec1cc67f682b036236a4836e38,511361742f20e57a67560054d0ff634ec2c3e411,,True,True,3f5d60309b958ff710c71b4b883f440b923429a953a2f0c6170fe9e4541bc247,Tests_passed,41304879a7a0d1b7e739bb4130cbe4092b4a3af69404869a4568eaf34959bd5c,Tests_passed,True,True,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,ab4d0b464a7c8d688be4d837b11c8bc807eb1e41c733575bd7ef40d938710cd7,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,8fa0f74ee6df80b5c0de55133db4444a0c12e712af582993e6521cc7dd13cdab,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,0.008374691009521484,0.008433103561401367,0.008753061294555664,0.008000373840332031,0.008295059204101562,0.008578300476074219,0.008325576782226562,0.045380353927612305,0.012744665145874023,0.1498723030090332,0.14884376525878906,0.12120175361633301,0.6084761619567871,0.1522367000579834 diff --git a/results/combined/merges_timed/dynjs/dynjs.csv b/results/combined/merges_timed/dynjs/dynjs.csv index 00d64c2632..ff285ab459 100644 --- a/results/combined/merges_timed/dynjs/dynjs.csv +++ b/results/combined/merges_timed/dynjs/dynjs.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,ee2219fc8b7178f9df605277b89200011093a534,b0f3e1e3217792abd2cec6e18bf7e376f56ae1d1,cf7bbe9e06fd28c686ecbc47ba59bfa25c854e47,,True,True,1a5cac1a138de84dfc3aca1145091ab3248fcce4c3e5839282e8540dd71cb981,Tests_passed,2b963c0b558bb7d88d02e3bf7feecc8edd731b36f4e00b825eb47ecf1acd951a,Tests_passed,True,True,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,44963840b34c6b162f48e98586397db4ab42cc7dfeec1281140ab0f75ac87272,Tests_passed,44963840b34c6b162f48e98586397db4ab42cc7dfeec1281140ab0f75ac87272,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,0.022417783737182617,0.0228421688079834,0.026670217514038086,0.026682376861572266,0.027187824249267578,0.027356386184692383,0.027282238006591797,0.0830237865447998,0.02281355857849121,0.39403867721557617,0.38905930519104004,0.1852128505706787,3.2998459339141846,0.4919750690460205 +15,refs/heads/master,ee2219fc8b7178f9df605277b89200011093a534,b0f3e1e3217792abd2cec6e18bf7e376f56ae1d1,cf7bbe9e06fd28c686ecbc47ba59bfa25c854e47,,True,True,1a5cac1a138de84dfc3aca1145091ab3248fcce4c3e5839282e8540dd71cb981,Tests_passed,2b963c0b558bb7d88d02e3bf7feecc8edd731b36f4e00b825eb47ecf1acd951a,Tests_passed,True,True,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,44963840b34c6b162f48e98586397db4ab42cc7dfeec1281140ab0f75ac87272,Tests_passed,44963840b34c6b162f48e98586397db4ab42cc7dfeec1281140ab0f75ac87272,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,0.022417783737182617,0.0228421688079834,0.026670217514038086,0.026682376861572266,0.027187824249267578,0.027356386184692383,0.027282238006591797,0.0830237865447998,0.02281355857849121,0.38372111320495605,0.38921618461608887,0.1852128505706787,3.2998459339141846,0.4919750690460205 diff --git a/results/combined/merges_timed/e-mzungu/rjc.csv b/results/combined/merges_timed/e-mzungu/rjc.csv index 87ccd64f37..0fda1f1cc0 100644 --- a/results/combined/merges_timed/e-mzungu/rjc.csv +++ b/results/combined/merges_timed/e-mzungu/rjc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,3afc92b5e097f29763b600a8192f557f66752039,31a91e743de4b0de8bb25f306134117e887c6364,653b9123f2057024bca7cb4333d6f26060231bf5,,True,True,508940ed4108d08289048940b0c9f0524c5d3e0085b4459c1ea1ecf7b4234486,Tests_passed,3c298e1930b87e25093586c38d4f790f64ae1aa480c2bee9029bc00d3387a0c7,Tests_passed,True,True,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,88438f8d58fadb73e75beab0fc6a98c6fb7f98cdbcbd25f2291a61de7d396d4e,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,8d01d0c8e95059d5427f8dd7528fd7933fc9114d20d669c1d2a6ea2ab184a00e,Merge_failed,8d01d0c8e95059d5427f8dd7528fd7933fc9114d20d669c1d2a6ea2ab184a00e,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Merge_failed,a35e2ef6c1f5c80cf13fc69c3deae1ac73cc7d9682e9539e869c9c6d4d8c7cc7,0.011702775955200195,0.011842727661132812,0.012294530868530273,0.012068510055541992,0.011888265609741211,0.01207876205444336,0.01198887825012207,0.03963947296142578,0.018017292022705078,0.06838250160217285,0.06817102432250977,0.07949328422546387,0.8306918144226074,0.20006656646728516 +3,refs/heads/master,3afc92b5e097f29763b600a8192f557f66752039,31a91e743de4b0de8bb25f306134117e887c6364,653b9123f2057024bca7cb4333d6f26060231bf5,,True,True,508940ed4108d08289048940b0c9f0524c5d3e0085b4459c1ea1ecf7b4234486,Tests_passed,3c298e1930b87e25093586c38d4f790f64ae1aa480c2bee9029bc00d3387a0c7,Tests_passed,True,True,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,88438f8d58fadb73e75beab0fc6a98c6fb7f98cdbcbd25f2291a61de7d396d4e,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,8d01d0c8e95059d5427f8dd7528fd7933fc9114d20d669c1d2a6ea2ab184a00e,Merge_failed,8d01d0c8e95059d5427f8dd7528fd7933fc9114d20d669c1d2a6ea2ab184a00e,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Merge_failed,a35e2ef6c1f5c80cf13fc69c3deae1ac73cc7d9682e9539e869c9c6d4d8c7cc7,0.011702775955200195,0.011842727661132812,0.012294530868530273,0.012068510055541992,0.011888265609741211,0.01207876205444336,0.01198887825012207,0.03963947296142578,0.018017292022705078,0.06539058685302734,0.06625533103942871,0.07949328422546387,0.8306918144226074,0.20006656646728516 diff --git a/results/combined/merges_timed/eaftan/hprof-parser.csv b/results/combined/merges_timed/eaftan/hprof-parser.csv index 9d98805770..ee6636223d 100644 --- a/results/combined/merges_timed/eaftan/hprof-parser.csv +++ b/results/combined/merges_timed/eaftan/hprof-parser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,3668fd734f79c2b949f0703654dfda812c800707,cd2019e5a76d7b2fffdf3cd2faa7738caefc47a2,4b860f8b50791fad8ca96f54899a20dc34d3ff04,,5a222e78e931916fdf6bc576d04d4a197d0240ee1b97abd912d80bfbaba8ed5b,Tests_passed,8c1c891754ff5c8b94684cbe76d185011952bb913f4b4abba77ed5c39df42285,Tests_passed,True,True,True,True,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,0.054485321044921875,0.0552520751953125,0.0825040340423584,0.07899165153503418,0.08211636543273926,0.07959127426147461,0.07789087295532227,0.09234809875488281,0.05569624900817871,0.2142164707183838,0.21465802192687988,0.11263108253479004,1.3085620403289795,0.2453465461730957 +2,refs/heads/master,3668fd734f79c2b949f0703654dfda812c800707,cd2019e5a76d7b2fffdf3cd2faa7738caefc47a2,4b860f8b50791fad8ca96f54899a20dc34d3ff04,,5a222e78e931916fdf6bc576d04d4a197d0240ee1b97abd912d80bfbaba8ed5b,Tests_passed,8c1c891754ff5c8b94684cbe76d185011952bb913f4b4abba77ed5c39df42285,Tests_passed,True,True,True,True,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,0.054485321044921875,0.0552520751953125,0.0825040340423584,0.07899165153503418,0.08211636543273926,0.07959127426147461,0.07789087295532227,0.09234809875488281,0.05569624900817871,0.2098391056060791,0.20986270904541016,0.11263108253479004,1.3085620403289795,0.2453465461730957 diff --git a/results/combined/merges_timed/easetech/easytest-core.csv b/results/combined/merges_timed/easetech/easytest-core.csv index 6fa748682e..56e9c5021e 100644 --- a/results/combined/merges_timed/easetech/easytest-core.csv +++ b/results/combined/merges_timed/easetech/easytest-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,38eb005d4af26d4efac55ee553a324707ca75486,0f668972d2ea34b04685aa7d8ea4dc20924e1dad,0671ea4bf8142f1731e00ac44c10b73abce310d4,,True,True,9251f95f877e91999a10b5e5d5cbaa6399c9e608b994e19cd3d317d04f07b032,Tests_passed,640b135b2fcfa2a26afe641df242f6c416b7642895fdb16e6ab9f5da7967f1ae,Tests_passed,True,True,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,0.04332685470581055,0.05734992027282715,0.04378318786621094,0.061516523361206055,0.04619288444519043,0.05008435249328613,0.05159306526184082,0.3076152801513672,0.04392075538635254,0.4981069564819336,0.5053400993347168,0.23147320747375488,3.70242977142334,0.22165226936340332 +7,refs/heads/master,38eb005d4af26d4efac55ee553a324707ca75486,0f668972d2ea34b04685aa7d8ea4dc20924e1dad,0671ea4bf8142f1731e00ac44c10b73abce310d4,,True,True,9251f95f877e91999a10b5e5d5cbaa6399c9e608b994e19cd3d317d04f07b032,Tests_passed,640b135b2fcfa2a26afe641df242f6c416b7642895fdb16e6ab9f5da7967f1ae,Tests_passed,True,True,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,0.04332685470581055,0.05734992027282715,0.04378318786621094,0.061516523361206055,0.04619288444519043,0.05008435249328613,0.05159306526184082,0.3076152801513672,0.04392075538635254,0.4819028377532959,0.48077821731567383,0.23147320747375488,3.70242977142334,0.22165226936340332 diff --git a/results/combined/merges_timed/ebay/xcelite.csv b/results/combined/merges_timed/ebay/xcelite.csv index 2cb62945e4..9fadf5b77b 100644 --- a/results/combined/merges_timed/ebay/xcelite.csv +++ b/results/combined/merges_timed/ebay/xcelite.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,e43a4a1bda8dfa082dadd823d9b125c1b97e9378,46654b2fc1e9bd680156663055a6f185a5faca69,8330785c9980d941bab29ae076a6db86a0bbc97c,,f90a42e7f2cf5ed9742998c4692fce28ac487ecadad12315d48e5a849dce4c46,Tests_passed,cfce61083c42a4471bdebda5cd8d255ce282066e5067c0af88b8713ccdedc230,Tests_passed,True,True,True,True,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,5b700d3946e447c3eea43f2172289943ba7184e2223daef00b1acdde8813759d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,5a93dd881be840946613be17f93e4c6b232368c6979cfc6cf23666e590b058ae,Merge_failed,5a93dd881be840946613be17f93e4c6b232368c6979cfc6cf23666e590b058ae,Merge_failed,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Merge_failed,68d4043cccdbb551d8587931f4c7e2f9ccd85edb6fabcfb2e6dc272b36eb8ed3,0.014155387878417969,0.014150381088256836,0.01495051383972168,0.014797449111938477,0.015190839767456055,0.015030860900878906,0.015348196029663086,0.07494711875915527,0.019729137420654297,0.2552042007446289,0.25464534759521484,0.12360000610351562,1.2328314781188965,0.20912837982177734 +14,refs/heads/master,e43a4a1bda8dfa082dadd823d9b125c1b97e9378,46654b2fc1e9bd680156663055a6f185a5faca69,8330785c9980d941bab29ae076a6db86a0bbc97c,,f90a42e7f2cf5ed9742998c4692fce28ac487ecadad12315d48e5a849dce4c46,Tests_passed,cfce61083c42a4471bdebda5cd8d255ce282066e5067c0af88b8713ccdedc230,Tests_passed,True,True,True,True,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,5b700d3946e447c3eea43f2172289943ba7184e2223daef00b1acdde8813759d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,5a93dd881be840946613be17f93e4c6b232368c6979cfc6cf23666e590b058ae,Merge_failed,5a93dd881be840946613be17f93e4c6b232368c6979cfc6cf23666e590b058ae,Merge_failed,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Merge_failed,68d4043cccdbb551d8587931f4c7e2f9ccd85edb6fabcfb2e6dc272b36eb8ed3,0.014155387878417969,0.014150381088256836,0.01495051383972168,0.014797449111938477,0.015190839767456055,0.015030860900878906,0.015348196029663086,0.07494711875915527,0.019729137420654297,0.2556452751159668,0.2541182041168213,0.12360000610351562,1.2328314781188965,0.20912837982177734 diff --git a/results/combined/merges_timed/edwardcapriolo/nibiru.csv b/results/combined/merges_timed/edwardcapriolo/nibiru.csv index 22767787a9..eb8e526e77 100644 --- a/results/combined/merges_timed/edwardcapriolo/nibiru.csv +++ b/results/combined/merges_timed/edwardcapriolo/nibiru.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/heads/master,d4ad3fb0016120d5ff27b81f991adc2f98fff89a,9b75f2cf605b3da94473a9f7ab419ded5fbe43bb,6f38f28681cc5223d14ce5fe344c96ccdda32114,,True,True,9bc55f49034361ce4f416cdbf492b4719b35b22649d07f6fc4bb627c5f341112,Tests_passed,f2ea64a4377d3741da1193a261091344807606998fbc4af1d01ecdcdbb71c228,Tests_passed,True,True,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,0.030964374542236328,0.05541348457336426,0.04754233360290527,0.0469815731048584,0.05126166343688965,0.04294419288635254,0.051326751708984375,0.16785430908203125,0.03721284866333008,0.1508653163909912,0.15058541297912598,0.11601042747497559,0.9091708660125732,0.21470403671264648 +23,refs/heads/master,d4ad3fb0016120d5ff27b81f991adc2f98fff89a,9b75f2cf605b3da94473a9f7ab419ded5fbe43bb,6f38f28681cc5223d14ce5fe344c96ccdda32114,,True,True,9bc55f49034361ce4f416cdbf492b4719b35b22649d07f6fc4bb627c5f341112,Tests_passed,f2ea64a4377d3741da1193a261091344807606998fbc4af1d01ecdcdbb71c228,Tests_passed,True,True,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,0.030964374542236328,0.05541348457336426,0.04754233360290527,0.0469815731048584,0.05126166343688965,0.04294419288635254,0.051326751708984375,0.16785430908203125,0.03721284866333008,0.15126323699951172,0.15065479278564453,0.11601042747497559,0.9091708660125732,0.21470403671264648 diff --git a/results/combined/merges_timed/egineering-llc/collectd-fast-jmx.csv b/results/combined/merges_timed/egineering-llc/collectd-fast-jmx.csv index 7e1af25761..87d2553cdc 100644 --- a/results/combined/merges_timed/egineering-llc/collectd-fast-jmx.csv +++ b/results/combined/merges_timed/egineering-llc/collectd-fast-jmx.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,Tests_passed,True,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,0.036690473556518555,0.046187639236450195,0.044205427169799805,0.0417327880859375,0.046073198318481445,0.04022049903869629,0.046515464782714844,0.11889767646789551,0.03206491470336914,0.16726064682006836,0.16758489608764648,0.11903548240661621,1.0518982410430908,0.18531203269958496 +7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,Tests_passed,True,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,0.036690473556518555,0.046187639236450195,0.044205427169799805,0.0417327880859375,0.046073198318481445,0.04022049903869629,0.046515464782714844,0.11889767646789551,0.03206491470336914,0.15631341934204102,0.1575453281402588,0.11903548240661621,1.0518982410430908,0.18531203269958496 diff --git a/results/combined/merges_timed/ehcache/sizeof.csv b/results/combined/merges_timed/ehcache/sizeof.csv index fd1a3a6fe7..f9f101d5c6 100644 --- a/results/combined/merges_timed/ehcache/sizeof.csv +++ b/results/combined/merges_timed/ehcache/sizeof.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,0e8fcbf4ca3b391acc623d6d0c07908db180b4b6,f50d8bdf1403cb9855223cbe33ac479fa1606221,d632def2a5dae8f942dbc10546f2f0379387b088,,True,True,c0861911e4977f4a47d09ab8a73cd15979a92df7f966acbe3152eb3984807696,Tests_passed,b8be5c75a518f100d73e3ca0c25cd4ec9102ed9694f988c7ae3df48acd146342,Tests_passed,True,True,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,0.047981977462768555,0.04913783073425293,0.039585113525390625,0.0388333797454834,0.043399810791015625,0.047023773193359375,0.03549003601074219,0.17633891105651855,0.044112443923950195,0.15436100959777832,0.15501666069030762,0.11764001846313477,0.8777697086334229,0.2135484218597412 +3,refs/heads/master,0e8fcbf4ca3b391acc623d6d0c07908db180b4b6,f50d8bdf1403cb9855223cbe33ac479fa1606221,d632def2a5dae8f942dbc10546f2f0379387b088,,True,True,c0861911e4977f4a47d09ab8a73cd15979a92df7f966acbe3152eb3984807696,Tests_passed,b8be5c75a518f100d73e3ca0c25cd4ec9102ed9694f988c7ae3df48acd146342,Tests_passed,True,True,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,0.047981977462768555,0.04913783073425293,0.039585113525390625,0.0388333797454834,0.043399810791015625,0.047023773193359375,0.03549003601074219,0.17633891105651855,0.044112443923950195,0.15535855293273926,0.15895509719848633,0.11764001846313477,0.8777697086334229,0.2135484218597412 diff --git a/results/combined/merges_timed/einsamhauer/disthene-reader.csv b/results/combined/merges_timed/einsamhauer/disthene-reader.csv index 6a1f7385f2..e1607ceed0 100644 --- a/results/combined/merges_timed/einsamhauer/disthene-reader.csv +++ b/results/combined/merges_timed/einsamhauer/disthene-reader.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,8d8c28bd2a9238ebbc6ff483aa18b2632e27806b,abf2f0ef5b03fd5eaf513e5935f24ea6ed719e20,5bb6dc15f0e17f31029f175da1ab15c047bc9a4b,,True,True,548452c738e1fc81241c3aec5491614e904cb69fbb8bdba4a758db263fb1b9cf,Tests_passed,bc17cdfc30fdaea86c59f60630e2d6932f13c7c81f990e8619bd236c596b0c24,Tests_passed,True,True,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,7e470df946c6b43e8d7ec3bef02de56264c7f602a6f0e3619a64dca34d652c59,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,7e470df946c6b43e8d7ec3bef02de56264c7f602a6f0e3619a64dca34d652c59,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,d5fcbac7f846305c99c66cfdc5d20a8e7a2aaa93448b7905db01605b62b3dff2,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,d11d0d7aac9fd75bf001e787556d04173e54b167567a404e64c36a71639f3d4d,Merge_failed,d11d0d7aac9fd75bf001e787556d04173e54b167567a404e64c36a71639f3d4d,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,4523bcc9ac8da0c79930e42144bfabcde16915e1083e2eae214bdbfd14f21efa,Merge_failed,bb1c09b804eb62fe50e82c1b01c6948eee0baa6f841612b810ae915d75495b4f,0.027855873107910156,0.028504371643066406,0.030364990234375,0.030705690383911133,0.030994176864624023,0.031163692474365234,0.031351566314697266,0.18462419509887695,0.04306459426879883,1.0785961151123047,1.0811872482299805,0.5813229084014893,6.812468528747559,0.28835248947143555 +1,refs/heads/master,8d8c28bd2a9238ebbc6ff483aa18b2632e27806b,abf2f0ef5b03fd5eaf513e5935f24ea6ed719e20,5bb6dc15f0e17f31029f175da1ab15c047bc9a4b,,True,True,548452c738e1fc81241c3aec5491614e904cb69fbb8bdba4a758db263fb1b9cf,Tests_passed,bc17cdfc30fdaea86c59f60630e2d6932f13c7c81f990e8619bd236c596b0c24,Tests_passed,True,True,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,7e470df946c6b43e8d7ec3bef02de56264c7f602a6f0e3619a64dca34d652c59,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,7e470df946c6b43e8d7ec3bef02de56264c7f602a6f0e3619a64dca34d652c59,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,d5fcbac7f846305c99c66cfdc5d20a8e7a2aaa93448b7905db01605b62b3dff2,Merge_failed,d8791d3fe547402d5c65c404f6f6c7339f65ee2f8138d4dbf84b578c67665e99,Merge_failed,d11d0d7aac9fd75bf001e787556d04173e54b167567a404e64c36a71639f3d4d,Merge_failed,d11d0d7aac9fd75bf001e787556d04173e54b167567a404e64c36a71639f3d4d,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,4523bcc9ac8da0c79930e42144bfabcde16915e1083e2eae214bdbfd14f21efa,Merge_failed,bb1c09b804eb62fe50e82c1b01c6948eee0baa6f841612b810ae915d75495b4f,0.027855873107910156,0.028504371643066406,0.030364990234375,0.030705690383911133,0.030994176864624023,0.031163692474365234,0.031351566314697266,0.18462419509887695,0.04306459426879883,1.0807156562805176,1.0931990146636963,0.5813229084014893,6.812468528747559,0.28835248947143555 diff --git a/results/combined/merges_timed/einsamhauer/disthene.csv b/results/combined/merges_timed/einsamhauer/disthene.csv index a12b418c25..8dfd72058b 100644 --- a/results/combined/merges_timed/einsamhauer/disthene.csv +++ b/results/combined/merges_timed/einsamhauer/disthene.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,981e50d964a248b47b78104d0d9caf678e8abd81,efdf6e7a36f19e438ad2f1aa1803174b3b82b9cc,aee2eb5552e5e0723c23d8aa943b8c2a39fd3648,,671812d6d3b15e4a4445abe235ec243d84ae6e7e79e1e8a344912bb3800bfd2e,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,True,True,True,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,0.009107589721679688,0.00919651985168457,0.009766101837158203,0.009589433670043945,0.009645700454711914,0.00965118408203125,0.009425878524780273,0.03374361991882324,0.009129047393798828,0.16549158096313477,0.1670675277709961,0.06480002403259277,0.7571911811828613,0.153151273727417 +12,refs/heads/master,981e50d964a248b47b78104d0d9caf678e8abd81,efdf6e7a36f19e438ad2f1aa1803174b3b82b9cc,aee2eb5552e5e0723c23d8aa943b8c2a39fd3648,,671812d6d3b15e4a4445abe235ec243d84ae6e7e79e1e8a344912bb3800bfd2e,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,True,True,True,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,0.009107589721679688,0.00919651985168457,0.009766101837158203,0.009589433670043945,0.009645700454711914,0.00965118408203125,0.009425878524780273,0.03374361991882324,0.009129047393798828,0.16574907302856445,0.1632215976715088,0.06480002403259277,0.7571911811828613,0.153151273727417 diff --git a/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv b/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv index 19835edd47..058fc5c2c5 100644 --- a/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv +++ b/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -205,refs/remotes/origin/pull/553,16d0b92ccb95873464210ae627841b4891b78dbd,f353ca49b4893c7ec32bc95bf4ea54e7217cf8e2,7c7f71ea0a5bdea86e94a09d5ae684fcb59a9921,,True,True,85a6775a000c9ec94d2fdd1a3e003b44a03c4f7a74b0b20460b8124333982313,Tests_passed,070989b4b3a6b016bdbb4368e41adabb95b3a99e22ad1380c7c9a7887838e262,Tests_passed,True,True,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,cc5b84d1a170944705c42e3118b59f13fc54de897f70297d6162b7ce2586ac54,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,cc5b84d1a170944705c42e3118b59f13fc54de897f70297d6162b7ce2586ac54,Merge_failed,f22f4304afbb36719b23559ba2d6236f63bdbd727c626d0f815db3ad3d13c9d5,Merge_failed,f22f4304afbb36719b23559ba2d6236f63bdbd727c626d0f815db3ad3d13c9d5,Merge_failed,c369168b0b58b4db03c35b484678ffccdfd97b1ccde439990d2512269656146e,Merge_failed,4a238e7fcda0763d65e1cdeb1df25bc2217434622fce9e7a66f6cfe0bcbabd1f,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,d88bf703e791a25d58f7f951dd07644c2735bc6dc3c8cc809ea70572fbdb76c7,Merge_failed,95851fb994002e79b33f49469ca4e126e6dd35de36ede06f22782e762fa40765,Merge_failed,0a657adc0f119bb4474de150a3eaa09e1ad83bc9b1479b981623b8d02548da54,Merge_failed,7cefebbea769c9d816cfdb58a64a0dbc185b67dfb0191a4e6ab97f3e61c3791b,Merge_failed,679d76747806737201dd0eb0f4fb77c0af95eda8d23ef711a46f15520c3bde73,0.050534725189208984,0.057645320892333984,0.05497908592224121,0.04358100891113281,0.03913569450378418,0.04951119422912598,0.05612611770629883,0.5427734851837158,0.1367630958557129,0.2513916492462158,0.24916672706604004,0.4687974452972412,1.1047439575195312,0.22354769706726074 +205,refs/remotes/origin/pull/553,16d0b92ccb95873464210ae627841b4891b78dbd,f353ca49b4893c7ec32bc95bf4ea54e7217cf8e2,7c7f71ea0a5bdea86e94a09d5ae684fcb59a9921,,True,True,85a6775a000c9ec94d2fdd1a3e003b44a03c4f7a74b0b20460b8124333982313,Tests_passed,070989b4b3a6b016bdbb4368e41adabb95b3a99e22ad1380c7c9a7887838e262,Tests_passed,True,True,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,cc5b84d1a170944705c42e3118b59f13fc54de897f70297d6162b7ce2586ac54,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,cc5b84d1a170944705c42e3118b59f13fc54de897f70297d6162b7ce2586ac54,Merge_failed,f22f4304afbb36719b23559ba2d6236f63bdbd727c626d0f815db3ad3d13c9d5,Merge_failed,f22f4304afbb36719b23559ba2d6236f63bdbd727c626d0f815db3ad3d13c9d5,Merge_failed,c369168b0b58b4db03c35b484678ffccdfd97b1ccde439990d2512269656146e,Merge_failed,4a238e7fcda0763d65e1cdeb1df25bc2217434622fce9e7a66f6cfe0bcbabd1f,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,d88bf703e791a25d58f7f951dd07644c2735bc6dc3c8cc809ea70572fbdb76c7,Merge_failed,95851fb994002e79b33f49469ca4e126e6dd35de36ede06f22782e762fa40765,Merge_failed,0a657adc0f119bb4474de150a3eaa09e1ad83bc9b1479b981623b8d02548da54,Merge_failed,7cefebbea769c9d816cfdb58a64a0dbc185b67dfb0191a4e6ab97f3e61c3791b,Merge_failed,679d76747806737201dd0eb0f4fb77c0af95eda8d23ef711a46f15520c3bde73,0.050534725189208984,0.057645320892333984,0.05497908592224121,0.04358100891113281,0.03913569450378418,0.04951119422912598,0.05612611770629883,0.5427734851837158,0.1367630958557129,0.24812579154968262,0.2503700256347656,0.4687974452972412,1.1047439575195312,0.22354769706726074 diff --git a/results/combined/merges_timed/ekryd/sortpom.csv b/results/combined/merges_timed/ekryd/sortpom.csv index 390719d7f2..b6ccc19a48 100644 --- a/results/combined/merges_timed/ekryd/sortpom.csv +++ b/results/combined/merges_timed/ekryd/sortpom.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -85,refs/heads/master,f19edf0092007b36d73316707be71448afdc40cf,65db6732963f71b39434913dd4015b9fd96e9a20,64311fe38c9acefaec6dcd3ae2428168c0cb0441,,True,True,d548b7d60a51a877438902662082d6b568f9ad2cfe3b263786713b30a4ceff69,Tests_passed,4db3df2452de700e6b3009d88e249c8565c470c8f20fc92e260ce8282112f85d,Tests_passed,True,True,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,0.046096086502075195,0.03253674507141113,0.03606820106506348,0.04497218132019043,0.03765535354614258,0.05329108238220215,0.050581932067871094,0.1691133975982666,0.042430877685546875,0.16417717933654785,0.14510488510131836,0.12361860275268555,0.04256916046142578,0.20090055465698242 +85,refs/heads/master,f19edf0092007b36d73316707be71448afdc40cf,65db6732963f71b39434913dd4015b9fd96e9a20,64311fe38c9acefaec6dcd3ae2428168c0cb0441,,True,True,d548b7d60a51a877438902662082d6b568f9ad2cfe3b263786713b30a4ceff69,Tests_passed,4db3df2452de700e6b3009d88e249c8565c470c8f20fc92e260ce8282112f85d,Tests_passed,True,True,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,0.046096086502075195,0.03253674507141113,0.03606820106506348,0.04497218132019043,0.03765535354614258,0.05329108238220215,0.050581932067871094,0.1691133975982666,0.042430877685546875,0.1636645793914795,0.16383719444274902,0.12361860275268555,0.04256916046142578,0.20090055465698242 diff --git a/results/combined/merges_timed/ekt/biblio-transformation-engine.csv b/results/combined/merges_timed/ekt/biblio-transformation-engine.csv index 62f54950cf..25c8e308ba 100644 --- a/results/combined/merges_timed/ekt/biblio-transformation-engine.csv +++ b/results/combined/merges_timed/ekt/biblio-transformation-engine.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/remotes/origin/version-0.10.0,e1a8fcececc66007b4a770ff37f17a5eafe79718,e2cac286ffa6742f7365f3cd58f83038c0986451,a01da4c16a61a3e9e1de11655011de6c1ca71a5d,,True,True,487d31ee43db08b0917b31521a41d78f4394c1d23fbb64cb5db020086aa4c630,Tests_passed,a8d98f83950ad6acb0c5df1a951382458845fa670dc3a9dc5792d0253be1f3b5,Tests_passed,True,True,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,0892aa8ea8e411a83ddac03c373bf07c2e1c7af4a41c965f308efbc42fb23aed,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,Merge_failed,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,9fb627ac3b2d025075fabfa7e9b79c2d9e89bd37b2380ac52fd2b2beee4a4067,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,0.011239767074584961,0.011061429977416992,0.012454509735107422,0.012644290924072266,0.01262974739074707,0.012313604354858398,0.012330293655395508,0.07276320457458496,0.019519329071044922,0.16231298446655273,0.16166234016418457,0.23381328582763672,0.6087615489959717,0.17363476753234863 +9,refs/remotes/origin/version-0.10.0,e1a8fcececc66007b4a770ff37f17a5eafe79718,e2cac286ffa6742f7365f3cd58f83038c0986451,a01da4c16a61a3e9e1de11655011de6c1ca71a5d,,True,True,487d31ee43db08b0917b31521a41d78f4394c1d23fbb64cb5db020086aa4c630,Tests_passed,a8d98f83950ad6acb0c5df1a951382458845fa670dc3a9dc5792d0253be1f3b5,Tests_passed,True,True,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,0892aa8ea8e411a83ddac03c373bf07c2e1c7af4a41c965f308efbc42fb23aed,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,Merge_failed,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,9fb627ac3b2d025075fabfa7e9b79c2d9e89bd37b2380ac52fd2b2beee4a4067,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,0.011239767074584961,0.011061429977416992,0.012454509735107422,0.012644290924072266,0.01262974739074707,0.012313604354858398,0.012330293655395508,0.07276320457458496,0.019519329071044922,0.16093158721923828,0.15950655937194824,0.23381328582763672,0.6087615489959717,0.17363476753234863 diff --git a/results/combined/merges_timed/elasticjob/elastic-job-lite.csv b/results/combined/merges_timed/elasticjob/elastic-job-lite.csv index 60eb282f5c..c6fc427b49 100644 --- a/results/combined/merges_timed/elasticjob/elastic-job-lite.csv +++ b/results/combined/merges_timed/elasticjob/elastic-job-lite.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -196,refs/heads/master,ca929e12875190c9739c66d0586d76bfbf52be0e,b0f86b549a9a946f890d49fc14ec55b46cac745f,7bde7e573a551418194fd49e2a95f16007cf2647,,True,True,322f5399ded6e36bed80726b35b5f2dc9147a4ee86b6d898286aec454295e85e,Tests_passed,4bd834c1265abdb6cf7330fd34017a14e34c393d56d7cdc3a92e9eecba41b010,Tests_passed,True,True,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,1f675039b382eec1212139f222f0e05025433f6693183481528f0d9299cac0e6,Tests_passed,1f675039b382eec1212139f222f0e05025433f6693183481528f0d9299cac0e6,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,0.05277061462402344,0.051134347915649414,0.06899714469909668,0.05671429634094238,0.06684231758117676,0.049898386001586914,0.04941964149475098,0.1657397747039795,0.056996822357177734,0.1675269603729248,0.16875219345092773,0.1069793701171875,1.0078010559082031,0.36532068252563477 +196,refs/heads/master,ca929e12875190c9739c66d0586d76bfbf52be0e,b0f86b549a9a946f890d49fc14ec55b46cac745f,7bde7e573a551418194fd49e2a95f16007cf2647,,True,True,322f5399ded6e36bed80726b35b5f2dc9147a4ee86b6d898286aec454295e85e,Tests_passed,4bd834c1265abdb6cf7330fd34017a14e34c393d56d7cdc3a92e9eecba41b010,Tests_passed,True,True,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,1f675039b382eec1212139f222f0e05025433f6693183481528f0d9299cac0e6,Tests_passed,1f675039b382eec1212139f222f0e05025433f6693183481528f0d9299cac0e6,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,0.05277061462402344,0.051134347915649414,0.06899714469909668,0.05671429634094238,0.06684231758117676,0.049898386001586914,0.04941964149475098,0.1657397747039795,0.056996822357177734,0.16846919059753418,0.1644432544708252,0.1069793701171875,1.0078010559082031,0.36532068252563477 diff --git a/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv b/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv index 2f7fbac691..bba80ae9a6 100644 --- a/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv +++ b/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,293520399db5206524d7695f666682cf60ddf05f,da7c0a0c0d0f7ffd2766dda1f15d147bd41b5a03,2e44156f767570103439d8b484fcca031790d28a,,True,True,8b6a4e0cd1e494b230a33db9822d306e2e6b646db3c4e395b07ee348d3bac6b2,Tests_passed,4c45468c0045fce3d00a1f5759af9da8ec9b12ea7709a326e22a3ad8aeec4f46,Tests_passed,True,True,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,0.03738808631896973,0.045957326889038086,0.07046294212341309,0.04748415946960449,0.047400712966918945,0.05252528190612793,0.051419734954833984,0.14908790588378906,0.03508639335632324,0.17724847793579102,0.17682600021362305,0.09929585456848145,1.0610864162445068,0.1972048282623291 +20,refs/heads/master,293520399db5206524d7695f666682cf60ddf05f,da7c0a0c0d0f7ffd2766dda1f15d147bd41b5a03,2e44156f767570103439d8b484fcca031790d28a,,True,True,8b6a4e0cd1e494b230a33db9822d306e2e6b646db3c4e395b07ee348d3bac6b2,Tests_passed,4c45468c0045fce3d00a1f5759af9da8ec9b12ea7709a326e22a3ad8aeec4f46,Tests_passed,True,True,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,0.03738808631896973,0.045957326889038086,0.07046294212341309,0.04748415946960449,0.047400712966918945,0.05252528190612793,0.051419734954833984,0.14908790588378906,0.03508639335632324,0.174485445022583,0.17538905143737793,0.09929585456848145,1.0610864162445068,0.1972048282623291 diff --git a/results/combined/merges_timed/elisarver/selophane.csv b/results/combined/merges_timed/elisarver/selophane.csv index 9822e8828b..245aa2a9c5 100644 --- a/results/combined/merges_timed/elisarver/selophane.csv +++ b/results/combined/merges_timed/elisarver/selophane.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,56eb40e68919920ba7f973b114536e4620788ed5,9bfa023e2de211afa8960e0d54108439a72c3379,95e696bedd0c7d5f5b183791800a3aa271eb232f,,cef4989f2763609d5690282b0c2335cc2505a0ac36b81cefcb25a1bb2a09d0c0,Tests_passed,f54fed560023f8bd449a8d9c5010b8732c89e1e57aac2ad9207b7ee9ee93eaf3,Tests_passed,True,True,True,True,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,0.04115462303161621,0.03626418113708496,0.04663372039794922,0.042534828186035156,0.04269838333129883,0.04170703887939453,0.04449176788330078,0.16195106506347656,0.045401811599731445,0.16003012657165527,0.15903162956237793,0.10846519470214844,0.6390337944030762,0.18030929565429688 +1,refs/heads/master,56eb40e68919920ba7f973b114536e4620788ed5,9bfa023e2de211afa8960e0d54108439a72c3379,95e696bedd0c7d5f5b183791800a3aa271eb232f,,cef4989f2763609d5690282b0c2335cc2505a0ac36b81cefcb25a1bb2a09d0c0,Tests_passed,f54fed560023f8bd449a8d9c5010b8732c89e1e57aac2ad9207b7ee9ee93eaf3,Tests_passed,True,True,True,True,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,0.04115462303161621,0.03626418113708496,0.04663372039794922,0.042534828186035156,0.04269838333129883,0.04170703887939453,0.04449176788330078,0.16195106506347656,0.045401811599731445,0.15836787223815918,0.15673828125,0.10846519470214844,0.6390337944030762,0.18030929565429688 diff --git a/results/combined/merges_timed/elunez/eladmin.csv b/results/combined/merges_timed/elunez/eladmin.csv index b820d722e4..2a93d5cf2a 100644 --- a/results/combined/merges_timed/elunez/eladmin.csv +++ b/results/combined/merges_timed/elunez/eladmin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,5959c3fc62add874df2562d95d24dcaa569d3453,68608b28e34ffa73d12df74555e9dc7d63bfc532,837f23080b0cb1d2f055229e040b355fab53e3e5,,True,True,3b5be13efb0ae2990606734c9b61bc3962a231a443e3f7e2fbc18fc2a439cb2b,Tests_passed,49cce913d7e69d8b8d6fe6e75171664ec02ac761d31eda9160efbe132cb2b937,Tests_passed,True,True,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,fd1ca2df337a47240b9a5bc601b47b31d53946c97a2c304993c435a546b4df85,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,0.03778386116027832,0.043836116790771484,0.05174088478088379,0.03505659103393555,0.048101186752319336,0.05415701866149902,0.04845237731933594,0.266085147857666,0.10584115982055664,0.016210317611694336,0.01575303077697754,0.17467880249023438,0.04268646240234375,0.31183457374572754 +2,refs/heads/master,5959c3fc62add874df2562d95d24dcaa569d3453,68608b28e34ffa73d12df74555e9dc7d63bfc532,837f23080b0cb1d2f055229e040b355fab53e3e5,,True,True,3b5be13efb0ae2990606734c9b61bc3962a231a443e3f7e2fbc18fc2a439cb2b,Tests_passed,49cce913d7e69d8b8d6fe6e75171664ec02ac761d31eda9160efbe132cb2b937,Tests_passed,True,True,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,fd1ca2df337a47240b9a5bc601b47b31d53946c97a2c304993c435a546b4df85,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,0.03778386116027832,0.043836116790771484,0.05174088478088379,0.03505659103393555,0.048101186752319336,0.05415701866149902,0.04845237731933594,0.266085147857666,0.10584115982055664,0.00984334945678711,0.015622138977050781,0.17467880249023438,0.04268646240234375,0.31183457374572754 diff --git a/results/combined/merges_timed/emicklei/rendersnake.csv b/results/combined/merges_timed/emicklei/rendersnake.csv index 5ad61d197e..9f7eec8693 100644 --- a/results/combined/merges_timed/emicklei/rendersnake.csv +++ b/results/combined/merges_timed/emicklei/rendersnake.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,9541c886359597f23b41f86c5f5ca95dc4d59a51,eddec186e79131f4569769a86a0f9d9aaf2344b9,d238d52e4129a95a4a3f9314c4eab95f008955de,,True,True,378531769f40766716ac1acb132c5927c194fbc2ec68458723cc569a9486a04c,Tests_passed,f3a7559545782aedd0cd3fa04210190213db3796a482964b15128c1a8c0b2fd6,Tests_passed,True,True,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,0.0669562816619873,0.0765678882598877,0.08143997192382812,0.08855986595153809,0.07523989677429199,0.08072328567504883,0.07880496978759766,0.22412633895874023,0.05777740478515625,0.27822184562683105,0.2747182846069336,0.11698412895202637,2.9076600074768066,0.3300337791442871 +1,refs/heads/master,9541c886359597f23b41f86c5f5ca95dc4d59a51,eddec186e79131f4569769a86a0f9d9aaf2344b9,d238d52e4129a95a4a3f9314c4eab95f008955de,,True,True,378531769f40766716ac1acb132c5927c194fbc2ec68458723cc569a9486a04c,Tests_passed,f3a7559545782aedd0cd3fa04210190213db3796a482964b15128c1a8c0b2fd6,Tests_passed,True,True,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,0.0669562816619873,0.0765678882598877,0.08143997192382812,0.08855986595153809,0.07523989677429199,0.08072328567504883,0.07880496978759766,0.22412633895874023,0.05777740478515625,0.2689361572265625,0.27497172355651855,0.11698412895202637,2.9076600074768066,0.3300337791442871 diff --git a/results/combined/merges_timed/engine-alpha/engine-alpha.csv b/results/combined/merges_timed/engine-alpha/engine-alpha.csv index 1a9e00c665..39753425fe 100644 --- a/results/combined/merges_timed/engine-alpha/engine-alpha.csv +++ b/results/combined/merges_timed/engine-alpha/engine-alpha.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -54,refs/remotes/origin/pull/46,ac8d5c637116ce3b88e46a1b0c30fb182d93e49b,a5fcdfef0794ea44d7094526279857f614784f3f,a959ad427a8b29c48f2d7b68e5fe32240a3b4413,,True,True,00f2f2edaffc4af622c215fdf7bc3b8851d9be1bf38acda316222d9e3a90f5fa,Tests_passed,c960383e7a57030afff2d0ac1b8999f083a7187b4c80c274554600335a29ae62,Tests_passed,True,True,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,0.05210590362548828,0.010829687118530273,0.0750577449798584,0.05397224426269531,0.07459902763366699,0.07420802116394043,0.07422351837158203,0.12136220932006836,0.011023283004760742,0.16400766372680664,0.2021942138671875,0.10771298408508301,0.6795861721038818,0.21784710884094238 +54,refs/remotes/origin/pull/46,ac8d5c637116ce3b88e46a1b0c30fb182d93e49b,a5fcdfef0794ea44d7094526279857f614784f3f,a959ad427a8b29c48f2d7b68e5fe32240a3b4413,,True,True,00f2f2edaffc4af622c215fdf7bc3b8851d9be1bf38acda316222d9e3a90f5fa,Tests_passed,c960383e7a57030afff2d0ac1b8999f083a7187b4c80c274554600335a29ae62,Tests_passed,True,True,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,0.05210590362548828,0.010829687118530273,0.0750577449798584,0.05397224426269531,0.07459902763366699,0.07420802116394043,0.07422351837158203,0.12136220932006836,0.011023283004760742,0.19837498664855957,0.1989765167236328,0.10771298408508301,0.6795861721038818,0.21784710884094238 diff --git a/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv b/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv index 9aee266609..d812ed08d7 100644 --- a/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv +++ b/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/heads/develop,93c7adc9b131682ead437c867f95a1fc354d3333,eccecd447573468cb83867a7c5406809de2693e5,24a5c26a6f40b32f5cf20211fb1d455e3b4653b1,,True,True,a21eefb561e742d03b247b4615acf710d1682f58e717a30ea4582867de439653,Tests_passed,cb8916d8d080e09d6f8fd4a30789361c4b45076cb8d80f957ce88dd1c01ba711,Tests_passed,True,True,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,e8d66bd8a9eef3f2c94342ea32d3657220b6bbe15dcc7c8dc55f362fa17a480d,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Tests_failed,8f07702102076ea4dd683f02113ff5b2f6536be323b759a5e54e22072bd8c874,Tests_failed,8f07702102076ea4dd683f02113ff5b2f6536be323b759a5e54e22072bd8c874,Merge_failed,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,2ec50b1c116d3ad08c3af6052f20d758f29cb6b2d36fc8daecbafdbfb6e13d64,0.008908271789550781,0.008632421493530273,0.008543014526367188,0.008413553237915039,0.008449316024780273,0.008656978607177734,0.008474349975585938,0.05517172813415527,0.01339101791381836,0.3147006034851074,0.31497645378112793,0.17368555068969727,1.6673476696014404,0.16048789024353027 +27,refs/heads/develop,93c7adc9b131682ead437c867f95a1fc354d3333,eccecd447573468cb83867a7c5406809de2693e5,24a5c26a6f40b32f5cf20211fb1d455e3b4653b1,,True,True,a21eefb561e742d03b247b4615acf710d1682f58e717a30ea4582867de439653,Tests_passed,cb8916d8d080e09d6f8fd4a30789361c4b45076cb8d80f957ce88dd1c01ba711,Tests_passed,True,True,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,e8d66bd8a9eef3f2c94342ea32d3657220b6bbe15dcc7c8dc55f362fa17a480d,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Tests_failed,8f07702102076ea4dd683f02113ff5b2f6536be323b759a5e54e22072bd8c874,Tests_failed,8f07702102076ea4dd683f02113ff5b2f6536be323b759a5e54e22072bd8c874,Merge_failed,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,2ec50b1c116d3ad08c3af6052f20d758f29cb6b2d36fc8daecbafdbfb6e13d64,0.008908271789550781,0.008632421493530273,0.008543014526367188,0.008413553237915039,0.008449316024780273,0.008656978607177734,0.008474349975585938,0.05517172813415527,0.01339101791381836,0.3083808422088623,0.30962347984313965,0.17368555068969727,1.6673476696014404,0.16048789024353027 diff --git a/results/combined/merges_timed/entertailion/fling.csv b/results/combined/merges_timed/entertailion/fling.csv index d67bac051d..5d3a0739f7 100644 --- a/results/combined/merges_timed/entertailion/fling.csv +++ b/results/combined/merges_timed/entertailion/fling.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,e008cc1cee6c339a24627ec7e00cc5be46f916ee,3704388c693a2a7cd10d61bb994c0874d003afcb,a4124a4ad635d102c78fcfce196713a40477586f,,True,True,45da5b4c590a5bd7fee5cccca2d4dc1cef38870097cc473e0a841e0e45f1296f,Tests_passed,4ead57055be8e8c276029bd3541c33bcedb26fe32588dacbc5b49fffe1dc0ce1,Tests_passed,True,True,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,813b30cf0f9f06cc174315d02f85398d8b43702c0a6fa9eec079393f7bbb0627,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,5cac180d93e7e7e0b455fc9ba84ca87ac33792fa7e3a5752707bdec538c91631,Merge_failed,5cac180d93e7e7e0b455fc9ba84ca87ac33792fa7e3a5752707bdec538c91631,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,a00c977d01185d13230d2a2c8af05ad54cdb4065ffed5ce71dbd87cfc9b47497,0.03547406196594238,0.037618398666381836,0.049985647201538086,0.04739117622375488,0.04063534736633301,0.04838275909423828,0.04060220718383789,0.2010505199432373,0.08269619941711426,0.1509716510772705,0.16199278831481934,0.16841650009155273,2.0954716205596924,0.20455479621887207 +1,refs/heads/master,e008cc1cee6c339a24627ec7e00cc5be46f916ee,3704388c693a2a7cd10d61bb994c0874d003afcb,a4124a4ad635d102c78fcfce196713a40477586f,,True,True,45da5b4c590a5bd7fee5cccca2d4dc1cef38870097cc473e0a841e0e45f1296f,Tests_passed,4ead57055be8e8c276029bd3541c33bcedb26fe32588dacbc5b49fffe1dc0ce1,Tests_passed,True,True,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,813b30cf0f9f06cc174315d02f85398d8b43702c0a6fa9eec079393f7bbb0627,Merge_failed,282bded4063ab920dd6dad498fc4251890603c2d61b805c782f76baf9208480a,Merge_failed,5cac180d93e7e7e0b455fc9ba84ca87ac33792fa7e3a5752707bdec538c91631,Merge_failed,5cac180d93e7e7e0b455fc9ba84ca87ac33792fa7e3a5752707bdec538c91631,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,a00c977d01185d13230d2a2c8af05ad54cdb4065ffed5ce71dbd87cfc9b47497,0.03547406196594238,0.037618398666381836,0.049985647201538086,0.04739117622375488,0.04063534736633301,0.04838275909423828,0.04060220718383789,0.2010505199432373,0.08269619941711426,0.15235471725463867,0.1611940860748291,0.16841650009155273,2.0954716205596924,0.20455479621887207 diff --git a/results/combined/merges_timed/erudika/para.csv b/results/combined/merges_timed/erudika/para.csv index cca1baca93..4cdd2c3818 100644 --- a/results/combined/merges_timed/erudika/para.csv +++ b/results/combined/merges_timed/erudika/para.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,f23fd5855ed00257a78a115e484beec4b32bc3b5,5f848ab478afd2ee38622ecea00733f5dd70a1c8,ebb0518a083d5b7b53e8d1d86002c44f51a77fa2,,True,True,1a73eadb2df66b4bc004f3e0ba73027b5e977352eaaf7ec9fc5176838fb7d10b,Tests_passed,f90e628f0b86e045d6cdac71f155eeb351945fb2e67fa57e395e0c32daccb019,Tests_passed,True,True,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,0.020289897918701172,0.020859479904174805,0.025948524475097656,0.02567744255065918,0.025193214416503906,0.012307405471801758,0.025480985641479492,0.05709505081176758,0.020197629928588867,0.17706847190856934,0.17483830451965332,0.07608604431152344,1.0855302810668945,0.2149825096130371 +20,refs/heads/master,f23fd5855ed00257a78a115e484beec4b32bc3b5,5f848ab478afd2ee38622ecea00733f5dd70a1c8,ebb0518a083d5b7b53e8d1d86002c44f51a77fa2,,True,True,1a73eadb2df66b4bc004f3e0ba73027b5e977352eaaf7ec9fc5176838fb7d10b,Tests_passed,f90e628f0b86e045d6cdac71f155eeb351945fb2e67fa57e395e0c32daccb019,Tests_passed,True,True,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,0.020289897918701172,0.020859479904174805,0.025948524475097656,0.02567744255065918,0.025193214416503906,0.012307405471801758,0.025480985641479492,0.05709505081176758,0.020197629928588867,0.1738276481628418,0.17465972900390625,0.07608604431152344,1.0855302810668945,0.2149825096130371 diff --git a/results/combined/merges_timed/esapi/esapi-java-legacy.csv b/results/combined/merges_timed/esapi/esapi-java-legacy.csv index 5ddc6cdba2..c9aebbef69 100644 --- a/results/combined/merges_timed/esapi/esapi-java-legacy.csv +++ b/results/combined/merges_timed/esapi/esapi-java-legacy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -30,refs/heads/develop,0b0da0ce6155e38a0e4fc469b6911107e399b60c,77c5f26cbbf28c6c963cbabd4b1163ebaeed3a70,6452cc9eb369a4b8068a1327632606a1343749d2,,True,True,948738cf294ffc4276624b0a05a6d1e5fffc3b987c58b9b63fa5d829690d70f5,Tests_passed,83f61fce67d88c5b88d57799fdb0fd310e491f5e87792e568c956d0f376e8c8c,Tests_passed,True,True,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,01d8c4266b38e4d19c048b4c5b0be008bd308ec97d228052d0ce5562c0eedee4,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,01d8c4266b38e4d19c048b4c5b0be008bd308ec97d228052d0ce5562c0eedee4,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,4de5deda53ff5201afcb6eaf4ea311f883b5820f0da22596913abe4ffbe100a0,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,09fc4706bcdc5532f1a24da862320e0392e181863ad69d257a405118e5786013,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,0.07089614868164062,0.058800458908081055,0.058240652084350586,0.06850051879882812,0.04885530471801758,0.06300234794616699,0.045317649841308594,0.4621601104736328,0.0870215892791748,0.3421816825866699,0.3540194034576416,0.3727247714996338,0.047197580337524414,0.30724596977233887 +30,refs/heads/develop,0b0da0ce6155e38a0e4fc469b6911107e399b60c,77c5f26cbbf28c6c963cbabd4b1163ebaeed3a70,6452cc9eb369a4b8068a1327632606a1343749d2,,True,True,948738cf294ffc4276624b0a05a6d1e5fffc3b987c58b9b63fa5d829690d70f5,Tests_passed,83f61fce67d88c5b88d57799fdb0fd310e491f5e87792e568c956d0f376e8c8c,Tests_passed,True,True,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,01d8c4266b38e4d19c048b4c5b0be008bd308ec97d228052d0ce5562c0eedee4,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,01d8c4266b38e4d19c048b4c5b0be008bd308ec97d228052d0ce5562c0eedee4,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,4de5deda53ff5201afcb6eaf4ea311f883b5820f0da22596913abe4ffbe100a0,Merge_failed,8c528ce33f770eb0d9f5b7828140fbaa21c7da6860e177ecee107240ba701e68,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,09fc4706bcdc5532f1a24da862320e0392e181863ad69d257a405118e5786013,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,0.07089614868164062,0.058800458908081055,0.058240652084350586,0.06850051879882812,0.04885530471801758,0.06300234794616699,0.045317649841308594,0.4621601104736328,0.0870215892791748,0.34297990798950195,0.34345412254333496,0.3727247714996338,0.047197580337524414,0.30724596977233887 diff --git a/results/combined/merges_timed/eskatos/asadmin.csv b/results/combined/merges_timed/eskatos/asadmin.csv index d95f862a12..4cd709f9c7 100644 --- a/results/combined/merges_timed/eskatos/asadmin.csv +++ b/results/combined/merges_timed/eskatos/asadmin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,6fb154963dfd021025038412792ef1dcc5399017,9c8a4553a27a6f727e039fbddd1cf9d32c173368,0383186b3106763ba62c548ef170fc26149839c4,,1ac65393efa5367508a3c7738d8dd00f346a52724489864da6d80e2893f9b065,Tests_passed,14faa9c7f724b81054087c29a30b315459988d6c6c44d10079bd3a1c0d1dce4d,Tests_passed,True,True,True,True,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,104b4d6664a1138347f16778aa9aee07c1c10dc8ad7bb6b594053f50cf0564d1,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,f99d246ac7fb803dd06e3503dc551d92c1bbeca138812fbba2b711d901b15c68,Merge_failed,f99d246ac7fb803dd06e3503dc551d92c1bbeca138812fbba2b711d901b15c68,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_failed,a2f61fbe879efce59e8aa2bd3afddbd2592f298dcabd95569a264694cb1a3b2b,0.010306835174560547,0.010768413543701172,0.010613441467285156,0.010736703872680664,0.010295391082763672,0.010524749755859375,0.010573863983154297,0.060010671615600586,0.01505899429321289,0.3439362049102783,0.34268641471862793,0.17683839797973633,1.5466187000274658,0.18549299240112305 +3,refs/heads/master,6fb154963dfd021025038412792ef1dcc5399017,9c8a4553a27a6f727e039fbddd1cf9d32c173368,0383186b3106763ba62c548ef170fc26149839c4,,1ac65393efa5367508a3c7738d8dd00f346a52724489864da6d80e2893f9b065,Tests_passed,14faa9c7f724b81054087c29a30b315459988d6c6c44d10079bd3a1c0d1dce4d,Tests_passed,True,True,True,True,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,104b4d6664a1138347f16778aa9aee07c1c10dc8ad7bb6b594053f50cf0564d1,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,f99d246ac7fb803dd06e3503dc551d92c1bbeca138812fbba2b711d901b15c68,Merge_failed,f99d246ac7fb803dd06e3503dc551d92c1bbeca138812fbba2b711d901b15c68,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_failed,a2f61fbe879efce59e8aa2bd3afddbd2592f298dcabd95569a264694cb1a3b2b,0.010306835174560547,0.010768413543701172,0.010613441467285156,0.010736703872680664,0.010295391082763672,0.010524749755859375,0.010573863983154297,0.060010671615600586,0.01505899429321289,0.3447442054748535,0.34707045555114746,0.17683839797973633,1.5466187000274658,0.18549299240112305 diff --git a/results/combined/merges_timed/esotericsoftware/kryo.csv b/results/combined/merges_timed/esotericsoftware/kryo.csv index 5e190b52d7..6d4e4c6761 100644 --- a/results/combined/merges_timed/esotericsoftware/kryo.csv +++ b/results/combined/merges_timed/esotericsoftware/kryo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/heads/master,36b366102c717919d4d4b91451daa2e81f7416e9,cd0da250d97a7d1b0207db6df16d740fc6d3f70f,c2a94b46ff658505a1ecdd047a22bef4886573c5,,d8491a3920b0a3df8e37b0d86af3d60ad3ef4b4b54f103d5e50c5a2c943fbc63,Tests_passed,8d64f424f4f3be82660510152c07e5b182a15f60686232daa2a341adb9ddc8eb,Tests_passed,True,True,True,True,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,0.04732084274291992,0.05895113945007324,0.014632940292358398,0.0582273006439209,0.032381296157836914,0.014791727066040039,0.06124591827392578,0.2399277687072754,0.0408024787902832,0.4017980098724365,0.41942906379699707,0.14506936073303223,3.589958667755127,0.2883291244506836 +19,refs/heads/master,36b366102c717919d4d4b91451daa2e81f7416e9,cd0da250d97a7d1b0207db6df16d740fc6d3f70f,c2a94b46ff658505a1ecdd047a22bef4886573c5,,d8491a3920b0a3df8e37b0d86af3d60ad3ef4b4b54f103d5e50c5a2c943fbc63,Tests_passed,8d64f424f4f3be82660510152c07e5b182a15f60686232daa2a341adb9ddc8eb,Tests_passed,True,True,True,True,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,0.04732084274291992,0.05895113945007324,0.014632940292358398,0.0582273006439209,0.032381296157836914,0.014791727066040039,0.06124591827392578,0.2399277687072754,0.0408024787902832,0.4168100357055664,0.40471792221069336,0.14506936073303223,3.589958667755127,0.2883291244506836 diff --git a/results/combined/merges_timed/evil-co/nbt-lib.csv b/results/combined/merges_timed/evil-co/nbt-lib.csv index f8b4149425..4cbbf48e82 100644 --- a/results/combined/merges_timed/evil-co/nbt-lib.csv +++ b/results/combined/merges_timed/evil-co/nbt-lib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,637ae9e87d7feae16db8dcb39b5d40ada9950583,5114126caf920b3f91194892f3812cc1de4d71a7,06e34c4a95cf30b65feaaf9c3803a9071af42180,,a6eccb8f88bbffcd341121c2fa8103534e9e9268e97a1b114ac1119fdc3a9cbd,Tests_passed,da025bd2ac4a52ad189aee1eeedb6c4573cc9f9808490d42f95f2aa37321e16e,Tests_passed,True,True,True,True,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,0.041155338287353516,0.04185056686401367,0.0459592342376709,0.04661083221435547,0.039780616760253906,0.04795503616333008,0.04665517807006836,0.1615607738494873,0.0407257080078125,0.1536550521850586,0.15214014053344727,0.10815644264221191,0.6474430561065674,0.19756412506103516 +1,refs/heads/master,637ae9e87d7feae16db8dcb39b5d40ada9950583,5114126caf920b3f91194892f3812cc1de4d71a7,06e34c4a95cf30b65feaaf9c3803a9071af42180,,a6eccb8f88bbffcd341121c2fa8103534e9e9268e97a1b114ac1119fdc3a9cbd,Tests_passed,da025bd2ac4a52ad189aee1eeedb6c4573cc9f9808490d42f95f2aa37321e16e,Tests_passed,True,True,True,True,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,0.041155338287353516,0.04185056686401367,0.0459592342376709,0.04661083221435547,0.039780616760253906,0.04795503616333008,0.04665517807006836,0.1615607738494873,0.0407257080078125,0.15038609504699707,0.1491374969482422,0.10815644264221191,0.6474430561065674,0.19756412506103516 diff --git a/results/combined/merges_timed/evolute-pt/dbtransfer.csv b/results/combined/merges_timed/evolute-pt/dbtransfer.csv index 830d302c5f..e196e17e46 100644 --- a/results/combined/merges_timed/evolute-pt/dbtransfer.csv +++ b/results/combined/merges_timed/evolute-pt/dbtransfer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/remotes/origin/pull/14,4f86b711a6e540041abc183eabc4592e211cfcf8,b1a2e5cb5c94b95c6604d080ac3471fb15305b4a,b660bb89c629f2ece0737128ea94e140ec06fbc0,,True,True,a71352f49d3419dab667d2e40e17c40a532d28f2e06bdd32bb17e824ef6caa3e,Tests_passed,184660a7f31b1e22fad3e93100deff29b2ed6a5a730cd29fbdd3eaf9c3875e26,Tests_passed,True,True,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,0.03874540328979492,0.039444923400878906,0.04325580596923828,0.047277212142944336,0.04201626777648926,0.04303312301635742,0.053762197494506836,0.16734933853149414,0.04203677177429199,0.16094374656677246,0.16161608695983887,0.11022281646728516,0.7466912269592285,0.21680212020874023 +11,refs/remotes/origin/pull/14,4f86b711a6e540041abc183eabc4592e211cfcf8,b1a2e5cb5c94b95c6604d080ac3471fb15305b4a,b660bb89c629f2ece0737128ea94e140ec06fbc0,,True,True,a71352f49d3419dab667d2e40e17c40a532d28f2e06bdd32bb17e824ef6caa3e,Tests_passed,184660a7f31b1e22fad3e93100deff29b2ed6a5a730cd29fbdd3eaf9c3875e26,Tests_passed,True,True,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,0.03874540328979492,0.039444923400878906,0.04325580596923828,0.047277212142944336,0.04201626777648926,0.04303312301635742,0.053762197494506836,0.16734933853149414,0.04203677177429199,0.16030049324035645,0.15920639038085938,0.11022281646728516,0.7466912269592285,0.21680212020874023 diff --git a/results/combined/merges_timed/facebook/jcommon.csv b/results/combined/merges_timed/facebook/jcommon.csv index 2796a50280..4498468d74 100644 --- a/results/combined/merges_timed/facebook/jcommon.csv +++ b/results/combined/merges_timed/facebook/jcommon.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,a6c08d81e3186d83a020f84b01b134fc48f3822a,11b32f0c28057eedf224655fa2019b0c3fb19536,6ccd11e9354e9c0ea8f9f329e658a69f1af5a610,,True,True,5468675109d3dfa10e88e500bc51a153c17161b39f5b41e9dbd65f2c606d8303,Tests_passed,384911a66b6903164e7bfc2476520ea51a4bcf77ac3e2b1cbb65bbbecd4a58a3,Tests_passed,True,True,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,16a39e290497f1fae06693e9497c892265abe35552eb0b2765ad2bce037fe1ff,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,78706856331a66e642d8dadaca9f5ab7dc5c623db0c48299979a4d7f1856ce04,Merge_failed,78706856331a66e642d8dadaca9f5ab7dc5c623db0c48299979a4d7f1856ce04,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,393c6952d1b8f7123bf8886830538d2d803ffbea86ca376ea51b75715e701853,0.0442960262298584,0.0422205924987793,0.04870772361755371,0.04498291015625,0.04713320732116699,0.041602373123168945,0.04898428916931152,0.18981480598449707,0.07846283912658691,0.0660545825958252,0.06623697280883789,0.11458325386047363,0.37732839584350586,0.3493485450744629 +3,refs/heads/master,a6c08d81e3186d83a020f84b01b134fc48f3822a,11b32f0c28057eedf224655fa2019b0c3fb19536,6ccd11e9354e9c0ea8f9f329e658a69f1af5a610,,True,True,5468675109d3dfa10e88e500bc51a153c17161b39f5b41e9dbd65f2c606d8303,Tests_passed,384911a66b6903164e7bfc2476520ea51a4bcf77ac3e2b1cbb65bbbecd4a58a3,Tests_passed,True,True,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,16a39e290497f1fae06693e9497c892265abe35552eb0b2765ad2bce037fe1ff,Merge_failed,be39deb281ce19a7ee8d5161683afe4e22798df4c7af23deeafe5be3b38e774a,Merge_failed,78706856331a66e642d8dadaca9f5ab7dc5c623db0c48299979a4d7f1856ce04,Merge_failed,78706856331a66e642d8dadaca9f5ab7dc5c623db0c48299979a4d7f1856ce04,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,393c6952d1b8f7123bf8886830538d2d803ffbea86ca376ea51b75715e701853,0.0442960262298584,0.0422205924987793,0.04870772361755371,0.04498291015625,0.04713320732116699,0.041602373123168945,0.04898428916931152,0.18981480598449707,0.07846283912658691,0.07764506340026855,0.07742595672607422,0.11458325386047363,0.37732839584350586,0.3493485450744629 diff --git a/results/combined/merges_timed/farin/jcloisterzone.csv b/results/combined/merges_timed/farin/jcloisterzone.csv index 7b3cd0bf12..dfbd9d4c87 100644 --- a/results/combined/merges_timed/farin/jcloisterzone.csv +++ b/results/combined/merges_timed/farin/jcloisterzone.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -162,refs/remotes/origin/pull/424,692611d036c53048b40f0ae2e2dfc355fc6857d5,f300fd0e0191b01f896285e63d3e2cb20365b462,7b111ccf25aec8ad2ffa2c9aa38e029afb307c67,,True,True,922784f72bcff874542607f5a4edfc07a3be2fa5541f0c6b5b5c6bae508dc338,Tests_passed,c41f92820892fd717eac1eb9a78e25cf063ef79c40a4b86980d2189f70a25940,Tests_passed,True,True,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,654798721271c96a6790e9e71be8f11031403c1058bb4f4a23097e0502912c79,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,183febe649f23b8901fb4d8a8f0b7f966501ed4ca03edd2b4d7b2c5c27067541,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,6c5f1518a111ae956838277db7e132ec3b679d66ac63be71273c4cf3ccba0489,Merge_failed,6c5f1518a111ae956838277db7e132ec3b679d66ac63be71273c4cf3ccba0489,Merge_failed,d77caf5d78ae728513560fb3846d0e7504aee147ffbf31533ce162a4b0d28c54,Merge_failed,e01a0849c459a33108e4febafdae718dd421d6cafae5cedf7b69a1ecb0a5c5e6,Merge_failed,e01a0849c459a33108e4febafdae718dd421d6cafae5cedf7b69a1ecb0a5c5e6,0.03763532638549805,0.04555106163024902,0.0268862247467041,0.04899787902832031,0.03435039520263672,0.058196067810058594,0.040975332260131836,0.5269646644592285,0.10613131523132324,0.6702983379364014,0.6834616661071777,0.3893575668334961,0.04566621780395508,0.4764585494995117 +162,refs/remotes/origin/pull/424,692611d036c53048b40f0ae2e2dfc355fc6857d5,f300fd0e0191b01f896285e63d3e2cb20365b462,7b111ccf25aec8ad2ffa2c9aa38e029afb307c67,,True,True,922784f72bcff874542607f5a4edfc07a3be2fa5541f0c6b5b5c6bae508dc338,Tests_passed,c41f92820892fd717eac1eb9a78e25cf063ef79c40a4b86980d2189f70a25940,Tests_passed,True,True,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,654798721271c96a6790e9e71be8f11031403c1058bb4f4a23097e0502912c79,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,183febe649f23b8901fb4d8a8f0b7f966501ed4ca03edd2b4d7b2c5c27067541,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,6c5f1518a111ae956838277db7e132ec3b679d66ac63be71273c4cf3ccba0489,Merge_failed,6c5f1518a111ae956838277db7e132ec3b679d66ac63be71273c4cf3ccba0489,Merge_failed,d77caf5d78ae728513560fb3846d0e7504aee147ffbf31533ce162a4b0d28c54,Merge_failed,e01a0849c459a33108e4febafdae718dd421d6cafae5cedf7b69a1ecb0a5c5e6,Merge_failed,e01a0849c459a33108e4febafdae718dd421d6cafae5cedf7b69a1ecb0a5c5e6,0.03763532638549805,0.04555106163024902,0.0268862247467041,0.04899787902832031,0.03435039520263672,0.058196067810058594,0.040975332260131836,0.5269646644592285,0.10613131523132324,0.673649787902832,0.6681866645812988,0.3893575668334961,0.04566621780395508,0.4764585494995117 diff --git a/results/combined/merges_timed/fasseg/exp4j.csv b/results/combined/merges_timed/fasseg/exp4j.csv index 8cdab791c2..885e272fa3 100644 --- a/results/combined/merges_timed/fasseg/exp4j.csv +++ b/results/combined/merges_timed/fasseg/exp4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,15b49d5d40377b24b54bee4a471f08c883e766d2,fbb3fbee150c17f024f199f5d9e2af4fa20703d4,3bada4e6c2bf4d0ebff48bfadd83af396b08696e,,True,True,f590985f298f0dd963d16428e619bd365719c4c4cd11f5334a4b6be0614a206c,Tests_passed,f523669315bc819e4dc25fe4c1d51d9ada4748303b60a3ab186be5500748adb0,Tests_passed,True,True,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,0.03407907485961914,0.03773760795593262,0.041219472885131836,0.045870304107666016,0.04759716987609863,0.04812335968017578,0.04000091552734375,0.16980814933776855,0.04103398323059082,0.15064597129821777,0.15112733840942383,0.1086575984954834,0.8141613006591797,0.1997220516204834 +7,refs/heads/master,15b49d5d40377b24b54bee4a471f08c883e766d2,fbb3fbee150c17f024f199f5d9e2af4fa20703d4,3bada4e6c2bf4d0ebff48bfadd83af396b08696e,,True,True,f590985f298f0dd963d16428e619bd365719c4c4cd11f5334a4b6be0614a206c,Tests_passed,f523669315bc819e4dc25fe4c1d51d9ada4748303b60a3ab186be5500748adb0,Tests_passed,True,True,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,0.03407907485961914,0.03773760795593262,0.041219472885131836,0.045870304107666016,0.04759716987609863,0.04812335968017578,0.04000091552734375,0.16980814933776855,0.04103398323059082,0.14873909950256348,0.14835524559020996,0.1086575984954834,0.8141613006591797,0.1997220516204834 diff --git a/results/combined/merges_timed/fasterxml/aalto-xml.csv b/results/combined/merges_timed/fasterxml/aalto-xml.csv index 4b3eac33df..cbcbafad5b 100644 --- a/results/combined/merges_timed/fasterxml/aalto-xml.csv +++ b/results/combined/merges_timed/fasterxml/aalto-xml.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,54a12f2108b75732fa22fa0cfaa5853a3ee2e014,31da778078ca3624abe46673529e50b4d41c327c,f93f3ccfa0cfc2e96c41a451acbcf17f16d28ec9,,True,True,7cc2fe66c6b2aca9da8f23877d414c4bea43bfdab3b32338988fc0cda4cf2e40,Tests_passed,bbc497b7aaaccb351a2bdced2042511ab13ed08e55de4a299c157df7300d5436,Tests_passed,True,True,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,0.052812814712524414,0.045949697494506836,0.04802393913269043,0.04325723648071289,0.05816173553466797,0.04066300392150879,0.0443880558013916,0.23908758163452148,0.03922843933105469,0.4037783145904541,0.4036686420440674,0.17162108421325684,3.8509085178375244,0.2742171287536621 +10,refs/heads/master,54a12f2108b75732fa22fa0cfaa5853a3ee2e014,31da778078ca3624abe46673529e50b4d41c327c,f93f3ccfa0cfc2e96c41a451acbcf17f16d28ec9,,True,True,7cc2fe66c6b2aca9da8f23877d414c4bea43bfdab3b32338988fc0cda4cf2e40,Tests_passed,bbc497b7aaaccb351a2bdced2042511ab13ed08e55de4a299c157df7300d5436,Tests_passed,True,True,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,0.052812814712524414,0.045949697494506836,0.04802393913269043,0.04325723648071289,0.05816173553466797,0.04066300392150879,0.0443880558013916,0.23908758163452148,0.03922843933105469,0.39328908920288086,0.390688419342041,0.17162108421325684,3.8509085178375244,0.2742171287536621 diff --git a/results/combined/merges_timed/fasterxml/jackson-annotations.csv b/results/combined/merges_timed/fasterxml/jackson-annotations.csv index 371a5e0c81..af1e2c103d 100644 --- a/results/combined/merges_timed/fasterxml/jackson-annotations.csv +++ b/results/combined/merges_timed/fasterxml/jackson-annotations.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,Tests_passed,True,True,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,f38c2638018aabb2313ad76237ab33586d29878ff9f7322495cf9eac4bac5302,Tests_passed,f38c2638018aabb2313ad76237ab33586d29878ff9f7322495cf9eac4bac5302,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,0.010640382766723633,0.01096796989440918,0.011872529983520508,0.011841773986816406,0.011618614196777344,0.011550426483154297,0.011851072311401367,0.05150318145751953,0.010612010955810547,0.31362438201904297,0.3139193058013916,0.1224527359008789,1.7738518714904785,0.17120075225830078 +58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,Tests_passed,True,True,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,f38c2638018aabb2313ad76237ab33586d29878ff9f7322495cf9eac4bac5302,Tests_passed,f38c2638018aabb2313ad76237ab33586d29878ff9f7322495cf9eac4bac5302,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,0.010640382766723633,0.01096796989440918,0.011872529983520508,0.011841773986816406,0.011618614196777344,0.011550426483154297,0.011851072311401367,0.05150318145751953,0.010612010955810547,0.30911946296691895,0.3113229274749756,0.1224527359008789,1.7738518714904785,0.17120075225830078 diff --git a/results/combined/merges_timed/fasterxml/jackson-core.csv b/results/combined/merges_timed/fasterxml/jackson-core.csv index 65727f48c5..c688418e84 100644 --- a/results/combined/merges_timed/fasterxml/jackson-core.csv +++ b/results/combined/merges_timed/fasterxml/jackson-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -473,refs/remotes/origin/master,5b91c61a84864ef5e54e6143503fd85dad25a794,36dc9e8e50a91a37252dba924a1524a9bfee7418,d5673d2e9ffa1357bad7bc3665051245447a47ce,,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Tests_passed,f77dd6121cd4fed9400db3247faa88a8d0ba19bee20f21e1387950cf257deab9,Tests_passed,True,True,True,True,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Tests_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Tests_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,0.05623579025268555,0.0497894287109375,0.11711692810058594,0.12558984756469727,0.1167449951171875,0.12534213066101074,0.11791825294494629,0.09070348739624023,0.07138204574584961,0.05381345748901367,0.04724860191345215,0.05678963661193848,0.060007333755493164,0.5344605445861816 +473,refs/remotes/origin/master,5b91c61a84864ef5e54e6143503fd85dad25a794,36dc9e8e50a91a37252dba924a1524a9bfee7418,d5673d2e9ffa1357bad7bc3665051245447a47ce,,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Tests_passed,f77dd6121cd4fed9400db3247faa88a8d0ba19bee20f21e1387950cf257deab9,Tests_passed,True,True,True,True,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Tests_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Tests_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,0.05623579025268555,0.0497894287109375,0.11711692810058594,0.12558984756469727,0.1167449951171875,0.12534213066101074,0.11791825294494629,0.09070348739624023,0.07138204574584961,0.04696083068847656,0.05385446548461914,0.05678963661193848,0.060007333755493164,0.5344605445861816 diff --git a/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv b/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv index dd824312f2..ad64536bfc 100644 --- a/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv +++ b/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,8a73a14551e402c3993e2ecd2c690bf54c5e2134,a893c4c717b1e36e2d29ea61c96d8e7a159298bc,5ec8c0022a993aeaa66f992d59f7578225111410,,9162c70845c55c9e4a78b2f48740e15cda68591c4ba2858dae89b731c87e16f1,Tests_passed,a94f18403d255016df80f52abb023e38b18deb3f07fcdee3a3608bc51353ffdb,Tests_passed,True,True,True,True,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,0db9792b9324881ccd553cb1284e392659a69f1531cd3e24556265f6be1272c8,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,0db9792b9324881ccd553cb1284e392659a69f1531cd3e24556265f6be1272c8,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,f9d6021a68f179b99ab2ba6964576393b7350df48818911d477af5744e3f21d3,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,871f849e0f8f1c1acb5ce688cebd439a54da0bc1dc471e9c64c5b18078cc5b6d,Merge_failed,871f849e0f8f1c1acb5ce688cebd439a54da0bc1dc471e9c64c5b18078cc5b6d,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,d44c7fc8b3cd2a645685592547c781a5f6cfa8954134e03b51ac5dd56bbad609,Merge_failed,33ee68a1168f928c7c5ed4cda524cd4a18ee1be7b640b27781c84a1ef5f5ce34,0.04259347915649414,0.04248166084289551,0.04180598258972168,0.04625368118286133,0.04710721969604492,0.04637885093688965,0.04692697525024414,0.2886543273925781,0.0891103744506836,0.06898212432861328,0.07079625129699707,0.22918128967285156,0.5585448741912842,0.20674848556518555 +9,refs/heads/master,8a73a14551e402c3993e2ecd2c690bf54c5e2134,a893c4c717b1e36e2d29ea61c96d8e7a159298bc,5ec8c0022a993aeaa66f992d59f7578225111410,,9162c70845c55c9e4a78b2f48740e15cda68591c4ba2858dae89b731c87e16f1,Tests_passed,a94f18403d255016df80f52abb023e38b18deb3f07fcdee3a3608bc51353ffdb,Tests_passed,True,True,True,True,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,0db9792b9324881ccd553cb1284e392659a69f1531cd3e24556265f6be1272c8,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,0db9792b9324881ccd553cb1284e392659a69f1531cd3e24556265f6be1272c8,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,f9d6021a68f179b99ab2ba6964576393b7350df48818911d477af5744e3f21d3,Merge_failed,f3359df4d71ea6d762c40dde43a0809c82dd5690485d9e3837069ffd90068380,Merge_failed,871f849e0f8f1c1acb5ce688cebd439a54da0bc1dc471e9c64c5b18078cc5b6d,Merge_failed,871f849e0f8f1c1acb5ce688cebd439a54da0bc1dc471e9c64c5b18078cc5b6d,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,d44c7fc8b3cd2a645685592547c781a5f6cfa8954134e03b51ac5dd56bbad609,Merge_failed,33ee68a1168f928c7c5ed4cda524cd4a18ee1be7b640b27781c84a1ef5f5ce34,0.04259347915649414,0.04248166084289551,0.04180598258972168,0.04625368118286133,0.04710721969604492,0.04637885093688965,0.04692697525024414,0.2886543273925781,0.0891103744506836,0.06620216369628906,0.06637954711914062,0.22918128967285156,0.5585448741912842,0.20674848556518555 diff --git a/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv b/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv index 147106d4d6..77ad628ce1 100644 --- a/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv +++ b/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,a671acb0bbd66df72cb8acd9885801b47063dd75,c3979dd1f7ac324d66110da1447e9b27bc8b6ad6,0caaef68fc59d26cd32a6f4a2395f54f63630485,,870c680dfaa9fdf6988d23aaf3ad22c63aab7cedefc74e2ae081a11c7b3b2519,Tests_passed,3f48bed992736c6a5c121660c706e069a230dcfa7def2eefa1f716b3af13aaab,Tests_passed,True,True,True,True,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,0.046172380447387695,0.04979991912841797,0.030727386474609375,0.036096811294555664,0.06687474250793457,0.05330061912536621,0.03483128547668457,0.1909496784210205,0.028511762619018555,0.19427013397216797,0.19447016716003418,0.09320974349975586,1.6412174701690674,0.1688709259033203 +6,refs/heads/master,a671acb0bbd66df72cb8acd9885801b47063dd75,c3979dd1f7ac324d66110da1447e9b27bc8b6ad6,0caaef68fc59d26cd32a6f4a2395f54f63630485,,870c680dfaa9fdf6988d23aaf3ad22c63aab7cedefc74e2ae081a11c7b3b2519,Tests_passed,3f48bed992736c6a5c121660c706e069a230dcfa7def2eefa1f716b3af13aaab,Tests_passed,True,True,True,True,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,0.046172380447387695,0.04979991912841797,0.030727386474609375,0.036096811294555664,0.06687474250793457,0.05330061912536621,0.03483128547668457,0.1909496784210205,0.028511762619018555,0.19280600547790527,0.1921539306640625,0.09320974349975586,1.6412174701690674,0.1688709259033203 diff --git a/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv b/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv index b9a87c896b..3ffa4dfbaf 100644 --- a/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv +++ b/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -140,refs/heads/2.17,fc385bcdf62f4f3d6cd64470fad796be36bcd449,0d30430d78918a3e01bec62a5192a584cc56ce88,09db8e1ce1d2ecf0ad4ad4b0d8335999f42577be,,True,True,3119c49e4ec878189770b999aa0bf5f6f53ba26b2dfcb0bce391d3538e69bf40,Tests_passed,9588420cd4abc570bec4f2c72bf54597076d6efa6c9c796e25f877ae5fec74ad,Tests_passed,True,True,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4747bc5022457ea9769707ed4704badf2abae9f170fe5f1e1e12aff581a47bbf,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,0.04932236671447754,0.03835940361022949,0.03412175178527832,0.05112648010253906,0.039725303649902344,0.021155834197998047,0.049341678619384766,0.2911391258239746,0.07218408584594727,0.1719646453857422,0.17237472534179688,0.23578786849975586,0.04774022102355957,0.22610259056091309 +140,refs/heads/2.17,fc385bcdf62f4f3d6cd64470fad796be36bcd449,0d30430d78918a3e01bec62a5192a584cc56ce88,09db8e1ce1d2ecf0ad4ad4b0d8335999f42577be,,True,True,3119c49e4ec878189770b999aa0bf5f6f53ba26b2dfcb0bce391d3538e69bf40,Tests_passed,9588420cd4abc570bec4f2c72bf54597076d6efa6c9c796e25f877ae5fec74ad,Tests_passed,True,True,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4747bc5022457ea9769707ed4704badf2abae9f170fe5f1e1e12aff581a47bbf,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,0.04932236671447754,0.03835940361022949,0.03412175178527832,0.05112648010253906,0.039725303649902344,0.021155834197998047,0.049341678619384766,0.2911391258239746,0.07218408584594727,0.16941308975219727,0.16783547401428223,0.23578786849975586,0.04774022102355957,0.22610259056091309 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv index 9feb4e72af..fce0748f0f 100644 --- a/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv +++ b/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/heads/master,d99575655de8749879e2a231027eca2f15996bf4,3eb649f103eaa43cbb0428acb7bbf275f1207133,4399c5d04f3e301c1a48ddbd8ac54539b322ecf9,,True,True,59893b28cfe4df29206b4679624a3fbfc8b0ddcdbf1c419be09eb1b78753de7d,Tests_passed,37f0be32b4edfd3256b3b82b6ee7d07ea1dcdd5056a62c6d9fef948b20e2bb74,Tests_passed,True,True,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,ccc4c71e749ba0129762b534fbf79f0261569de63df8cb04b0d52ba045c19ea9,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,11223d23eafd7287167e2cdfe2e3effaf65d96c2ea89a8e0223f68128ec37577,Merge_failed,11223d23eafd7287167e2cdfe2e3effaf65d96c2ea89a8e0223f68128ec37577,Merge_failed,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,18c002ffca48c98d13402c43414730ef5509c3fc097bae1ca6fc2505d5a63f1b,Merge_failed,66d37469133934af734cb3a85f41f3a0febbc8a8a1d66c8c2602d8943ea65956,0.011081457138061523,0.011309623718261719,0.012115478515625,0.012458324432373047,0.01241302490234375,0.01369023323059082,0.015857458114624023,0.08232736587524414,0.020759105682373047,0.14754986763000488,0.1488780975341797,0.18680524826049805,0.7247321605682373,0.19469380378723145 +23,refs/heads/master,d99575655de8749879e2a231027eca2f15996bf4,3eb649f103eaa43cbb0428acb7bbf275f1207133,4399c5d04f3e301c1a48ddbd8ac54539b322ecf9,,True,True,59893b28cfe4df29206b4679624a3fbfc8b0ddcdbf1c419be09eb1b78753de7d,Tests_passed,37f0be32b4edfd3256b3b82b6ee7d07ea1dcdd5056a62c6d9fef948b20e2bb74,Tests_passed,True,True,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,ccc4c71e749ba0129762b534fbf79f0261569de63df8cb04b0d52ba045c19ea9,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,11223d23eafd7287167e2cdfe2e3effaf65d96c2ea89a8e0223f68128ec37577,Merge_failed,11223d23eafd7287167e2cdfe2e3effaf65d96c2ea89a8e0223f68128ec37577,Merge_failed,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,18c002ffca48c98d13402c43414730ef5509c3fc097bae1ca6fc2505d5a63f1b,Merge_failed,66d37469133934af734cb3a85f41f3a0febbc8a8a1d66c8c2602d8943ea65956,0.011081457138061523,0.011309623718261719,0.012115478515625,0.012458324432373047,0.01241302490234375,0.01369023323059082,0.015857458114624023,0.08232736587524414,0.020759105682373047,0.1462841033935547,0.14676332473754883,0.18680524826049805,0.7247321605682373,0.19469380378723145 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv index 2554ba5a0d..24dbfefab0 100644 --- a/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv +++ b/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -52,refs/heads/master,ec355d58fef047aba272302f7b8ed876a648c8d2,d2652d9386e6e9caddc4dda60c8334ebc17b8473,fc4ab3f3618c09dab8bd008eb50d867ebf565c64,,ef21352311ddeda5a68c679e599ee6558780a893cde3d21f70ee157f96323f2b,Tests_passed,8f3435e16361464351727dbfb96852c0f304aff3c363d5374463cd43a9a5b776,Tests_passed,True,True,True,True,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,d3f1b5144dcae62bab4127f6383ef222a25fbe355902d3b80fdea7b9fafb9986,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,d3f1b5144dcae62bab4127f6383ef222a25fbe355902d3b80fdea7b9fafb9986,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,358a06898b08d2aafb027b45e4e0f8e4643a9ba2fcddbe1453e1a3d2f03377e4,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,1f1ca49b8161cf4b6edf57f2de0edd6e8811a6144d5324316bfb2de8677f7ea5,Merge_failed,1f1ca49b8161cf4b6edf57f2de0edd6e8811a6144d5324316bfb2de8677f7ea5,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,79eb2a3f427305e7cd17f9f7ed5a9d4279e7f7a4c429e7e90caee1d9e628c3fc,Merge_failed,952bff311429b8e31991a9887a4d7d3009af781e4e79d6692a99b8eacf9f7022,0.04284214973449707,0.059844017028808594,0.046827077865600586,0.03822612762451172,0.03600645065307617,0.04337143898010254,0.05330395698547363,0.6151843070983887,0.14340662956237793,0.26872968673706055,0.2648630142211914,0.537407398223877,1.913869857788086,0.22816944122314453 +52,refs/heads/master,ec355d58fef047aba272302f7b8ed876a648c8d2,d2652d9386e6e9caddc4dda60c8334ebc17b8473,fc4ab3f3618c09dab8bd008eb50d867ebf565c64,,ef21352311ddeda5a68c679e599ee6558780a893cde3d21f70ee157f96323f2b,Tests_passed,8f3435e16361464351727dbfb96852c0f304aff3c363d5374463cd43a9a5b776,Tests_passed,True,True,True,True,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,d3f1b5144dcae62bab4127f6383ef222a25fbe355902d3b80fdea7b9fafb9986,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,d3f1b5144dcae62bab4127f6383ef222a25fbe355902d3b80fdea7b9fafb9986,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,358a06898b08d2aafb027b45e4e0f8e4643a9ba2fcddbe1453e1a3d2f03377e4,Merge_failed,1213c0803b27bd64b4b5870caa8b0c6a418f8eb5fc6511f64317af54739b579c,Merge_failed,1f1ca49b8161cf4b6edf57f2de0edd6e8811a6144d5324316bfb2de8677f7ea5,Merge_failed,1f1ca49b8161cf4b6edf57f2de0edd6e8811a6144d5324316bfb2de8677f7ea5,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,79eb2a3f427305e7cd17f9f7ed5a9d4279e7f7a4c429e7e90caee1d9e628c3fc,Merge_failed,952bff311429b8e31991a9887a4d7d3009af781e4e79d6692a99b8eacf9f7022,0.04284214973449707,0.059844017028808594,0.046827077865600586,0.03822612762451172,0.03600645065307617,0.04337143898010254,0.05330395698547363,0.6151843070983887,0.14340662956237793,0.26660585403442383,0.2658693790435791,0.537407398223877,1.913869857788086,0.22816944122314453 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv index 18f945ec10..1ddbf8f695 100644 --- a/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv +++ b/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -59,refs/heads/2.17,f5cad0fe66ab6090c676f778acb305e8dd6e87ec,db7ba1a4007f49abe9c3675e2ad8c116380cd8af,88439bea90371817c81e9a0f4bb71e14f3366c3d,,True,True,2b230a38089e5be4d7fe9122730070748e0c68c98ef8bedcc27c5dc41863c448,Tests_passed,1a8fb7623fb2a22ba8eb2e41bca5b5bc0e978d3a57fecedad02e27f108e5166f,Tests_passed,True,True,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,4bbdaff1cb324551355b6f17c06f545c9c2564367d0067b50a9221a3f83205e9,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,33a66a6a8e65fe95658e32ae85c974e8e5cd7ad939727833470ce436d0f57b23,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,0.031961679458618164,0.042923927307128906,0.03773808479309082,0.04298853874206543,0.039108991622924805,0.0396428108215332,0.032364845275878906,0.23830366134643555,0.04547381401062012,0.15066003799438477,0.1483137607574463,0.16745233535766602,0.5437402725219727,0.20213103294372559 +59,refs/heads/2.17,f5cad0fe66ab6090c676f778acb305e8dd6e87ec,db7ba1a4007f49abe9c3675e2ad8c116380cd8af,88439bea90371817c81e9a0f4bb71e14f3366c3d,,True,True,2b230a38089e5be4d7fe9122730070748e0c68c98ef8bedcc27c5dc41863c448,Tests_passed,1a8fb7623fb2a22ba8eb2e41bca5b5bc0e978d3a57fecedad02e27f108e5166f,Tests_passed,True,True,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,4bbdaff1cb324551355b6f17c06f545c9c2564367d0067b50a9221a3f83205e9,Merge_failed,7840f57c6e26482ce8cdb803c616f9583b5ee6c165a1ae3f5b03be1a66b13c81,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,33a66a6a8e65fe95658e32ae85c974e8e5cd7ad939727833470ce436d0f57b23,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,0.031961679458618164,0.042923927307128906,0.03773808479309082,0.04298853874206543,0.039108991622924805,0.0396428108215332,0.032364845275878906,0.23830366134643555,0.04547381401062012,0.14084434509277344,0.14044904708862305,0.16745233535766602,0.5437402725219727,0.20213103294372559 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv index 1ba1e07e7a..9d410435e5 100644 --- a/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv +++ b/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -33,refs/heads/master,dedccf4c3baa8d6d7aed9423504ca1087302483b,af5a5ba93758ff328e2c11f9712f40deff7eb095,bffc44b7f9a039fe2776850e320c8dcfe1ed1fd6,,9a1b4bff4524f1a5dccc4aa69745209770e73c621cc13e4196b9a93da7ef5d1a,Tests_passed,d866e15d67a3c0c158d2feb92399a64c99ce0897847ec56dc12cd641759f74be,Tests_passed,True,True,True,True,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,702c6f7a351f3bec6622afaa3061fa5c34e42ca8c0e01f8b04427657e1ab08f4,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,50e2f5073078d09c3a065e7e9f04a98fbb12eb688d5a7f53ea8d8b3b1904ff11,Merge_failed,50e2f5073078d09c3a065e7e9f04a98fbb12eb688d5a7f53ea8d8b3b1904ff11,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,ad04c66d4229b25a90113729d9a43bf412995de2d0258c47574ac61180e72a5f,0.04118657112121582,0.04385638236999512,0.0443117618560791,0.04902958869934082,0.05324602127075195,0.047460079193115234,0.04049563407897949,0.17317843437194824,0.06955432891845703,0.1716632843017578,0.15146303176879883,0.12331986427307129,0.7876060009002686,0.22852516174316406 +33,refs/heads/master,dedccf4c3baa8d6d7aed9423504ca1087302483b,af5a5ba93758ff328e2c11f9712f40deff7eb095,bffc44b7f9a039fe2776850e320c8dcfe1ed1fd6,,9a1b4bff4524f1a5dccc4aa69745209770e73c621cc13e4196b9a93da7ef5d1a,Tests_passed,d866e15d67a3c0c158d2feb92399a64c99ce0897847ec56dc12cd641759f74be,Tests_passed,True,True,True,True,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,702c6f7a351f3bec6622afaa3061fa5c34e42ca8c0e01f8b04427657e1ab08f4,Merge_failed,5432c13e499493daa8bd79cadde44412e85cc0f7373f00d6f0da2abf78eaf116,Merge_failed,50e2f5073078d09c3a065e7e9f04a98fbb12eb688d5a7f53ea8d8b3b1904ff11,Merge_failed,50e2f5073078d09c3a065e7e9f04a98fbb12eb688d5a7f53ea8d8b3b1904ff11,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,ad04c66d4229b25a90113729d9a43bf412995de2d0258c47574ac61180e72a5f,0.04118657112121582,0.04385638236999512,0.0443117618560791,0.04902958869934082,0.05324602127075195,0.047460079193115234,0.04049563407897949,0.17317843437194824,0.06955432891845703,0.1496412754058838,0.1505126953125,0.12331986427307129,0.7876060009002686,0.22852516174316406 diff --git a/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv b/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv index 1bdf812bd4..ce556b5fbe 100644 --- a/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv +++ b/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,cf754766cc0776745ea9bb9bd7fd5d18d58f67ce,bda2f9b194e7b5e0d1f001e1aaf951504f96f1c9,3f73cf73874dca6b827382c13078890bd0dd86c7,,True,True,2550d26473506dbecde5f79aff09f9a9d20b1391b6d9b7694137abca35877ea8,Tests_passed,cffbc0103e9800c62680ebd96f61171caeda23facbf7f4ad829dd781ad855458,Tests_passed,True,True,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,0.026530027389526367,0.02797102928161621,0.047893524169921875,0.04306316375732422,0.026084184646606445,0.03822731971740723,0.033023834228515625,0.12133049964904785,0.0260927677154541,0.17063426971435547,0.17231035232543945,0.09550786018371582,0.7614293098449707,0.2297048568725586 +5,refs/heads/master,cf754766cc0776745ea9bb9bd7fd5d18d58f67ce,bda2f9b194e7b5e0d1f001e1aaf951504f96f1c9,3f73cf73874dca6b827382c13078890bd0dd86c7,,True,True,2550d26473506dbecde5f79aff09f9a9d20b1391b6d9b7694137abca35877ea8,Tests_passed,cffbc0103e9800c62680ebd96f61171caeda23facbf7f4ad829dd781ad855458,Tests_passed,True,True,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,0.026530027389526367,0.02797102928161621,0.047893524169921875,0.04306316375732422,0.026084184646606445,0.03822731971740723,0.033023834228515625,0.12133049964904785,0.0260927677154541,0.16953659057617188,0.1699542999267578,0.09550786018371582,0.7614293098449707,0.2297048568725586 diff --git a/results/combined/merges_timed/fasterxml/jackson-module-jaxb-annotations.csv b/results/combined/merges_timed/fasterxml/jackson-module-jaxb-annotations.csv index 1fce9a2d0d..e18f391f35 100644 --- a/results/combined/merges_timed/fasterxml/jackson-module-jaxb-annotations.csv +++ b/results/combined/merges_timed/fasterxml/jackson-module-jaxb-annotations.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/2.8,e6d155829ae3829ad4ab08939671bc78aed86db3,cf5a4220e89cde4b4a71f7431dc97a918c205654,be331f8e2a40e0aa5bb058e63a05fdddf4f88232,,e5c740aca7bbabab5e43bc941179d316fd53a50764f491823344323d9bf2a58e,Tests_passed,0637219c19337a52f0d08bb3bfd4e0301d3221f981410f2b5840c4821184d610,Tests_passed,True,True,True,True,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,477286331842ef19072a9ec478fc8f3f57263ceb43d3094d1093732d2492b31c,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,0.04333186149597168,0.0390622615814209,0.043443918228149414,0.04792356491088867,0.05138134956359863,0.04775261878967285,0.04590249061584473,0.29018092155456543,0.06991004943847656,0.19113802909851074,0.19497132301330566,0.23726630210876465,0.048056840896606445,0.19057393074035645 +2,refs/heads/2.8,e6d155829ae3829ad4ab08939671bc78aed86db3,cf5a4220e89cde4b4a71f7431dc97a918c205654,be331f8e2a40e0aa5bb058e63a05fdddf4f88232,,e5c740aca7bbabab5e43bc941179d316fd53a50764f491823344323d9bf2a58e,Tests_passed,0637219c19337a52f0d08bb3bfd4e0301d3221f981410f2b5840c4821184d610,Tests_passed,True,True,True,True,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,477286331842ef19072a9ec478fc8f3f57263ceb43d3094d1093732d2492b31c,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,0.04333186149597168,0.0390622615814209,0.043443918228149414,0.04792356491088867,0.05138134956359863,0.04775261878967285,0.04590249061584473,0.29018092155456543,0.06991004943847656,0.19071316719055176,0.18938064575195312,0.23726630210876465,0.048056840896606445,0.19057393074035645 diff --git a/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv b/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv index 143a10938a..bc885bceb5 100644 --- a/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv +++ b/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,9e3869a0b016bf011f31ea195e628ae7e1223a1e,6479b6edc0b5a9633b4b811a4e44a9bb6dc6190d,8bb0db5f44968c24a61fbf7e2306daf15c2a990d,,True,True,f2c40be298c72a6ed9ddc06f0497517212f20caf48b62e233318afac29106c07,Tests_passed,05e7a888ae08f5534a401210cd64c10e5776de1dabf7519b74d4f4e8a4b7cc4b,Tests_passed,True,True,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,0.04042172431945801,0.04650521278381348,0.04604792594909668,0.04858827590942383,0.04598069190979004,0.03937888145446777,0.04473090171813965,0.16242265701293945,0.04479265213012695,0.1604468822479248,0.16410231590270996,0.11161923408508301,0.9362280368804932,0.19887089729309082 +6,refs/heads/master,9e3869a0b016bf011f31ea195e628ae7e1223a1e,6479b6edc0b5a9633b4b811a4e44a9bb6dc6190d,8bb0db5f44968c24a61fbf7e2306daf15c2a990d,,True,True,f2c40be298c72a6ed9ddc06f0497517212f20caf48b62e233318afac29106c07,Tests_passed,05e7a888ae08f5534a401210cd64c10e5776de1dabf7519b74d4f4e8a4b7cc4b,Tests_passed,True,True,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,0.04042172431945801,0.04650521278381348,0.04604792594909668,0.04858827590942383,0.04598069190979004,0.03937888145446777,0.04473090171813965,0.16242265701293945,0.04479265213012695,0.15583252906799316,0.15440869331359863,0.11161923408508301,0.9362280368804932,0.19887089729309082 diff --git a/results/combined/merges_timed/feedzai/pdb.csv b/results/combined/merges_timed/feedzai/pdb.csv index b308702815..94df4dc256 100644 --- a/results/combined/merges_timed/feedzai/pdb.csv +++ b/results/combined/merges_timed/feedzai/pdb.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,011ba2e9425f5451db1da70cccfba32722de0eac,d626297e911d4770e18d5cd19c8260edbe70d8a5,1f1c20edee25d2785f036d51720a028e3ec3b565,,86cd9e7ac57139b7ba419f4718d7af7c7246cf17aa51dbf884b11043e7cc7c7c,Tests_passed,a34ef601f7600e32a81c7131b2d414fe0cb90b88c0301195d54a6b6478034227,Tests_passed,True,True,True,True,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,0.02088475227355957,0.021579980850219727,0.02626633644104004,0.026671171188354492,0.026197433471679688,0.0256955623626709,0.026264667510986328,0.057654380798339844,0.0216219425201416,0.2204902172088623,0.21976041793823242,0.07651853561401367,2.069310188293457,0.2195737361907959 +2,refs/heads/master,011ba2e9425f5451db1da70cccfba32722de0eac,d626297e911d4770e18d5cd19c8260edbe70d8a5,1f1c20edee25d2785f036d51720a028e3ec3b565,,86cd9e7ac57139b7ba419f4718d7af7c7246cf17aa51dbf884b11043e7cc7c7c,Tests_passed,a34ef601f7600e32a81c7131b2d414fe0cb90b88c0301195d54a6b6478034227,Tests_passed,True,True,True,True,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,0.02088475227355957,0.021579980850219727,0.02626633644104004,0.026671171188354492,0.026197433471679688,0.0256955623626709,0.026264667510986328,0.057654380798339844,0.0216219425201416,0.21503710746765137,0.214707612991333,0.07651853561401367,2.069310188293457,0.2195737361907959 diff --git a/results/combined/merges_timed/fenixedu/fenixedu-academic.csv b/results/combined/merges_timed/fenixedu/fenixedu-academic.csv index b0d720e22c..fb68513412 100644 --- a/results/combined/merges_timed/fenixedu/fenixedu-academic.csv +++ b/results/combined/merges_timed/fenixedu/fenixedu-academic.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,0ebb833b3f09a28a19b06f2f137a2cbbd6080b78,8e69c9359a86a8b672dc97e17b053c94468c2736,ba82fa2ef5b9423d11833443e683b92f581c5438,,True,True,6327a726a6c9736e5e15c6f241b94b4f31a6e6f69a85463970ab45980c53f733,Tests_passed,afd04356df09ebd82258a1709999e03578a6288e09641bcb92a00f301d6dcb6a,Tests_passed,True,True,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,8ac3798ecede997434565324d5072d90aad3bd0f090502ac3af58bda2bdc00a7,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,e95ab03f7531c09dc7462eda1abc531cfa73d2e9bec9c4447c3ae3a02a79e33b,Merge_failed,e95ab03f7531c09dc7462eda1abc531cfa73d2e9bec9c4447c3ae3a02a79e33b,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,3152efe730c48340a952e6447cb4a9be3b0f35c8077c15ccfcc9be24fe576443,Merge_failed,3152efe730c48340a952e6447cb4a9be3b0f35c8077c15ccfcc9be24fe576443,0.03125,0.03168606758117676,0.03946065902709961,0.039426565170288086,0.038818359375,0.0392913818359375,0.039374589920043945,0.1738288402557373,0.1364431381225586,0.08869743347167969,0.08788037300109863,0.09198904037475586,0.03481101989746094,0.5606894493103027 +24,refs/heads/master,0ebb833b3f09a28a19b06f2f137a2cbbd6080b78,8e69c9359a86a8b672dc97e17b053c94468c2736,ba82fa2ef5b9423d11833443e683b92f581c5438,,True,True,6327a726a6c9736e5e15c6f241b94b4f31a6e6f69a85463970ab45980c53f733,Tests_passed,afd04356df09ebd82258a1709999e03578a6288e09641bcb92a00f301d6dcb6a,Tests_passed,True,True,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,8ac3798ecede997434565324d5072d90aad3bd0f090502ac3af58bda2bdc00a7,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,e95ab03f7531c09dc7462eda1abc531cfa73d2e9bec9c4447c3ae3a02a79e33b,Merge_failed,e95ab03f7531c09dc7462eda1abc531cfa73d2e9bec9c4447c3ae3a02a79e33b,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,3152efe730c48340a952e6447cb4a9be3b0f35c8077c15ccfcc9be24fe576443,Merge_failed,3152efe730c48340a952e6447cb4a9be3b0f35c8077c15ccfcc9be24fe576443,0.03125,0.03168606758117676,0.03946065902709961,0.039426565170288086,0.038818359375,0.0392913818359375,0.039374589920043945,0.1738288402557373,0.1364431381225586,0.08866405487060547,0.08889293670654297,0.09198904037475586,0.03481101989746094,0.5606894493103027 diff --git a/results/combined/merges_timed/fernandezpablo85/scribe-java.csv b/results/combined/merges_timed/fernandezpablo85/scribe-java.csv index b82e667a7b..73f6eda840 100644 --- a/results/combined/merges_timed/fernandezpablo85/scribe-java.csv +++ b/results/combined/merges_timed/fernandezpablo85/scribe-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,Tests_passed,True,True,True,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.01896524429321289,0.019338607788085938,0.017484426498413086,0.024312734603881836,0.01756596565246582,0.023865938186645508,0.02378225326538086,0.05283164978027344,0.01908588409423828,0.17681074142456055,0.174943208694458,0.07503724098205566,0.9588253498077393,0.27731800079345703 +3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,Tests_passed,True,True,True,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.01896524429321289,0.019338607788085938,0.017484426498413086,0.024312734603881836,0.01756596565246582,0.023865938186645508,0.02378225326538086,0.05283164978027344,0.01908588409423828,0.17296338081359863,0.1735074520111084,0.07503724098205566,0.9588253498077393,0.27731800079345703 diff --git a/results/combined/merges_timed/feroult/yawp.csv b/results/combined/merges_timed/feroult/yawp.csv index 4914b89995..eca1c39d94 100644 --- a/results/combined/merges_timed/feroult/yawp.csv +++ b/results/combined/merges_timed/feroult/yawp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -108,refs/heads/master,141f79a8e9268d471b022f45d5482d5da4e75da7,160c4dc583e83ddaa8da540d2c270e93ac271bcc,652d630fd7efd74fa37071bf7249e5eb79224799,,True,True,98925fde50d3097bbe3f55b588b7d8cc5e63ff3f6a3f04e5894870d32ac7f972,Tests_passed,b19174fde44da4862c195c2eb7dcc46329f7ac17c7fca781479a9e2b50bef6eb,Tests_passed,True,True,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,9b37eaa5bf9106592e7aa9580328679255ec5520030241281fac34ec8da95888,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,0.04282069206237793,0.0395660400390625,0.05755352973937988,0.042516231536865234,0.04799008369445801,0.05429220199584961,0.04327106475830078,0.16130471229553223,0.05275106430053711,0.1434154510498047,0.14353179931640625,0.11756277084350586,0.6326107978820801,0.21001195907592773 +108,refs/heads/master,141f79a8e9268d471b022f45d5482d5da4e75da7,160c4dc583e83ddaa8da540d2c270e93ac271bcc,652d630fd7efd74fa37071bf7249e5eb79224799,,True,True,98925fde50d3097bbe3f55b588b7d8cc5e63ff3f6a3f04e5894870d32ac7f972,Tests_passed,b19174fde44da4862c195c2eb7dcc46329f7ac17c7fca781479a9e2b50bef6eb,Tests_passed,True,True,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,9b37eaa5bf9106592e7aa9580328679255ec5520030241281fac34ec8da95888,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,0.04282069206237793,0.0395660400390625,0.05755352973937988,0.042516231536865234,0.04799008369445801,0.05429220199584961,0.04327106475830078,0.16130471229553223,0.05275106430053711,0.14444637298583984,0.14497756958007812,0.11756277084350586,0.6326107978820801,0.21001195907592773 diff --git a/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv b/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv index 3305fce049..7b635a23b1 100644 --- a/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv +++ b/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,b05c8c331560c1ab4be5c43c20912dbaa3d93839,7da8cbd0d675798ef263ae8655827bb2abd93ede,8776ddbbff972b7a828cf087b1e5089640f3d090,,db8ca669464eb0ae2b24297266e483b4759e0f39b6dd265f997c2f2af75cadc3,Tests_passed,1314c746cc3c6e983d8b017760da4d5b83b440e82acc9bbc0a39e59eac7f7286,Tests_passed,True,True,True,True,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,7291f7c3a42ffb0d3a6999873e8bb76d4caeec69b24df92f837df468502f2811,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,00a970d0e1a3e5ef174cd79c759bb1ec185ab6487df280f43e4c922a008b5995,Merge_failed,00a970d0e1a3e5ef174cd79c759bb1ec185ab6487df280f43e4c922a008b5995,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,e3a61eef8df016d4aee66cf062bd68aeed4ce799e9ca63f071aa05d8bde9f914,0.014391899108886719,0.014487981796264648,0.014081478118896484,0.014106035232543945,0.013503074645996094,0.013714075088500977,0.013663530349731445,0.1165616512298584,0.03199315071105957,1.051469087600708,1.0482642650604248,0.4714796543121338,4.386509656906128,0.2227187156677246 +1,refs/heads/master,b05c8c331560c1ab4be5c43c20912dbaa3d93839,7da8cbd0d675798ef263ae8655827bb2abd93ede,8776ddbbff972b7a828cf087b1e5089640f3d090,,db8ca669464eb0ae2b24297266e483b4759e0f39b6dd265f997c2f2af75cadc3,Tests_passed,1314c746cc3c6e983d8b017760da4d5b83b440e82acc9bbc0a39e59eac7f7286,Tests_passed,True,True,True,True,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,7291f7c3a42ffb0d3a6999873e8bb76d4caeec69b24df92f837df468502f2811,Merge_failed,3c07bf05797b157f912a288bb972bbdfa01473e617b7d773e41749f40b248888,Merge_failed,00a970d0e1a3e5ef174cd79c759bb1ec185ab6487df280f43e4c922a008b5995,Merge_failed,00a970d0e1a3e5ef174cd79c759bb1ec185ab6487df280f43e4c922a008b5995,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,e3a61eef8df016d4aee66cf062bd68aeed4ce799e9ca63f071aa05d8bde9f914,0.014391899108886719,0.014487981796264648,0.014081478118896484,0.014106035232543945,0.013503074645996094,0.013714075088500977,0.013663530349731445,0.1165616512298584,0.03199315071105957,1.0387277603149414,1.0387442111968994,0.4714796543121338,4.386509656906128,0.2227187156677246 diff --git a/results/combined/merges_timed/fex-team/fis-velocity-tools.csv b/results/combined/merges_timed/fex-team/fis-velocity-tools.csv index cc00e7b478..2416e8d18f 100644 --- a/results/combined/merges_timed/fex-team/fis-velocity-tools.csv +++ b/results/combined/merges_timed/fex-team/fis-velocity-tools.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/remotes/origin/pull/25,203daa57c2464ed7b348cf79a71c4e18ad29610a,f6c512bcca04ce3c4805d6998f81599fd314d848,ad06e07408c1bc9b31f597320399d53c4077b92b,,True,True,f01110f2675603fba17aa7473a5da69047c68d399535a3a3e2d43edc97f83285,Tests_passed,0dcaf2e0568bed6e479652e0a3efb4c64f931c8c738b6f2cfb9fff25346895cc,Tests_passed,True,True,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,a72dcd305a26ae6c01abc2f9f93776c9c6904c69eb993812b236b675873bc66f,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,2672c2f254200054cf85be631b353e844c77eaef566ca5a7342c9855a6c513d7,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,0.0431668758392334,0.03911328315734863,0.04666328430175781,0.040508270263671875,0.03505349159240723,0.03635692596435547,0.043898582458496094,0.24208831787109375,0.06657695770263672,0.16184425354003906,0.16131305694580078,0.1673743724822998,1.4311058521270752,0.20818710327148438 +21,refs/remotes/origin/pull/25,203daa57c2464ed7b348cf79a71c4e18ad29610a,f6c512bcca04ce3c4805d6998f81599fd314d848,ad06e07408c1bc9b31f597320399d53c4077b92b,,True,True,f01110f2675603fba17aa7473a5da69047c68d399535a3a3e2d43edc97f83285,Tests_passed,0dcaf2e0568bed6e479652e0a3efb4c64f931c8c738b6f2cfb9fff25346895cc,Tests_passed,True,True,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,a72dcd305a26ae6c01abc2f9f93776c9c6904c69eb993812b236b675873bc66f,Merge_failed,e1b2e30926acdc90c9fa74768e4628588ef017788c18b60d03b54075f05580c6,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,2672c2f254200054cf85be631b353e844c77eaef566ca5a7342c9855a6c513d7,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,0.0431668758392334,0.03911328315734863,0.04666328430175781,0.040508270263671875,0.03505349159240723,0.03635692596435547,0.043898582458496094,0.24208831787109375,0.06657695770263672,0.16098713874816895,0.16395020484924316,0.1673743724822998,1.4311058521270752,0.20818710327148438 diff --git a/results/combined/merges_timed/ffay/lanproxy.csv b/results/combined/merges_timed/ffay/lanproxy.csv index 61fbf499d8..c6eb31daa8 100644 --- a/results/combined/merges_timed/ffay/lanproxy.csv +++ b/results/combined/merges_timed/ffay/lanproxy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/for-io2c-cloud,1e0cfe7542abf06498662d5723d547188e65c673,2b43c685e954366252e425dc2c2b8ae0b3cfa0d2,a680a6565eac57e0eb0aa27b25bd2d39efdd47ee,,5bd2bf681e8ed090661d84df1a6e27ee4915ff23f6892fb45b79edb90c160edd,Tests_passed,317a9186ececed2938492e561ae7eba1ee1032306ed77032e7292a433cadf922,Tests_passed,True,True,True,True,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a4ffd56c32fd83e35aab0adf73bb0055ded766f6ee4fe16fa000a4983ceebc6d,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a0ced77ecea7fc0b9fbfb70908a794cf6fa947ba2b61be97827b5537078b0388,Merge_failed,a0ced77ecea7fc0b9fbfb70908a794cf6fa947ba2b61be97827b5537078b0388,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,a0495a43c69692b217e772421a97186127d5407c87363caaa326d6ecf233ea31,0.03339529037475586,0.008914470672607422,0.0300753116607666,0.009929895401000977,0.030555248260498047,0.028418302536010742,0.028081893920898438,0.12920570373535156,0.026842355728149414,0.11442184448242188,0.0756981372833252,0.11230325698852539,0.6508784294128418,0.21948027610778809 +4,refs/remotes/origin/for-io2c-cloud,1e0cfe7542abf06498662d5723d547188e65c673,2b43c685e954366252e425dc2c2b8ae0b3cfa0d2,a680a6565eac57e0eb0aa27b25bd2d39efdd47ee,,5bd2bf681e8ed090661d84df1a6e27ee4915ff23f6892fb45b79edb90c160edd,Tests_passed,317a9186ececed2938492e561ae7eba1ee1032306ed77032e7292a433cadf922,Tests_passed,True,True,True,True,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a4ffd56c32fd83e35aab0adf73bb0055ded766f6ee4fe16fa000a4983ceebc6d,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a0ced77ecea7fc0b9fbfb70908a794cf6fa947ba2b61be97827b5537078b0388,Merge_failed,a0ced77ecea7fc0b9fbfb70908a794cf6fa947ba2b61be97827b5537078b0388,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,a0495a43c69692b217e772421a97186127d5407c87363caaa326d6ecf233ea31,0.03339529037475586,0.008914470672607422,0.0300753116607666,0.009929895401000977,0.030555248260498047,0.028418302536010742,0.028081893920898438,0.12920570373535156,0.026842355728149414,0.09456658363342285,0.11248111724853516,0.11230325698852539,0.6508784294128418,0.21948027610778809 diff --git a/results/combined/merges_timed/fiji/trackmate.csv b/results/combined/merges_timed/fiji/trackmate.csv index 6b44362071..dea41164f3 100644 --- a/results/combined/merges_timed/fiji/trackmate.csv +++ b/results/combined/merges_timed/fiji/trackmate.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -48,refs/heads/master,31e749c77fd17fb77bb36433506765f44784035d,f5291051efe7a525211ef3072fd924485a2e2793,2733e4e2236984e2eb9e14aff6a79fb858282958,,True,True,cfec539e9b563f5ae03a4a5cbfc8ccd594257b58bab47e069240447a7eeba03d,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,True,True,Merge_failed,d41d9fa8bffe6183e4156ac0d79539fe3206cf42dc3a04c73e3d2a2777051f46,Merge_failed,371b0e8ec3f03d83d846a0041851ae873c640d71397fed04f0ebe038ee0b684a,Merge_failed,d41d9fa8bffe6183e4156ac0d79539fe3206cf42dc3a04c73e3d2a2777051f46,Merge_failed,d75fd169e034f39b00fe56f3c7d15b1ed4d7734bbe954cde3ea248e03a5356b3,Merge_failed,c373ec33571e25757bb13dca860966e108a360bfca9ff742e5893769ad10d0a3,Merge_failed,c373ec33571e25757bb13dca860966e108a360bfca9ff742e5893769ad10d0a3,Merge_failed,d41d9fa8bffe6183e4156ac0d79539fe3206cf42dc3a04c73e3d2a2777051f46,Merge_failed,e0bc8e9572536aaad643e9e5d83d9e7ae809d92f072529dcd522acdc49eacae4,Merge_failed,d41d9fa8bffe6183e4156ac0d79539fe3206cf42dc3a04c73e3d2a2777051f46,Merge_failed,4ace5b5e4380ce88c3cbdda4a7e4313e78eec6e141641653dea37e65dd7441f6,Merge_failed,4ace5b5e4380ce88c3cbdda4a7e4313e78eec6e141641653dea37e65dd7441f6,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,10ad5fba9849379dfd4c2a2fa3dec2260c7167820388775b11bc87f61eb8c37e,0.0162050724029541,0.03240799903869629,0.037017107009887695,0.01653599739074707,0.016564130783081055,0.03695940971374512,0.01646900177001953,0.113739013671875,0.04701995849609375,0.664691686630249,0.6691851615905762,0.3358147144317627,5.9245216846466064,0.33722829818725586 +48,refs/heads/master,31e749c77fd17fb77bb36433506765f44784035d,f5291051efe7a525211ef3072fd924485a2e2793,2733e4e2236984e2eb9e14aff6a79fb858282958,,True,True,cfec539e9b563f5ae03a4a5cbfc8ccd594257b58bab47e069240447a7eeba03d,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,True,True,Merge_failed,d41d9fa8bffe6183e4156ac0d79539fe3206cf42dc3a04c73e3d2a2777051f46,Merge_failed,371b0e8ec3f03d83d846a0041851ae873c640d71397fed04f0ebe038ee0b684a,Merge_failed,d41d9fa8bffe6183e4156ac0d79539fe3206cf42dc3a04c73e3d2a2777051f46,Merge_failed,d75fd169e034f39b00fe56f3c7d15b1ed4d7734bbe954cde3ea248e03a5356b3,Merge_failed,c373ec33571e25757bb13dca860966e108a360bfca9ff742e5893769ad10d0a3,Merge_failed,c373ec33571e25757bb13dca860966e108a360bfca9ff742e5893769ad10d0a3,Merge_failed,d41d9fa8bffe6183e4156ac0d79539fe3206cf42dc3a04c73e3d2a2777051f46,Merge_failed,e0bc8e9572536aaad643e9e5d83d9e7ae809d92f072529dcd522acdc49eacae4,Merge_failed,d41d9fa8bffe6183e4156ac0d79539fe3206cf42dc3a04c73e3d2a2777051f46,Merge_failed,4ace5b5e4380ce88c3cbdda4a7e4313e78eec6e141641653dea37e65dd7441f6,Merge_failed,4ace5b5e4380ce88c3cbdda4a7e4313e78eec6e141641653dea37e65dd7441f6,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,10ad5fba9849379dfd4c2a2fa3dec2260c7167820388775b11bc87f61eb8c37e,0.0162050724029541,0.03240799903869629,0.037017107009887695,0.01653599739074707,0.016564130783081055,0.03695940971374512,0.01646900177001953,0.113739013671875,0.04701995849609375,0.6473910808563232,0.6503608226776123,0.3358147144317627,5.9245216846466064,0.33722829818725586 diff --git a/results/combined/merges_timed/fiji/trainable_segmentation.csv b/results/combined/merges_timed/fiji/trainable_segmentation.csv index bb3e02359a..d9ce40f814 100644 --- a/results/combined/merges_timed/fiji/trainable_segmentation.csv +++ b/results/combined/merges_timed/fiji/trainable_segmentation.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,5d0af9b16565e370fe5f8f53577f8c9cdea8304d,0bc26fa993ddb0b234a47ab147f74d3c55e25889,c7fccb4aa5101ab3c68532df85888a87659266d1,,True,True,6f77a735a2ecfbfcf601669602412bc9de61c7cf7ffb15859f79e8bb22a8e49e,Tests_passed,e2f2e7d0e792a06528581939dba6d38179af6f26f02fdf606160f94da9f124bb,Tests_passed,True,True,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,0.040007591247558594,0.043044090270996094,0.06203603744506836,0.03345489501953125,0.08842730522155762,0.04157304763793945,0.04644155502319336,0.1655900478363037,0.06073141098022461,0.22245168685913086,0.23017501831054688,0.1105647087097168,2.788839817047119,0.24988842010498047 +3,refs/heads/master,5d0af9b16565e370fe5f8f53577f8c9cdea8304d,0bc26fa993ddb0b234a47ab147f74d3c55e25889,c7fccb4aa5101ab3c68532df85888a87659266d1,,True,True,6f77a735a2ecfbfcf601669602412bc9de61c7cf7ffb15859f79e8bb22a8e49e,Tests_passed,e2f2e7d0e792a06528581939dba6d38179af6f26f02fdf606160f94da9f124bb,Tests_passed,True,True,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,0.040007591247558594,0.043044090270996094,0.06203603744506836,0.03345489501953125,0.08842730522155762,0.04157304763793945,0.04644155502319336,0.1655900478363037,0.06073141098022461,0.21613717079162598,0.21869349479675293,0.1105647087097168,2.788839817047119,0.24988842010498047 diff --git a/results/combined/merges_timed/fincatto/nfe.csv b/results/combined/merges_timed/fincatto/nfe.csv index 2100ec70c6..9c9ac76a86 100644 --- a/results/combined/merges_timed/fincatto/nfe.csv +++ b/results/combined/merges_timed/fincatto/nfe.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -835,refs/remotes/origin/pull/707,5e7de4528cb818ec7091faf2b0ecb3c2b5ce2fbc,2546be2a39c864dc2c3e943ca41dacb87c353dae,9ea3d957c2b490adf3c090118879b16dc0771ff4,,246a868ce80bbe7b6d29433fda56c0511e826871f08f32a1fba19d8421b4bf50,Tests_passed,d05337513dd4940ef9a686d903012fed339c5498230f53dca15eb5844d0005c0,Tests_passed,True,True,True,True,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_failed,31674d3e7c070c8195635d3ef6292bb5e8920e8119a9165e6e5f4e26c6e4d05d,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,0.08133625984191895,0.07203006744384766,0.07176566123962402,0.0739433765411377,0.07157540321350098,0.08571648597717285,0.060602664947509766,0.27538561820983887,0.07066917419433594,0.3537471294403076,0.36058878898620605,0.16923141479492188,2.3378236293792725,0.9505190849304199 +835,refs/remotes/origin/pull/707,5e7de4528cb818ec7091faf2b0ecb3c2b5ce2fbc,2546be2a39c864dc2c3e943ca41dacb87c353dae,9ea3d957c2b490adf3c090118879b16dc0771ff4,,246a868ce80bbe7b6d29433fda56c0511e826871f08f32a1fba19d8421b4bf50,Tests_passed,d05337513dd4940ef9a686d903012fed339c5498230f53dca15eb5844d0005c0,Tests_passed,True,True,True,True,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_failed,31674d3e7c070c8195635d3ef6292bb5e8920e8119a9165e6e5f4e26c6e4d05d,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,0.08133625984191895,0.07203006744384766,0.07176566123962402,0.0739433765411377,0.07157540321350098,0.08571648597717285,0.060602664947509766,0.27538561820983887,0.07066917419433594,0.3491663932800293,0.3509247303009033,0.16923141479492188,2.3378236293792725,0.9505190849304199 diff --git a/results/combined/merges_timed/findwise/hydra.csv b/results/combined/merges_timed/findwise/hydra.csv index 973ec9d6e5..9db0cfa394 100644 --- a/results/combined/merges_timed/findwise/hydra.csv +++ b/results/combined/merges_timed/findwise/hydra.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -227,refs/remotes/origin/pull/260,df0e251a4325ded7eb9baef25fb1c5cfd1be3fa5,837f3bd1c230fb42327721f55818b0a9a722afad,76fe21c315cbb3d2fe159a62b4ee9cf85f0ef062,,True,True,e74cb388ba7be6229d3ed2a38c9eef7430917042d9a099e7ef1df811123715ca,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,True,True,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,c276fffdba629a9ec48d3d9875cba9c7d23be62c65c518429da865151813bf37,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,c276fffdba629a9ec48d3d9875cba9c7d23be62c65c518429da865151813bf37,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,a2376caa4a260e03b9f6b94798ea81cbd9a7b18fd4d186f76815435da0745be7,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,dba8e6b64f3098235ec143e9cdc1c416f3f1b57c2480626303bb94193232d197,Merge_failed,e1038c0d3af17f5f0478172b8f23a7c480e76a75bb7994045bafc119a8d31002,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,d252f4d5259001a032861383675b3cf7b28ce44a8a8535c82da4bb6ff9cdd30e,Merge_failed,c7d91362ed2b6cf33f83b4ea9ec2388f5524845d959d5941be2a3282b017f20c,0.01828479766845703,0.018651723861694336,0.020518779754638672,0.02053093910217285,0.020628690719604492,0.012771844863891602,0.020766019821166992,0.0773475170135498,0.03004622459411621,0.15771198272705078,0.15840578079223633,0.18241477012634277,0.48815369606018066,0.22951745986938477 +227,refs/remotes/origin/pull/260,df0e251a4325ded7eb9baef25fb1c5cfd1be3fa5,837f3bd1c230fb42327721f55818b0a9a722afad,76fe21c315cbb3d2fe159a62b4ee9cf85f0ef062,,True,True,e74cb388ba7be6229d3ed2a38c9eef7430917042d9a099e7ef1df811123715ca,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,True,True,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,c276fffdba629a9ec48d3d9875cba9c7d23be62c65c518429da865151813bf37,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,c276fffdba629a9ec48d3d9875cba9c7d23be62c65c518429da865151813bf37,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,a2376caa4a260e03b9f6b94798ea81cbd9a7b18fd4d186f76815435da0745be7,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,dba8e6b64f3098235ec143e9cdc1c416f3f1b57c2480626303bb94193232d197,Merge_failed,e1038c0d3af17f5f0478172b8f23a7c480e76a75bb7994045bafc119a8d31002,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,d252f4d5259001a032861383675b3cf7b28ce44a8a8535c82da4bb6ff9cdd30e,Merge_failed,c7d91362ed2b6cf33f83b4ea9ec2388f5524845d959d5941be2a3282b017f20c,0.01828479766845703,0.018651723861694336,0.020518779754638672,0.02053093910217285,0.020628690719604492,0.012771844863891602,0.020766019821166992,0.0773475170135498,0.03004622459411621,0.15640473365783691,0.1558365821838379,0.18241477012634277,0.48815369606018066,0.22951745986938477 diff --git a/results/combined/merges_timed/finraos/jtaf-xcore.csv b/results/combined/merges_timed/finraos/jtaf-xcore.csv index f7ec40f678..39bd9002c8 100644 --- a/results/combined/merges_timed/finraos/jtaf-xcore.csv +++ b/results/combined/merges_timed/finraos/jtaf-xcore.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,9165bd1b60aa447fe40c713040bab897a9b2af1b,b6653fad72ff311b1f98414c4cc547be0e908ea2,e3545e4d595e66e89cdb0fa1003a4580179a8062,,True,True,01ee66c96d1b5e793eafa82f3c2d4f47a00f98c722dd479a7575e769f5229682,Tests_passed,a23c571e24986e8041bcfbf3acbc3087095e1ef9d45f7985558dcd4e0c8dcf92,Tests_passed,True,True,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,c27e3b438741b8d95c920a5b704f946b8cd905e228b950550966d5e4bffe4805,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e4908f81627ef732508d587fe4320230e188cc48320cdd38c7aed7031713d19e,Merge_failed,e4908f81627ef732508d587fe4320230e188cc48320cdd38c7aed7031713d19e,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,262a52cbdfeb5afc79716602d956d89bfc526f195e617149ac94c71bb747d85c,0.057038307189941406,0.061199188232421875,0.05856466293334961,0.05172395706176758,0.055234670639038086,0.05297589302062988,0.06425642967224121,0.4574577808380127,0.11134028434753418,0.5212275981903076,0.5255732536315918,0.4263279438018799,4.292613983154297,0.360640287399292 +3,refs/heads/master,9165bd1b60aa447fe40c713040bab897a9b2af1b,b6653fad72ff311b1f98414c4cc547be0e908ea2,e3545e4d595e66e89cdb0fa1003a4580179a8062,,True,True,01ee66c96d1b5e793eafa82f3c2d4f47a00f98c722dd479a7575e769f5229682,Tests_passed,a23c571e24986e8041bcfbf3acbc3087095e1ef9d45f7985558dcd4e0c8dcf92,Tests_passed,True,True,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,c27e3b438741b8d95c920a5b704f946b8cd905e228b950550966d5e4bffe4805,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e4908f81627ef732508d587fe4320230e188cc48320cdd38c7aed7031713d19e,Merge_failed,e4908f81627ef732508d587fe4320230e188cc48320cdd38c7aed7031713d19e,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,262a52cbdfeb5afc79716602d956d89bfc526f195e617149ac94c71bb747d85c,0.057038307189941406,0.061199188232421875,0.05856466293334961,0.05172395706176758,0.055234670639038086,0.05297589302062988,0.06425642967224121,0.4574577808380127,0.11134028434753418,0.5260982513427734,0.5279703140258789,0.4263279438018799,4.292613983154297,0.360640287399292 diff --git a/results/combined/merges_timed/fit2cloud/qingcloud-api-java-wrapper.csv b/results/combined/merges_timed/fit2cloud/qingcloud-api-java-wrapper.csv index e170c66e7a..2d6234464b 100644 --- a/results/combined/merges_timed/fit2cloud/qingcloud-api-java-wrapper.csv +++ b/results/combined/merges_timed/fit2cloud/qingcloud-api-java-wrapper.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,995c25dc87eca84847991a1217944c665e69a7e8,90602c52df891bdf08c0679cc136d4eb55fc0416,3535f3bd940d81277f5f4f4c0677664370f0ea5c,,True,True,2e0a5ff305606962941f26297bd7e52c44df441b71a370d21cf81559923c5c1e,Tests_passed,807337aed3817eebcaa308e4df75bedeb82a9f5c67c2590e56392762b74238dd,Tests_passed,True,True,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,0.04877042770385742,0.05369281768798828,0.056404829025268555,0.04442739486694336,0.06088900566101074,0.04734516143798828,0.051497459411621094,0.1793515682220459,0.057125091552734375,0.2002115249633789,0.20100688934326172,0.11716341972351074,2.0340962409973145,0.22420501708984375 +7,refs/heads/master,995c25dc87eca84847991a1217944c665e69a7e8,90602c52df891bdf08c0679cc136d4eb55fc0416,3535f3bd940d81277f5f4f4c0677664370f0ea5c,,True,True,2e0a5ff305606962941f26297bd7e52c44df441b71a370d21cf81559923c5c1e,Tests_passed,807337aed3817eebcaa308e4df75bedeb82a9f5c67c2590e56392762b74238dd,Tests_passed,True,True,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,0.04877042770385742,0.05369281768798828,0.056404829025268555,0.04442739486694336,0.06088900566101074,0.04734516143798828,0.051497459411621094,0.1793515682220459,0.057125091552734375,0.20286846160888672,0.19750690460205078,0.11716341972351074,2.0340962409973145,0.22420501708984375 diff --git a/results/combined/merges_timed/flaptor/indextank-java.csv b/results/combined/merges_timed/flaptor/indextank-java.csv index 7b2ee3d7cc..c221ff61d5 100644 --- a/results/combined/merges_timed/flaptor/indextank-java.csv +++ b/results/combined/merges_timed/flaptor/indextank-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,d850b46a2e92c56a63af99d7380b11e97c36e3eb,78aa405f383682e8c44a2071f95f0c59651fee89,315857eb3fb000eed355fcac261719f1d46901cc,,aee0e6024df8606fec1a4cd9996240adaafac8195f5175e037633d19c2e4557b,Tests_passed,0fddcefa37afb2540571f98ef5380c2dd5f9114995e4b2f63c106542f40c67dd,Tests_passed,True,True,True,True,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,0.010250568389892578,0.01089024543762207,0.011067867279052734,0.01158595085144043,0.011332273483276367,0.011399984359741211,0.010960578918457031,0.049878835678100586,0.010308027267456055,0.3383033275604248,0.33809328079223633,0.12013792991638184,2.3593969345092773,0.16471600532531738 +3,refs/heads/master,d850b46a2e92c56a63af99d7380b11e97c36e3eb,78aa405f383682e8c44a2071f95f0c59651fee89,315857eb3fb000eed355fcac261719f1d46901cc,,aee0e6024df8606fec1a4cd9996240adaafac8195f5175e037633d19c2e4557b,Tests_passed,0fddcefa37afb2540571f98ef5380c2dd5f9114995e4b2f63c106542f40c67dd,Tests_passed,True,True,True,True,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,0.010250568389892578,0.01089024543762207,0.011067867279052734,0.01158595085144043,0.011332273483276367,0.011399984359741211,0.010960578918457031,0.049878835678100586,0.010308027267456055,0.3253209590911865,0.32738780975341797,0.12013792991638184,2.3593969345092773,0.16471600532531738 diff --git a/results/combined/merges_timed/flaxsearch/luwak.csv b/results/combined/merges_timed/flaxsearch/luwak.csv index 2fa8ec8526..35ab351d3d 100644 --- a/results/combined/merges_timed/flaxsearch/luwak.csv +++ b/results/combined/merges_timed/flaxsearch/luwak.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -39,refs/heads/master,e546d26294eb9218d5e78c16023f8260817c4354,e662f80a31e44120ec627a025c2ec0c61102d3dd,8e75374da7ac1ee4ec9d31ab411a734c57c7a76a,,True,True,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,a665e84c59c5fbf5d69a3b14b0132dad242a55605f62dec93f0fd8a4bd987e8f,Tests_passed,True,True,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,5733838ac5cff0f0f61d84521ea8a34d98f6851e05942b93737ab5dfd9331710,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,0.05418062210083008,0.05561327934265137,0.058199167251586914,0.05835461616516113,0.05897259712219238,0.058873653411865234,0.056307077407836914,0.18501615524291992,0.04666733741760254,0.16832566261291504,0.16765904426574707,0.12123322486877441,0.8357665538787842,0.25638365745544434 +39,refs/heads/master,e546d26294eb9218d5e78c16023f8260817c4354,e662f80a31e44120ec627a025c2ec0c61102d3dd,8e75374da7ac1ee4ec9d31ab411a734c57c7a76a,,True,True,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,a665e84c59c5fbf5d69a3b14b0132dad242a55605f62dec93f0fd8a4bd987e8f,Tests_passed,True,True,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,5733838ac5cff0f0f61d84521ea8a34d98f6851e05942b93737ab5dfd9331710,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,0.05418062210083008,0.05561327934265137,0.058199167251586914,0.05835461616516113,0.05897259712219238,0.058873653411865234,0.056307077407836914,0.18501615524291992,0.04666733741760254,0.1672508716583252,0.16608285903930664,0.12123322486877441,0.8357665538787842,0.25638365745544434 diff --git a/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv b/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv index 83ad41860e..ae05ddcf23 100644 --- a/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv +++ b/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/master,3a4c27d3b02856e9dbcbf917a764336d78883c73,2fb50aea7397183773b990af9634d166c392013c,9f367408ddade0f2cbb1f562975941da12a66f9f,,True,True,d2807689bd36eca627ebdd7f02ebeee1c698eaf338af8882be4486ab8ecf7afc,Tests_passed,f0c803aba2709414567dbb301a52f53280070459dd93d888db95ecf7b55fbac4,Tests_passed,True,True,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,0.0439152717590332,0.045224905014038086,0.04270029067993164,0.045945167541503906,0.05086159706115723,0.03948616981506348,0.04899024963378906,0.17835140228271484,0.042136192321777344,0.15341472625732422,0.15449976921081543,0.1178288459777832,0.900381326675415,0.21376633644104004 +17,refs/heads/master,3a4c27d3b02856e9dbcbf917a764336d78883c73,2fb50aea7397183773b990af9634d166c392013c,9f367408ddade0f2cbb1f562975941da12a66f9f,,True,True,d2807689bd36eca627ebdd7f02ebeee1c698eaf338af8882be4486ab8ecf7afc,Tests_passed,f0c803aba2709414567dbb301a52f53280070459dd93d888db95ecf7b55fbac4,Tests_passed,True,True,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,0.0439152717590332,0.045224905014038086,0.04270029067993164,0.045945167541503906,0.05086159706115723,0.03948616981506348,0.04899024963378906,0.17835140228271484,0.042136192321777344,0.153886079788208,0.1539618968963623,0.1178288459777832,0.900381326675415,0.21376633644104004 diff --git a/results/combined/merges_timed/fluentlenium/fluentlenium.csv b/results/combined/merges_timed/fluentlenium/fluentlenium.csv index 9b6df3f042..fd8808b5ec 100644 --- a/results/combined/merges_timed/fluentlenium/fluentlenium.csv +++ b/results/combined/merges_timed/fluentlenium/fluentlenium.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -387,refs/heads/develop,b281c70c5e8cacf65e8c1ed6c6b05f92c52c433a,9aef806a9dff96134457c7b41a73b0492a1feab2,2907aac3efbe0e4824819671ad9f78e055be0fe8,,True,True,b1d81758717ee68644a31175021c5b7a7066e880f60707f34c423a566adda968,Tests_passed,91a8f2fab9e6532f76010c3956b1cedddb0ec1a68fe6d7d6c39cc66ebaf8e73e,Tests_passed,True,True,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,c7931323af71b20949cecee630e310a96d4732d6cb00b92a4192c373846e8a2a,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,0.04832959175109863,0.04062151908874512,0.044783830642700195,0.044114112854003906,0.04824113845825195,0.03718137741088867,0.03391671180725098,0.17295002937316895,0.04735565185546875,0.16918039321899414,0.16911768913269043,0.1110529899597168,1.1284830570220947,0.25437140464782715 +387,refs/heads/develop,b281c70c5e8cacf65e8c1ed6c6b05f92c52c433a,9aef806a9dff96134457c7b41a73b0492a1feab2,2907aac3efbe0e4824819671ad9f78e055be0fe8,,True,True,b1d81758717ee68644a31175021c5b7a7066e880f60707f34c423a566adda968,Tests_passed,91a8f2fab9e6532f76010c3956b1cedddb0ec1a68fe6d7d6c39cc66ebaf8e73e,Tests_passed,True,True,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,c7931323af71b20949cecee630e310a96d4732d6cb00b92a4192c373846e8a2a,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,0.04832959175109863,0.04062151908874512,0.044783830642700195,0.044114112854003906,0.04824113845825195,0.03718137741088867,0.03391671180725098,0.17295002937316895,0.04735565185546875,0.16946673393249512,0.16663599014282227,0.1110529899597168,1.1284830570220947,0.25437140464782715 diff --git a/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv b/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv index 7ec53c574d..71ae729be3 100644 --- a/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv +++ b/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -154,refs/remotes/origin/openpdf,baf00eff9794d8d582f8368c62765e9b8ceba92f,12c333df32afd0ef607f57efcece59f486123e25,98ad9a169aaf4c090ccea1a3c855897c8a591580,,True,True,104645c12b2e941cabd58ae9758eb4b57735c3664f5cd65238a30c5470a5cc65,Tests_passed,1675fcf5f88827ba501eb62468d9b1ca6194eff5f6496bbe662f79013f926fd4,Tests_passed,True,True,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,afedc193b7b9c233f7ad044c5fbfa43b2d75a31b068d0042bbb8e6b2efe4455e,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,e8cd3b9303ca059b1b105f73d90da44f67d80baa597ff1eb0cca39446899d6ab,Merge_failed,044dcfde681b7b5361be485c300ff928d3eda1a06c01696f73a70e908fc10863,Merge_failed,a90adf15247ed1ca1f4fe987ba8f038530203f73f746df0198227a61d3e997e6,Merge_failed,4b4c04a4b9863faa7ca8128965101e00f59809ce5d9eb7e87600088be4352098,Merge_failed,9bcfbcbb25a37da86410ad8632fc939fba8f4a16893638831afd948f85177416,0.06560444831848145,0.06617379188537598,0.07358336448669434,0.07361435890197754,0.07346510887145996,0.07314848899841309,0.07358098030090332,0.1930859088897705,0.10721325874328613,0.20909929275512695,0.21037673950195312,0.2844998836517334,0.5223782062530518,1.6072134971618652 +154,refs/remotes/origin/openpdf,baf00eff9794d8d582f8368c62765e9b8ceba92f,12c333df32afd0ef607f57efcece59f486123e25,98ad9a169aaf4c090ccea1a3c855897c8a591580,,True,True,104645c12b2e941cabd58ae9758eb4b57735c3664f5cd65238a30c5470a5cc65,Tests_passed,1675fcf5f88827ba501eb62468d9b1ca6194eff5f6496bbe662f79013f926fd4,Tests_passed,True,True,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,afedc193b7b9c233f7ad044c5fbfa43b2d75a31b068d0042bbb8e6b2efe4455e,Merge_failed,cae0d99c36ee97506491db8db0439d718b41d9a11a91dc24bbc1be6e4aaebc58,Merge_failed,e8cd3b9303ca059b1b105f73d90da44f67d80baa597ff1eb0cca39446899d6ab,Merge_failed,044dcfde681b7b5361be485c300ff928d3eda1a06c01696f73a70e908fc10863,Merge_failed,a90adf15247ed1ca1f4fe987ba8f038530203f73f746df0198227a61d3e997e6,Merge_failed,4b4c04a4b9863faa7ca8128965101e00f59809ce5d9eb7e87600088be4352098,Merge_failed,9bcfbcbb25a37da86410ad8632fc939fba8f4a16893638831afd948f85177416,0.06560444831848145,0.06617379188537598,0.07358336448669434,0.07361435890197754,0.07346510887145996,0.07314848899841309,0.07358098030090332,0.1930859088897705,0.10721325874328613,0.20702743530273438,0.2066965103149414,0.2844998836517334,0.5223782062530518,1.6072134971618652 diff --git a/results/combined/merges_timed/fmcarvalho/htmlflow.csv b/results/combined/merges_timed/fmcarvalho/htmlflow.csv index e05be122d1..ac3dfd73c2 100644 --- a/results/combined/merges_timed/fmcarvalho/htmlflow.csv +++ b/results/combined/merges_timed/fmcarvalho/htmlflow.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,a89a8fa0e3425befa5503896bca392ce1bac437e,d5ce30d0c44ba34fcb4846c193cd06320362516a,91c5c4b27e1d315ebdd7690049050e7fe79addc3,,True,True,858aded6720e1a3da234601906cc10bb95833c0c7520e26a847f1f14df0fc567,Tests_passed,ffa0a1a959ca0c5738576d4f617e728cd3c05208795cc0f2433903933568691c,Tests_passed,True,True,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,b6f0568f107d758c0cb31d06bc3061d10ebd0bfd69bebccd32eea372030d9638,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,2aa83a7d539935f1861c5c647dcb4e13ea11677fa61fc7fa5d692ccd0ebb2ddc,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,006a392b9cd386088938485c28c3c4dd641ac5c540c72bd0a18ab23d4b005106,Merge_failed,006a392b9cd386088938485c28c3c4dd641ac5c540c72bd0a18ab23d4b005106,Merge_failed,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,b73e9cc4fa516c1dc9821a1fed589e12da3f825be2e7377c2c004930fde2692e,0.013247013092041016,0.013380765914916992,0.013893842697143555,0.013446331024169922,0.0134124755859375,0.013448953628540039,0.01350092887878418,0.0934901237487793,0.019153833389282227,0.254138708114624,0.24657917022705078,0.12539267539978027,1.759350061416626,0.2093949317932129 +8,refs/heads/master,a89a8fa0e3425befa5503896bca392ce1bac437e,d5ce30d0c44ba34fcb4846c193cd06320362516a,91c5c4b27e1d315ebdd7690049050e7fe79addc3,,True,True,858aded6720e1a3da234601906cc10bb95833c0c7520e26a847f1f14df0fc567,Tests_passed,ffa0a1a959ca0c5738576d4f617e728cd3c05208795cc0f2433903933568691c,Tests_passed,True,True,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,b6f0568f107d758c0cb31d06bc3061d10ebd0bfd69bebccd32eea372030d9638,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,2aa83a7d539935f1861c5c647dcb4e13ea11677fa61fc7fa5d692ccd0ebb2ddc,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,006a392b9cd386088938485c28c3c4dd641ac5c540c72bd0a18ab23d4b005106,Merge_failed,006a392b9cd386088938485c28c3c4dd641ac5c540c72bd0a18ab23d4b005106,Merge_failed,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,b73e9cc4fa516c1dc9821a1fed589e12da3f825be2e7377c2c004930fde2692e,0.013247013092041016,0.013380765914916992,0.013893842697143555,0.013446331024169922,0.0134124755859375,0.013448953628540039,0.01350092887878418,0.0934901237487793,0.019153833389282227,0.23232746124267578,0.2427990436553955,0.12539267539978027,1.759350061416626,0.2093949317932129 diff --git a/results/combined/merges_timed/fommil/matrix-toolkits-java.csv b/results/combined/merges_timed/fommil/matrix-toolkits-java.csv index 22e7a26f4e..8630893dc9 100644 --- a/results/combined/merges_timed/fommil/matrix-toolkits-java.csv +++ b/results/combined/merges_timed/fommil/matrix-toolkits-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,affdb7b35e8a309c4691e94a9f265dcfa9f34094,52744544515f2b8b56cedc2901398610f08b235f,98234e974d0467722d7188001e704bfeb518d848,,True,True,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,4ed79d826944a4fb6d09a63127fa6cda76769d97219f58c809f738be2040f0b3,Tests_passed,True,True,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,0.0549166202545166,0.04942011833190918,0.05257391929626465,0.04973793029785156,0.0419003963470459,0.03216123580932617,0.04369759559631348,0.3062717914581299,0.04877114295959473,0.45523786544799805,0.4618520736694336,0.2349562644958496,2.7642922401428223,0.22685551643371582 +1,refs/heads/master,affdb7b35e8a309c4691e94a9f265dcfa9f34094,52744544515f2b8b56cedc2901398610f08b235f,98234e974d0467722d7188001e704bfeb518d848,,True,True,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,4ed79d826944a4fb6d09a63127fa6cda76769d97219f58c809f738be2040f0b3,Tests_passed,True,True,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,0.0549166202545166,0.04942011833190918,0.05257391929626465,0.04973793029785156,0.0419003963470459,0.03216123580932617,0.04369759559631348,0.3062717914581299,0.04877114295959473,0.4547159671783447,0.460233211517334,0.2349562644958496,2.7642922401428223,0.22685551643371582 diff --git a/results/combined/merges_timed/forcedotcom/analytics-cloud-dataset-utils.csv b/results/combined/merges_timed/forcedotcom/analytics-cloud-dataset-utils.csv index 4b92496020..8eadf97174 100644 --- a/results/combined/merges_timed/forcedotcom/analytics-cloud-dataset-utils.csv +++ b/results/combined/merges_timed/forcedotcom/analytics-cloud-dataset-utils.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/remotes/origin/pull/4,bb64fe4fe44310042573ff697a10286c76181f27,7f5853b50212f8f062a683dc590025d23e195449,5bfe592ac634bb45f48175f5c455b69568bfe54a,,True,True,2d56ceca7685cd0d42383dffc1b8bc5b472c543fea43865ca8db7d668984d509,Tests_passed,0c0a3402ebd89cd9cf6f7f799c9bed85b79283578da63ff3c8c1c5565e8d9470,Tests_passed,True,True,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,0.04339098930358887,0.05304718017578125,0.04604005813598633,0.03711652755737305,0.042528390884399414,0.038832664489746094,0.03623080253601074,0.17897248268127441,0.028216838836669922,0.15717458724975586,0.1570894718170166,0.1161355972290039,0.6684248447418213,0.22768259048461914 +6,refs/remotes/origin/pull/4,bb64fe4fe44310042573ff697a10286c76181f27,7f5853b50212f8f062a683dc590025d23e195449,5bfe592ac634bb45f48175f5c455b69568bfe54a,,True,True,2d56ceca7685cd0d42383dffc1b8bc5b472c543fea43865ca8db7d668984d509,Tests_passed,0c0a3402ebd89cd9cf6f7f799c9bed85b79283578da63ff3c8c1c5565e8d9470,Tests_passed,True,True,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,0.04339098930358887,0.05304718017578125,0.04604005813598633,0.03711652755737305,0.042528390884399414,0.038832664489746094,0.03623080253601074,0.17897248268127441,0.028216838836669922,0.1556992530822754,0.15652179718017578,0.1161355972290039,0.6684248447418213,0.22768259048461914 diff --git a/results/combined/merges_timed/forcedotcom/sitecrawler.csv b/results/combined/merges_timed/forcedotcom/sitecrawler.csv index cb95453f83..5e09db2e6a 100644 --- a/results/combined/merges_timed/forcedotcom/sitecrawler.csv +++ b/results/combined/merges_timed/forcedotcom/sitecrawler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/remotes/origin/develop,bb56b3dd8e132d8d625dab3ee71ed828754cdde0,e581ac9a860103411577fc1e43f419202fc8d8ac,db6e75c0cf7dde53d208b30dfad7ca1eaf3e3896,,True,True,79fd9ded833ef95cff46349527c8002380321b3fa12371969023f7119fb65ecc,Tests_passed,64ab76e3afa4e811164c11715aaa520e84b189be22918dc67de3ffb6dbb0f930,Tests_passed,True,True,Merge_failed,6b8f0ecbf1a140161cee9a09d90b88ff4724a19c56477e19bd13553f681c0da9,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,6b8f0ecbf1a140161cee9a09d90b88ff4724a19c56477e19bd13553f681c0da9,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,7921b21ea5e1d89141086df79aa26b9595080eae361b612abecd2be86a29b1ee,Merge_failed,7921b21ea5e1d89141086df79aa26b9595080eae361b612abecd2be86a29b1ee,Merge_failed,c67d3b15698dd4dc359e1c49cc210440e1c9ab01171bc792ed765ad40450a49c,Merge_failed,a17d84eb09bc2fcabc9ae9bb957e0835008eef7c39394a4ca46fd6ec21472d1c,Merge_failed,6b8f0ecbf1a140161cee9a09d90b88ff4724a19c56477e19bd13553f681c0da9,Merge_failed,efb27aad7c3d13e06527237fa30b73303f4748fc67134413d11c4f69d8c91b3f,Merge_failed,9c1ad4f31ef1950906ffae9f8cf29653ec89b07f8bf2e0be8981234a2b9468ee,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,235025f90acbeec11c19436916c6c1ebc5dda3205c079d8f2e6bffac774a4ec2,Merge_failed,5b383d513ee9800f18493e1c55d5c284d863fa835de27a92e53b578b3f2b8d0a,0.029335498809814453,0.039617300033569336,0.0470273494720459,0.04454302787780762,0.041768550872802734,0.03925061225891113,0.043589115142822266,0.21124482154846191,0.08043551445007324,0.06704401969909668,0.06685256958007812,0.17145514488220215,1.4854199886322021,0.18378329277038574 +13,refs/remotes/origin/develop,bb56b3dd8e132d8d625dab3ee71ed828754cdde0,e581ac9a860103411577fc1e43f419202fc8d8ac,db6e75c0cf7dde53d208b30dfad7ca1eaf3e3896,,True,True,79fd9ded833ef95cff46349527c8002380321b3fa12371969023f7119fb65ecc,Tests_passed,64ab76e3afa4e811164c11715aaa520e84b189be22918dc67de3ffb6dbb0f930,Tests_passed,True,True,Merge_failed,6b8f0ecbf1a140161cee9a09d90b88ff4724a19c56477e19bd13553f681c0da9,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,6b8f0ecbf1a140161cee9a09d90b88ff4724a19c56477e19bd13553f681c0da9,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,7921b21ea5e1d89141086df79aa26b9595080eae361b612abecd2be86a29b1ee,Merge_failed,7921b21ea5e1d89141086df79aa26b9595080eae361b612abecd2be86a29b1ee,Merge_failed,c67d3b15698dd4dc359e1c49cc210440e1c9ab01171bc792ed765ad40450a49c,Merge_failed,a17d84eb09bc2fcabc9ae9bb957e0835008eef7c39394a4ca46fd6ec21472d1c,Merge_failed,6b8f0ecbf1a140161cee9a09d90b88ff4724a19c56477e19bd13553f681c0da9,Merge_failed,efb27aad7c3d13e06527237fa30b73303f4748fc67134413d11c4f69d8c91b3f,Merge_failed,9c1ad4f31ef1950906ffae9f8cf29653ec89b07f8bf2e0be8981234a2b9468ee,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,235025f90acbeec11c19436916c6c1ebc5dda3205c079d8f2e6bffac774a4ec2,Merge_failed,5b383d513ee9800f18493e1c55d5c284d863fa835de27a92e53b578b3f2b8d0a,0.029335498809814453,0.039617300033569336,0.0470273494720459,0.04454302787780762,0.041768550872802734,0.03925061225891113,0.043589115142822266,0.21124482154846191,0.08043551445007324,0.07600975036621094,0.0778651237487793,0.17145514488220215,1.4854199886322021,0.18378329277038574 diff --git a/results/combined/merges_timed/forcedotcom/wsc.csv b/results/combined/merges_timed/forcedotcom/wsc.csv index 28d32b1716..dfc5ccbff8 100644 --- a/results/combined/merges_timed/forcedotcom/wsc.csv +++ b/results/combined/merges_timed/forcedotcom/wsc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -134,refs/heads/master,69d39ed6fe26f04b1132ff17984ae3c77ef7ed77,a0b230e5c07ce66c36d64a638227d33d67816a9c,bd5c0c1c03c5f26f32d35a1febe16979c797b1a4,,True,True,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,5bcf3ea9f25ab6a08f5642e6472c7501bcc89809154b3281fb2634639c2b1eee,Tests_passed,True,True,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,0.05475759506225586,0.03507852554321289,0.021309852600097656,0.04144454002380371,0.021625280380249023,0.048845767974853516,0.04659605026245117,0.17069244384765625,0.03805065155029297,0.17571711540222168,0.17628741264343262,0.12500524520874023,1.5530390739440918,0.2582967281341553 +134,refs/heads/master,69d39ed6fe26f04b1132ff17984ae3c77ef7ed77,a0b230e5c07ce66c36d64a638227d33d67816a9c,bd5c0c1c03c5f26f32d35a1febe16979c797b1a4,,True,True,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,5bcf3ea9f25ab6a08f5642e6472c7501bcc89809154b3281fb2634639c2b1eee,Tests_passed,True,True,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,0.05475759506225586,0.03507852554321289,0.021309852600097656,0.04144454002380371,0.021625280380249023,0.048845767974853516,0.04659605026245117,0.17069244384765625,0.03805065155029297,0.1679983139038086,0.18114924430847168,0.12500524520874023,1.5530390739440918,0.2582967281341553 diff --git a/results/combined/merges_timed/fordfrog/apgdiff.csv b/results/combined/merges_timed/fordfrog/apgdiff.csv index a747cf1f1d..3ebd8e6717 100644 --- a/results/combined/merges_timed/fordfrog/apgdiff.csv +++ b/results/combined/merges_timed/fordfrog/apgdiff.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/develop,a42c3242b6e78aa612e362f409e373225a9c4a2e,6523c52d919cb5fd73af3ef718f691740b19db1b,6c6defaa50aad109de8a85b37202591c0b98f784,,4e41691763649629f374a62af1412666df1a6255fccdcdc44d73f98c82dc74e1,Tests_passed,f5df258ffb7207cf731fdafb93675b62bcc7601bd3f5da9051bba37f37784130,Tests_passed,True,True,True,True,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,eabf76cb81e29a09be85360f4e5c032f214b36abc4a3ee8ecd2dc5dca1cb3842,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,eabf76cb81e29a09be85360f4e5c032f214b36abc4a3ee8ecd2dc5dca1cb3842,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,f490dc250e1fa38d994add12ed09a292d16341ac3440477ae70753c562c2f74f,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,6c067f411444413575d0667b773f3bbd77b6d03de9f6ddd50c1f800079c6cb61,Merge_failed,6c067f411444413575d0667b773f3bbd77b6d03de9f6ddd50c1f800079c6cb61,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6dca7c0f41be616b80403179230b371dcb790262dad5a6004d617eddb9007143,Merge_failed,30f1d33b7f3de209d5e8abbae5a3c970d13654070eff3587fd10f47aa422704b,0.04885697364807129,0.059472084045410156,0.049497127532958984,0.058461904525756836,0.05723285675048828,0.05181097984313965,0.05413675308227539,0.29584741592407227,0.11045241355895996,0.12866854667663574,0.13014960289001465,0.24335217475891113,1.534956455230713,0.28762221336364746 +2,refs/heads/develop,a42c3242b6e78aa612e362f409e373225a9c4a2e,6523c52d919cb5fd73af3ef718f691740b19db1b,6c6defaa50aad109de8a85b37202591c0b98f784,,4e41691763649629f374a62af1412666df1a6255fccdcdc44d73f98c82dc74e1,Tests_passed,f5df258ffb7207cf731fdafb93675b62bcc7601bd3f5da9051bba37f37784130,Tests_passed,True,True,True,True,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,eabf76cb81e29a09be85360f4e5c032f214b36abc4a3ee8ecd2dc5dca1cb3842,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,eabf76cb81e29a09be85360f4e5c032f214b36abc4a3ee8ecd2dc5dca1cb3842,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,f490dc250e1fa38d994add12ed09a292d16341ac3440477ae70753c562c2f74f,Merge_failed,026d05ec3573c198d34268fdd2cf47eb244c7e00b77729e7181b93207a57b272,Merge_failed,6c067f411444413575d0667b773f3bbd77b6d03de9f6ddd50c1f800079c6cb61,Merge_failed,6c067f411444413575d0667b773f3bbd77b6d03de9f6ddd50c1f800079c6cb61,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6dca7c0f41be616b80403179230b371dcb790262dad5a6004d617eddb9007143,Merge_failed,30f1d33b7f3de209d5e8abbae5a3c970d13654070eff3587fd10f47aa422704b,0.04885697364807129,0.059472084045410156,0.049497127532958984,0.058461904525756836,0.05723285675048828,0.05181097984313965,0.05413675308227539,0.29584741592407227,0.11045241355895996,0.1284933090209961,0.1349925994873047,0.24335217475891113,1.534956455230713,0.28762221336364746 diff --git a/results/combined/merges_timed/frankbille/scoreboard.csv b/results/combined/merges_timed/frankbille/scoreboard.csv index 2d3eb953a0..9a6df74638 100644 --- a/results/combined/merges_timed/frankbille/scoreboard.csv +++ b/results/combined/merges_timed/frankbille/scoreboard.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/master,579ea54251bad446fdac546dc20fa813a3525b46,6c9298023a14f62bd50384b4fdc49213749a315e,5b07cabc7b31fa27c7e862f86e7226a91117d4d4,,bda8a39b930cf2440a92798e14de49522715efb16cc182a83b00107c88fd7631,Tests_passed,7bd91f92b03e3a34b367b9555fd2b2db9eb8841e0067703386f1f7215561209d,Tests_passed,True,True,True,True,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,578ab17d0327a485afdef3e6df1d87fa2f57dc69600024ecd64e0605ca12b8a7,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,578ab17d0327a485afdef3e6df1d87fa2f57dc69600024ecd64e0605ca12b8a7,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,fb9bb17287ce76144209624a94c069695ccc35bdbf7ca0d86173912bed916bdf,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,69e8ee0532fe611dcdbcc03a168da87e62449ab8225674b2d0aa2fba84a35d74,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,0.04317736625671387,0.0421910285949707,0.04440712928771973,0.05154824256896973,0.036414146423339844,0.04386019706726074,0.04506707191467285,0.2819328308105469,0.05741453170776367,0.1482563018798828,0.1486217975616455,0.22227191925048828,0.6773483753204346,0.22279620170593262 +21,refs/heads/master,579ea54251bad446fdac546dc20fa813a3525b46,6c9298023a14f62bd50384b4fdc49213749a315e,5b07cabc7b31fa27c7e862f86e7226a91117d4d4,,bda8a39b930cf2440a92798e14de49522715efb16cc182a83b00107c88fd7631,Tests_passed,7bd91f92b03e3a34b367b9555fd2b2db9eb8841e0067703386f1f7215561209d,Tests_passed,True,True,True,True,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,578ab17d0327a485afdef3e6df1d87fa2f57dc69600024ecd64e0605ca12b8a7,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,578ab17d0327a485afdef3e6df1d87fa2f57dc69600024ecd64e0605ca12b8a7,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,fb9bb17287ce76144209624a94c069695ccc35bdbf7ca0d86173912bed916bdf,Merge_failed,2469fd7c5b5dd969e492e3a9bc1f96a05d013a11c2f916b3b38faa9b007f73be,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,69e8ee0532fe611dcdbcc03a168da87e62449ab8225674b2d0aa2fba84a35d74,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,0.04317736625671387,0.0421910285949707,0.04440712928771973,0.05154824256896973,0.036414146423339844,0.04386019706726074,0.04506707191467285,0.2819328308105469,0.05741453170776367,0.14598655700683594,0.14664483070373535,0.22227191925048828,0.6773483753204346,0.22279620170593262 diff --git a/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv b/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv index adb1ec7484..de60a3ddf0 100644 --- a/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv +++ b/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/remotes/origin/pull/50,5477c71d3adde8d7029035133d94c44e32eb9083,0c94a082a4516d72c89cf6a860096325f391ee13,176d281f6570afa2f72f50b692bcecd63edfc140,,True,True,d83d176ae5862505c73da986a5bd6bc2b8003e0e16666832ac550998607c6899,Tests_passed,fccd14e100c3f44856fdc57b1b82e3d5204b6a404264f35733c3ac57369732ec,Tests_passed,True,True,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,d8f4a52a65fcdfea1a22ff3205d0ec98e405ad8f64fd3a3fa83e91c9beb6f1fd,Merge_failed,86583e6e9c4bcd3a20936c8558547c1a7fff1bc99c6c345084970fc0db5dfd68,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,c6bbe23ebf184450c7bc3b87d4a2cc7c5866961bd8529ee7a4563a8ab541084e,Merge_failed,c6bbe23ebf184450c7bc3b87d4a2cc7c5866961bd8529ee7a4563a8ab541084e,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,9262832b8f77468e4b1253d3e4f81a453a639fca972d5310c2ee179819c665ee,0.014382600784301758,0.013904571533203125,0.01417231559753418,0.01528620719909668,0.017899513244628906,0.014735698699951172,0.014295816421508789,0.052956342697143555,0.026931285858154297,0.07347488403320312,0.07643961906433105,0.0749657154083252,1.670215129852295,0.23127245903015137 +8,refs/remotes/origin/pull/50,5477c71d3adde8d7029035133d94c44e32eb9083,0c94a082a4516d72c89cf6a860096325f391ee13,176d281f6570afa2f72f50b692bcecd63edfc140,,True,True,d83d176ae5862505c73da986a5bd6bc2b8003e0e16666832ac550998607c6899,Tests_passed,fccd14e100c3f44856fdc57b1b82e3d5204b6a404264f35733c3ac57369732ec,Tests_passed,True,True,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,d8f4a52a65fcdfea1a22ff3205d0ec98e405ad8f64fd3a3fa83e91c9beb6f1fd,Merge_failed,86583e6e9c4bcd3a20936c8558547c1a7fff1bc99c6c345084970fc0db5dfd68,Merge_failed,2be534354a330537d746ef8dbfeb3c791ce720f8cfcb4b9e169209b79d4f1e67,Merge_failed,c6bbe23ebf184450c7bc3b87d4a2cc7c5866961bd8529ee7a4563a8ab541084e,Merge_failed,c6bbe23ebf184450c7bc3b87d4a2cc7c5866961bd8529ee7a4563a8ab541084e,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,9262832b8f77468e4b1253d3e4f81a453a639fca972d5310c2ee179819c665ee,0.014382600784301758,0.013904571533203125,0.01417231559753418,0.01528620719909668,0.017899513244628906,0.014735698699951172,0.014295816421508789,0.052956342697143555,0.026931285858154297,0.07045936584472656,0.07112979888916016,0.0749657154083252,1.670215129852295,0.23127245903015137 diff --git a/results/combined/merges_timed/frizbog/gedcom4j.csv b/results/combined/merges_timed/frizbog/gedcom4j.csv index 0f005697fe..95b6d1d217 100644 --- a/results/combined/merges_timed/frizbog/gedcom4j.csv +++ b/results/combined/merges_timed/frizbog/gedcom4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,11c8b3f6955f298ade7583d2fa0d000b282e597f,cc87e520a8fb31791ef6f69c87ee6aba8247ccbd,7c93589357fcbf3c1e8dbfb7fd6ffc0158e94c04,,True,True,c0289db9626674ba122dc0f9c353412e50329ef520fd84ea9f400c3a0b7dfbfc,Tests_passed,c08160c1250a318b3a848595a32f8b0c4fdd8309513fc7c40d815013d7ff920b,Tests_passed,True,True,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,cb79a7cad84c59f537e0d35013388697fefccba1d6dd72a21178f119060c9139,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,dcf3a6e92d87b1bbf1e998df056550cd351fd76f3e8bab6a8246626b6286f02b,Merge_failed,dcf3a6e92d87b1bbf1e998df056550cd351fd76f3e8bab6a8246626b6286f02b,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Merge_failed,0213b9e324324f2fc2e54ce03ce2d32c1aa3fa03f66a7ae9aafe1e2d063aa1c6,0.054558515548706055,0.05584383010864258,0.06137871742248535,0.05630064010620117,0.055321693420410156,0.040500640869140625,0.08191394805908203,0.21737909317016602,0.07709622383117676,0.3812682628631592,0.33501410484313965,0.17885041236877441,4.072464466094971,0.5673627853393555 +12,refs/heads/master,11c8b3f6955f298ade7583d2fa0d000b282e597f,cc87e520a8fb31791ef6f69c87ee6aba8247ccbd,7c93589357fcbf3c1e8dbfb7fd6ffc0158e94c04,,True,True,c0289db9626674ba122dc0f9c353412e50329ef520fd84ea9f400c3a0b7dfbfc,Tests_passed,c08160c1250a318b3a848595a32f8b0c4fdd8309513fc7c40d815013d7ff920b,Tests_passed,True,True,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,cb79a7cad84c59f537e0d35013388697fefccba1d6dd72a21178f119060c9139,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,dcf3a6e92d87b1bbf1e998df056550cd351fd76f3e8bab6a8246626b6286f02b,Merge_failed,dcf3a6e92d87b1bbf1e998df056550cd351fd76f3e8bab6a8246626b6286f02b,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Merge_failed,0213b9e324324f2fc2e54ce03ce2d32c1aa3fa03f66a7ae9aafe1e2d063aa1c6,0.054558515548706055,0.05584383010864258,0.06137871742248535,0.05630064010620117,0.055321693420410156,0.040500640869140625,0.08191394805908203,0.21737909317016602,0.07709622383117676,0.351717472076416,0.35686159133911133,0.17885041236877441,4.072464466094971,0.5673627853393555 diff --git a/results/combined/merges_timed/fusesource/hawtjni.csv b/results/combined/merges_timed/fusesource/hawtjni.csv index 668c2e82ac..9168685034 100644 --- a/results/combined/merges_timed/fusesource/hawtjni.csv +++ b/results/combined/merges_timed/fusesource/hawtjni.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,8678713caf00652f4f7d52e36b8b384cf611dde5,d145a1dea37bbd8f98c9f1e6f21d756f849d7979,2c64ed4134de9b3cefd9423382a59f60c8f3ad25,,d1466a3d12f3064c8dd90f83120c547f0dc7aff845d8f8cbc2663e64511dbd8b,Tests_passed,b6fb7066bb00778949dff10fb3844eb8efd49a0bae9a4e6d3607d2a1044d0f81,Tests_passed,True,True,True,True,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,0.021950483322143555,0.02215123176574707,0.028789758682250977,0.028809547424316406,0.028893709182739258,0.02866816520690918,0.02871870994567871,0.06073617935180664,0.022400856018066406,0.1760692596435547,0.1770327091217041,0.07700347900390625,1.0102307796478271,0.19339799880981445 +3,refs/heads/master,8678713caf00652f4f7d52e36b8b384cf611dde5,d145a1dea37bbd8f98c9f1e6f21d756f849d7979,2c64ed4134de9b3cefd9423382a59f60c8f3ad25,,d1466a3d12f3064c8dd90f83120c547f0dc7aff845d8f8cbc2663e64511dbd8b,Tests_passed,b6fb7066bb00778949dff10fb3844eb8efd49a0bae9a4e6d3607d2a1044d0f81,Tests_passed,True,True,True,True,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,0.021950483322143555,0.02215123176574707,0.028789758682250977,0.028809547424316406,0.028893709182739258,0.02866816520690918,0.02871870994567871,0.06073617935180664,0.022400856018066406,0.17504096031188965,0.173567533493042,0.07700347900390625,1.0102307796478271,0.19339799880981445 diff --git a/results/combined/merges_timed/fusesource/jansi-native.csv b/results/combined/merges_timed/fusesource/jansi-native.csv index 819be0503c..d22fb14ca4 100644 --- a/results/combined/merges_timed/fusesource/jansi-native.csv +++ b/results/combined/merges_timed/fusesource/jansi-native.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,f4065227fc55a377db6a889b3fe73daceba5baa9,bb86e0e79bec850167ddfd8c4a86fb9ffef704e5,5a81868efd1b58f1876dda0da0358433097a8c0e,,True,True,8723aa7b2c29e02d4a834748bb52e52b61f3a85889e0dfa7bcdfde8d00cf7c21,Tests_passed,387fb40b0909b6e721da03e1dbaf2819aa827adb252286c7aefdc30f682cf4ed,Tests_passed,True,True,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,bcd03031a2f084a5e33a73be1d2d1f520d72df44aa9f3c1d485d042b76287df8,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,e39b1a4feb48952ca86d1025b7c6f9433f8ac1652ee037485c1500b1b06684dd,Merge_failed,e39b1a4feb48952ca86d1025b7c6f9433f8ac1652ee037485c1500b1b06684dd,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Merge_failed,9f21ae3ecf9cc3e39ab83c0bab245cd39ed1999921d4b51810f344327859f617,0.00982046127319336,0.01029658317565918,0.00962066650390625,0.011097431182861328,0.009675025939941406,0.009786605834960938,0.009704351425170898,0.034417152404785156,0.014969348907470703,0.07582259178161621,0.07667803764343262,0.06694722175598145,0.6613233089447021,0.16036081314086914 +6,refs/heads/master,f4065227fc55a377db6a889b3fe73daceba5baa9,bb86e0e79bec850167ddfd8c4a86fb9ffef704e5,5a81868efd1b58f1876dda0da0358433097a8c0e,,True,True,8723aa7b2c29e02d4a834748bb52e52b61f3a85889e0dfa7bcdfde8d00cf7c21,Tests_passed,387fb40b0909b6e721da03e1dbaf2819aa827adb252286c7aefdc30f682cf4ed,Tests_passed,True,True,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,bcd03031a2f084a5e33a73be1d2d1f520d72df44aa9f3c1d485d042b76287df8,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,e39b1a4feb48952ca86d1025b7c6f9433f8ac1652ee037485c1500b1b06684dd,Merge_failed,e39b1a4feb48952ca86d1025b7c6f9433f8ac1652ee037485c1500b1b06684dd,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Merge_failed,9f21ae3ecf9cc3e39ab83c0bab245cd39ed1999921d4b51810f344327859f617,0.00982046127319336,0.01029658317565918,0.00962066650390625,0.011097431182861328,0.009675025939941406,0.009786605834960938,0.009704351425170898,0.034417152404785156,0.014969348907470703,0.0764617919921875,0.07639813423156738,0.06694722175598145,0.6613233089447021,0.16036081314086914 diff --git a/results/combined/merges_timed/fusesource/jansi.csv b/results/combined/merges_timed/fusesource/jansi.csv index bd8c3e780b..f328a98156 100644 --- a/results/combined/merges_timed/fusesource/jansi.csv +++ b/results/combined/merges_timed/fusesource/jansi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/master,eeda18cb05122abe48b284dca969e2c060a0c009,b84df55b6c6a0688cf8ad790d4a3ac952ea6b9d0,5a3a670c911e4491195b6d162d456dead1497824,,True,True,7f122577588d32b76e3e566b52d4fc21d998de86bdf889f9a50d85f9a2cbc729,Tests_passed,c12ff958e6fd5092a2a7a12d26ba20de99771366aac098b4ff19173d624180a5,Tests_passed,True,True,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,0.04625892639160156,0.050188302993774414,0.04698324203491211,0.051941871643066406,0.04465293884277344,0.040238142013549805,0.04700493812561035,0.15979838371276855,0.04920220375061035,0.1613774299621582,0.16152095794677734,0.10337424278259277,0.6057331562042236,0.2189626693725586 +21,refs/heads/master,eeda18cb05122abe48b284dca969e2c060a0c009,b84df55b6c6a0688cf8ad790d4a3ac952ea6b9d0,5a3a670c911e4491195b6d162d456dead1497824,,True,True,7f122577588d32b76e3e566b52d4fc21d998de86bdf889f9a50d85f9a2cbc729,Tests_passed,c12ff958e6fd5092a2a7a12d26ba20de99771366aac098b4ff19173d624180a5,Tests_passed,True,True,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,0.04625892639160156,0.050188302993774414,0.04698324203491211,0.051941871643066406,0.04465293884277344,0.040238142013549805,0.04700493812561035,0.15979838371276855,0.04920220375061035,0.15876483917236328,0.15920805931091309,0.10337424278259277,0.6057331562042236,0.2189626693725586 diff --git a/results/combined/merges_timed/galenframework/galen.csv b/results/combined/merges_timed/galenframework/galen.csv index 3cb6a8db76..7dc4014901 100644 --- a/results/combined/merges_timed/galenframework/galen.csv +++ b/results/combined/merges_timed/galenframework/galen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,9f0a13079558fe495b6ea2a9b7f46e818639b4e1,807a06e637a1abf53be4575182fce01811c045e4,bf409f4ff5aa1ad3a51195230112967f38a5a5b3,,0a7c40482c731031373bba526988e79a8c19193592fbeadfd4f83d0d41daae32,Tests_passed,195d52203e15eb03a676063ed8305852d13f390a953ac5053fabf21a8b3ffe8b,Tests_passed,True,True,True,True,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,0.04467058181762695,0.04390144348144531,0.06894707679748535,0.06366181373596191,0.06309199333190918,0.06583046913146973,0.062491655349731445,0.2464447021484375,0.04028630256652832,0.32741379737854004,0.32544827461242676,0.16417503356933594,1.2046692371368408,1.250809669494629 +1,refs/heads/master,9f0a13079558fe495b6ea2a9b7f46e818639b4e1,807a06e637a1abf53be4575182fce01811c045e4,bf409f4ff5aa1ad3a51195230112967f38a5a5b3,,0a7c40482c731031373bba526988e79a8c19193592fbeadfd4f83d0d41daae32,Tests_passed,195d52203e15eb03a676063ed8305852d13f390a953ac5053fabf21a8b3ffe8b,Tests_passed,True,True,True,True,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,0.04467058181762695,0.04390144348144531,0.06894707679748535,0.06366181373596191,0.06309199333190918,0.06583046913146973,0.062491655349731445,0.2464447021484375,0.04028630256652832,0.32470011711120605,0.3363020420074463,0.16417503356933594,1.2046692371368408,1.250809669494629 diff --git a/results/combined/merges_timed/garbagemule/mobarena.csv b/results/combined/merges_timed/garbagemule/mobarena.csv index de3d8504ea..2d6e496920 100644 --- a/results/combined/merges_timed/garbagemule/mobarena.csv +++ b/results/combined/merges_timed/garbagemule/mobarena.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -77,refs/remotes/origin/pull/693,c0c07ed2230ad53326afe6a227c61ef7275a9cd9,5c8c1939640d29a1aff926a01d07ed59746d320f,6be130daf1af0f3fd0f9842177cc3ceac12f0fa5,,6d6e5550abe40a46bd748cf20f4082f0f661eebb7edd7bcf872334bc77f55774,Tests_passed,bcb0a8938973b55d69531353df104c3a6f9716e3ff4431e5f37085ca9acf2719,Tests_passed,True,True,True,True,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,31360513ad0b59eda1476cb95bd847df1d58553b11fa3398a84724adeedbd64c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,b4d16a050538146fd6b2790430e76b7f31429fa9c0bbf07a38a211da72476114,Merge_failed,b4d16a050538146fd6b2790430e76b7f31429fa9c0bbf07a38a211da72476114,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,d5af3729a299a3733aede7d597a283c465f703361504fbd0180682df8486da79,0.047921180725097656,0.04127955436706543,0.04158496856689453,0.045073509216308594,0.04485177993774414,0.04928755760192871,0.04156041145324707,0.16989493370056152,0.06761646270751953,0.07280206680297852,0.0701148509979248,0.11901330947875977,0.9228169918060303,0.23273563385009766 +77,refs/remotes/origin/pull/693,c0c07ed2230ad53326afe6a227c61ef7275a9cd9,5c8c1939640d29a1aff926a01d07ed59746d320f,6be130daf1af0f3fd0f9842177cc3ceac12f0fa5,,6d6e5550abe40a46bd748cf20f4082f0f661eebb7edd7bcf872334bc77f55774,Tests_passed,bcb0a8938973b55d69531353df104c3a6f9716e3ff4431e5f37085ca9acf2719,Tests_passed,True,True,True,True,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,31360513ad0b59eda1476cb95bd847df1d58553b11fa3398a84724adeedbd64c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,b4d16a050538146fd6b2790430e76b7f31429fa9c0bbf07a38a211da72476114,Merge_failed,b4d16a050538146fd6b2790430e76b7f31429fa9c0bbf07a38a211da72476114,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,d5af3729a299a3733aede7d597a283c465f703361504fbd0180682df8486da79,0.047921180725097656,0.04127955436706543,0.04158496856689453,0.045073509216308594,0.04485177993774414,0.04928755760192871,0.04156041145324707,0.16989493370056152,0.06761646270751953,0.07215499877929688,0.07200074195861816,0.11901330947875977,0.9228169918060303,0.23273563385009766 diff --git a/results/combined/merges_timed/gatein/gatein-api-java.csv b/results/combined/merges_timed/gatein/gatein-api-java.csv index 872b3d1f32..25f9abbde0 100644 --- a/results/combined/merges_timed/gatein/gatein-api-java.csv +++ b/results/combined/merges_timed/gatein/gatein-api-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,1ae0553ab8dd0574e86a2b073e35f3a0331ada3c,8693b9e5c6ab2b2f04acc311a0bfa37ad157c391,dc25033b5792eb3b2692252bedb363bafb2a6ad3,,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Tests_passed,6312f583ebbaa3f8b7089e2ab24f513bb713c54a8f32df638ce77c6aa0b3fa68,Tests_passed,True,True,True,True,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,f4b28598fdd7f78c85dc0b53ef453dfd81ab80f190c28beed620967f0231431f,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,ddbf41505967fe1ba2b8d74b0dc4811e3d64955d8dec5e1bb1d76a886210a5e7,Merge_failed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,17dea24281c7a14bb0bc2900253ce5ead3af7583fd2f8b8e6dd801252a3f65b9,Merge_failed,17dea24281c7a14bb0bc2900253ce5ead3af7583fd2f8b8e6dd801252a3f65b9,Merge_failed,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,40c6f8a01d5f775e60fdcb0c3059bb9d51a5f28d7348bf21a39227f1880ac561,0.046964168548583984,0.05846238136291504,0.06241106986999512,0.05993795394897461,0.05231428146362305,0.05549001693725586,0.049141883850097656,0.32676076889038086,0.09630131721496582,0.1415696144104004,0.14136552810668945,0.2130107879638672,0.9639706611633301,0.21483087539672852 +1,refs/heads/master,1ae0553ab8dd0574e86a2b073e35f3a0331ada3c,8693b9e5c6ab2b2f04acc311a0bfa37ad157c391,dc25033b5792eb3b2692252bedb363bafb2a6ad3,,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Tests_passed,6312f583ebbaa3f8b7089e2ab24f513bb713c54a8f32df638ce77c6aa0b3fa68,Tests_passed,True,True,True,True,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,f4b28598fdd7f78c85dc0b53ef453dfd81ab80f190c28beed620967f0231431f,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,ddbf41505967fe1ba2b8d74b0dc4811e3d64955d8dec5e1bb1d76a886210a5e7,Merge_failed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,17dea24281c7a14bb0bc2900253ce5ead3af7583fd2f8b8e6dd801252a3f65b9,Merge_failed,17dea24281c7a14bb0bc2900253ce5ead3af7583fd2f8b8e6dd801252a3f65b9,Merge_failed,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,40c6f8a01d5f775e60fdcb0c3059bb9d51a5f28d7348bf21a39227f1880ac561,0.046964168548583984,0.05846238136291504,0.06241106986999512,0.05993795394897461,0.05231428146362305,0.05549001693725586,0.049141883850097656,0.32676076889038086,0.09630131721496582,0.1409602165222168,0.1412980556488037,0.2130107879638672,0.9639706611633301,0.21483087539672852 diff --git a/results/combined/merges_timed/gbif/name-parser.csv b/results/combined/merges_timed/gbif/name-parser.csv index beb9f46cf4..65edec2a2c 100644 --- a/results/combined/merges_timed/gbif/name-parser.csv +++ b/results/combined/merges_timed/gbif/name-parser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,d8417e10fb442f6cf0342569ee1de8cc5257facd,79712709a91e47093fde22401fcfb87290790597,b42bacaf155d146e60825185902d264d5981afa4,,True,True,8807934239dfe00ccc91427e0eceb97c944420517562c1fc306ef1969a00ff67,Tests_passed,b0a1ae7e75622b7ddbf87f39c53d8ebe7a7baaa893bd1e117e10d0bc0a712c86,Tests_passed,True,True,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,0.021604299545288086,0.023651838302612305,0.026897668838500977,0.027187585830688477,0.026285648345947266,0.026378154754638672,0.02587294578552246,0.07102751731872559,0.021873950958251953,0.3751235008239746,0.37532711029052734,0.13080310821533203,3.0228819847106934,0.21561574935913086 +4,refs/heads/master,d8417e10fb442f6cf0342569ee1de8cc5257facd,79712709a91e47093fde22401fcfb87290790597,b42bacaf155d146e60825185902d264d5981afa4,,True,True,8807934239dfe00ccc91427e0eceb97c944420517562c1fc306ef1969a00ff67,Tests_passed,b0a1ae7e75622b7ddbf87f39c53d8ebe7a7baaa893bd1e117e10d0bc0a712c86,Tests_passed,True,True,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,0.021604299545288086,0.023651838302612305,0.026897668838500977,0.027187585830688477,0.026285648345947266,0.026378154754638672,0.02587294578552246,0.07102751731872559,0.021873950958251953,0.3693530559539795,0.3661653995513916,0.13080310821533203,3.0228819847106934,0.21561574935913086 diff --git a/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv b/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv index 7da76eceae..8309ed17dd 100644 --- a/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv +++ b/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,f98ce134b844a7864b43803c6e7ffc3f1b7d4e5c,9ca8d7782c731dda67fef1419c27b82e7e80617b,72132711af2ae9fbd4426f72c37afab61afa92a6,,True,True,74efbe59af6439cd5139bbbee8aec9360084924944dd2737dd2e3a5c7a4c124b,Tests_passed,cfcdea3830c463505a71359096886b29a5f6aa119e1038e81291733961ffbf5d,Tests_passed,True,True,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,e2cdc82803fa9ee526418974279d80a66dd1f96e71a4a396852cd86d1e18e1ac,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,52b0b9a7a5b0b44bbca8e1407527259c243eef752f0edf99edaa528ecb49ca2d,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,96e19624eb8fdf006d253c36456328bbcff4e44eb226aae9a6b96643323fd7dd,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,8b60e27d640e3814788146cd5293fc579ddfda42bd969c0ff417920e8ccd5ee1,Merge_failed,660cd1f6d2ff4ed28baa4646b8617176a4431f3b0c4e2b4e99ef1da6562c3386,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,d7f22c7864302d4e697f8d933ec7b402b331d2ef3c9c351cf8a28d710ab2807b,Merge_failed,964bc66528ebb89c190d5a76fb277807adddda6a105d5a7e737231be90196450,0.04081249237060547,0.0453946590423584,0.04455375671386719,0.043009281158447266,0.04331660270690918,0.0393366813659668,0.04028797149658203,0.35571956634521484,0.09105992317199707,0.2821059226989746,0.2764711380004883,0.29741930961608887,1.413137674331665,0.35234928131103516 +4,refs/heads/master,f98ce134b844a7864b43803c6e7ffc3f1b7d4e5c,9ca8d7782c731dda67fef1419c27b82e7e80617b,72132711af2ae9fbd4426f72c37afab61afa92a6,,True,True,74efbe59af6439cd5139bbbee8aec9360084924944dd2737dd2e3a5c7a4c124b,Tests_passed,cfcdea3830c463505a71359096886b29a5f6aa119e1038e81291733961ffbf5d,Tests_passed,True,True,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,e2cdc82803fa9ee526418974279d80a66dd1f96e71a4a396852cd86d1e18e1ac,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,52b0b9a7a5b0b44bbca8e1407527259c243eef752f0edf99edaa528ecb49ca2d,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,96e19624eb8fdf006d253c36456328bbcff4e44eb226aae9a6b96643323fd7dd,Merge_failed,ed75bd698fdc612c4e02f11398e9d978a097156d80782e0f5752ebc93f3471d9,Merge_failed,8b60e27d640e3814788146cd5293fc579ddfda42bd969c0ff417920e8ccd5ee1,Merge_failed,660cd1f6d2ff4ed28baa4646b8617176a4431f3b0c4e2b4e99ef1da6562c3386,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,d7f22c7864302d4e697f8d933ec7b402b331d2ef3c9c351cf8a28d710ab2807b,Merge_failed,964bc66528ebb89c190d5a76fb277807adddda6a105d5a7e737231be90196450,0.04081249237060547,0.0453946590423584,0.04455375671386719,0.043009281158447266,0.04331660270690918,0.0393366813659668,0.04028797149658203,0.35571956634521484,0.09105992317199707,0.27647876739501953,0.27506136894226074,0.29741930961608887,1.413137674331665,0.35234928131103516 diff --git a/results/combined/merges_timed/geoffreywiseman/moo.csv b/results/combined/merges_timed/geoffreywiseman/moo.csv index 5e62fda73b..e8df4adf3b 100644 --- a/results/combined/merges_timed/geoffreywiseman/moo.csv +++ b/results/combined/merges_timed/geoffreywiseman/moo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,c87b8cb339acf2e0e5d38ed55775bd9b6a3c3d1f,736976881b149b25ed7c051198933e47d3a99494,dfd80886d7f9acf8e4de719d2876e668dac92d1d,,True,True,4f41e2065e911154cb29000823a47712b4316f475a3bcc2b6d32e1fcf0f1541f,Tests_passed,b29e2909ad9d5f27a7d9927a070901bb936df4cc568e1672a9e19996a1ff39c8,Tests_passed,True,True,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,052a6031572252a2038ce80b546e12f3535dd232e06bfd8267bc643fc15983d2,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,c0104be1a648d51bd4d74885fbc3984b3c994df3d6e12393563e8f381abfa656,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,4df957cd0c297b87a7531939e37c54666f499698fd062bf6a2662968b510df09,Merge_failed,cc23e6f47d965f5919a716633349aa1bf92373076ad05134d186b963872eeaa5,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,14be6ddc97fe0b86417f6c664aa6a07a1bb0845973d2cd2a447b76f4ae907c59,Merge_failed,ba8a69a5e10b5157ab281d5c4962aee263096d450d1dabec8d0244f9f5e4b788,0.022982358932495117,0.04178667068481445,0.03760051727294922,0.04234743118286133,0.04782748222351074,0.044286489486694336,0.04223132133483887,0.21901392936706543,0.08066582679748535,0.23249483108520508,0.20568299293518066,0.19098854064941406,0.7496030330657959,0.20331931114196777 +6,refs/heads/master,c87b8cb339acf2e0e5d38ed55775bd9b6a3c3d1f,736976881b149b25ed7c051198933e47d3a99494,dfd80886d7f9acf8e4de719d2876e668dac92d1d,,True,True,4f41e2065e911154cb29000823a47712b4316f475a3bcc2b6d32e1fcf0f1541f,Tests_passed,b29e2909ad9d5f27a7d9927a070901bb936df4cc568e1672a9e19996a1ff39c8,Tests_passed,True,True,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,052a6031572252a2038ce80b546e12f3535dd232e06bfd8267bc643fc15983d2,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,c0104be1a648d51bd4d74885fbc3984b3c994df3d6e12393563e8f381abfa656,Merge_failed,7286403868e16873bdba37687369d16764a41143713a2e942ad6a0876bca9dea,Merge_failed,4df957cd0c297b87a7531939e37c54666f499698fd062bf6a2662968b510df09,Merge_failed,cc23e6f47d965f5919a716633349aa1bf92373076ad05134d186b963872eeaa5,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,14be6ddc97fe0b86417f6c664aa6a07a1bb0845973d2cd2a447b76f4ae907c59,Merge_failed,ba8a69a5e10b5157ab281d5c4962aee263096d450d1dabec8d0244f9f5e4b788,0.022982358932495117,0.04178667068481445,0.03760051727294922,0.04234743118286133,0.04782748222351074,0.044286489486694336,0.04223132133483887,0.21901392936706543,0.08066582679748535,0.1592404842376709,0.15921664237976074,0.19098854064941406,0.7496030330657959,0.20331931114196777 diff --git a/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv b/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv index 56df126257..7cab335de7 100644 --- a/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv +++ b/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/heads/master,8073671631cb3f2be2ce5c96fbafe1c35d81b2bb,471c860007c6c0a9853ce3d3cd5e2dacdf97d18d,b7bef77052a50b347d59119b1c5b91d34c5bda73,,True,True,9798888e4606350edbc1dc604512533f1afcd3d102315e815a89cc028c12699a,Tests_passed,28cd9894526d49360f3c978d4fc4869f4dca39c0b6377c35d38d5c46cc2265c9,Tests_passed,True,True,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,0.02625417709350586,0.026995420455932617,0.03398561477661133,0.03500795364379883,0.034331560134887695,0.034569501876831055,0.034557342529296875,0.06989121437072754,0.02616572380065918,0.186248779296875,0.17681050300598145,0.08507347106933594,1.1393253803253174,0.20833659172058105 +27,refs/heads/master,8073671631cb3f2be2ce5c96fbafe1c35d81b2bb,471c860007c6c0a9853ce3d3cd5e2dacdf97d18d,b7bef77052a50b347d59119b1c5b91d34c5bda73,,True,True,9798888e4606350edbc1dc604512533f1afcd3d102315e815a89cc028c12699a,Tests_passed,28cd9894526d49360f3c978d4fc4869f4dca39c0b6377c35d38d5c46cc2265c9,Tests_passed,True,True,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,0.02625417709350586,0.026995420455932617,0.03398561477661133,0.03500795364379883,0.034331560134887695,0.034569501876831055,0.034557342529296875,0.06989121437072754,0.02616572380065918,0.184617280960083,0.18544411659240723,0.08507347106933594,1.1393253803253174,0.20833659172058105 diff --git a/results/combined/merges_timed/gephi/gephi.csv b/results/combined/merges_timed/gephi/gephi.csv index bb1aa79ca1..e2fd2cc73c 100644 --- a/results/combined/merges_timed/gephi/gephi.csv +++ b/results/combined/merges_timed/gephi/gephi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,True,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,Tests_passed,True,True,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,7406cbe09eb9cc018f282cc44d729f249a17dd3e5086290ce4370918c33ded0d,Tests_passed,7406cbe09eb9cc018f282cc44d729f249a17dd3e5086290ce4370918c33ded0d,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,0.06739616394042969,0.08657193183898926,0.06635451316833496,0.08040285110473633,0.07421159744262695,0.07885622978210449,0.07919144630432129,0.2551453113555908,0.0712900161743164,0.3543822765350342,0.3567981719970703,0.22736668586730957,1.7211782932281494,1.9990110397338867 +665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,True,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,Tests_passed,True,True,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,7406cbe09eb9cc018f282cc44d729f249a17dd3e5086290ce4370918c33ded0d,Tests_passed,7406cbe09eb9cc018f282cc44d729f249a17dd3e5086290ce4370918c33ded0d,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,0.06739616394042969,0.08657193183898926,0.06635451316833496,0.08040285110473633,0.07421159744262695,0.07885622978210449,0.07919144630432129,0.2551453113555908,0.0712900161743164,0.3477144241333008,0.35315513610839844,0.22736668586730957,1.7211782932281494,1.9990110397338867 diff --git a/results/combined/merges_timed/getbridge/bridge-java.csv b/results/combined/merges_timed/getbridge/bridge-java.csv index d41bdc79a4..6eccbf897b 100644 --- a/results/combined/merges_timed/getbridge/bridge-java.csv +++ b/results/combined/merges_timed/getbridge/bridge-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,35d226d99b31bc824c3a3460ec0611c8572a081c,39385be68dcbf46eacf42c29320fa09a9c27a642,de36e6eace5a1de9121d9fdbb234ecd27efdfe7c,,True,True,091b3765abe2aa56d7f5c1573af9354f930e9de2c7177c89868b711905761bae,Tests_passed,ca47144f2183cde325593f9303d1592b1ac5cd08e659f0e9cee28823d1bccecb,Tests_passed,True,True,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,7a391cdfeafebe9dce584bb5290bbc40164cd1a4bd5c117f8a96b7ffb0379c9b,Merge_failed,7a391cdfeafebe9dce584bb5290bbc40164cd1a4bd5c117f8a96b7ffb0379c9b,Merge_failed,7b549e979368094792ffddb3c3b47c0fdd5fe4d0d7944e18c8b7d8ae1553ca45,Merge_failed,165f7adccb4fb6319cda69eba3d5efb65b18f31a963a842ac0a3e9ea4d03e316,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3a6d97db6a659ae2ca305747097d1dc63251c7f3f7573e392750681b469d3478,Merge_failed,3a6d97db6a659ae2ca305747097d1dc63251c7f3f7573e392750681b469d3478,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,25d9988fac354423e5f8451b1174a5145a9670c259edf490a7be9cdd24bc13aa,0.039006710052490234,0.04354596138000488,0.04274892807006836,0.04142308235168457,0.03576517105102539,0.045049428939819336,0.03934764862060547,0.22788643836975098,0.05917477607727051,0.23631048202514648,0.2372434139251709,0.18034982681274414,1.5179078578948975,0.18428564071655273 +3,refs/heads/master,35d226d99b31bc824c3a3460ec0611c8572a081c,39385be68dcbf46eacf42c29320fa09a9c27a642,de36e6eace5a1de9121d9fdbb234ecd27efdfe7c,,True,True,091b3765abe2aa56d7f5c1573af9354f930e9de2c7177c89868b711905761bae,Tests_passed,ca47144f2183cde325593f9303d1592b1ac5cd08e659f0e9cee28823d1bccecb,Tests_passed,True,True,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,7a391cdfeafebe9dce584bb5290bbc40164cd1a4bd5c117f8a96b7ffb0379c9b,Merge_failed,7a391cdfeafebe9dce584bb5290bbc40164cd1a4bd5c117f8a96b7ffb0379c9b,Merge_failed,7b549e979368094792ffddb3c3b47c0fdd5fe4d0d7944e18c8b7d8ae1553ca45,Merge_failed,165f7adccb4fb6319cda69eba3d5efb65b18f31a963a842ac0a3e9ea4d03e316,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3a6d97db6a659ae2ca305747097d1dc63251c7f3f7573e392750681b469d3478,Merge_failed,3a6d97db6a659ae2ca305747097d1dc63251c7f3f7573e392750681b469d3478,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,25d9988fac354423e5f8451b1174a5145a9670c259edf490a7be9cdd24bc13aa,0.039006710052490234,0.04354596138000488,0.04274892807006836,0.04142308235168457,0.03576517105102539,0.045049428939819336,0.03934764862060547,0.22788643836975098,0.05917477607727051,0.231248140335083,0.22951912879943848,0.18034982681274414,1.5179078578948975,0.18428564071655273 diff --git a/results/combined/merges_timed/ghillairet/emfjson.csv b/results/combined/merges_timed/ghillairet/emfjson.csv index 894cb6eaa2..2f2efd4003 100644 --- a/results/combined/merges_timed/ghillairet/emfjson.csv +++ b/results/combined/merges_timed/ghillairet/emfjson.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,7aebd6f36990fc52abeb4c10e24f8d987b5be744,e7d28b22ce7e16623e9950d7677c18282e71212b,5bad44904199431d01d5568985e8e28e01951ad1,,True,True,f19df67228bdc9287b0a7ac458d47f1ca553f3bde7e4c938429e94f304083360,Tests_passed,c14394d99e13a4ee10a4a19d6f93ec7ee9a74c8d3c5e9388ecd2b0b2decd0518,Tests_passed,True,True,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,b9d7a70ce8896be7b942bcb4238f0c4871a45849e607a0fa7d23d8ece3c351b1,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,3eb4b45aea611c7d6e42d1df369bd1d4be786d66281aa6492d316664fa30c1ed,Merge_failed,3eb4b45aea611c7d6e42d1df369bd1d4be786d66281aa6492d316664fa30c1ed,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,5ed38c52965c4a5bb89647375af1809e5726bd1ded03e025b3faaa1dc59f2372,0.01703333854675293,0.017342805862426758,0.019044160842895508,0.018958568572998047,0.01949787139892578,0.019590139389038086,0.01914215087890625,0.06914091110229492,0.030199289321899414,0.2118687629699707,0.21265125274658203,0.1309065818786621,1.545112133026123,0.24919795989990234 +10,refs/heads/master,7aebd6f36990fc52abeb4c10e24f8d987b5be744,e7d28b22ce7e16623e9950d7677c18282e71212b,5bad44904199431d01d5568985e8e28e01951ad1,,True,True,f19df67228bdc9287b0a7ac458d47f1ca553f3bde7e4c938429e94f304083360,Tests_passed,c14394d99e13a4ee10a4a19d6f93ec7ee9a74c8d3c5e9388ecd2b0b2decd0518,Tests_passed,True,True,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,b9d7a70ce8896be7b942bcb4238f0c4871a45849e607a0fa7d23d8ece3c351b1,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,3eb4b45aea611c7d6e42d1df369bd1d4be786d66281aa6492d316664fa30c1ed,Merge_failed,3eb4b45aea611c7d6e42d1df369bd1d4be786d66281aa6492d316664fa30c1ed,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,5ed38c52965c4a5bb89647375af1809e5726bd1ded03e025b3faaa1dc59f2372,0.01703333854675293,0.017342805862426758,0.019044160842895508,0.018958568572998047,0.01949787139892578,0.019590139389038086,0.01914215087890625,0.06914091110229492,0.030199289321899414,0.21041584014892578,0.20933175086975098,0.1309065818786621,1.545112133026123,0.24919795989990234 diff --git a/results/combined/merges_timed/giltene/jhiccup.csv b/results/combined/merges_timed/giltene/jhiccup.csv index c157234f86..3fd40848ba 100644 --- a/results/combined/merges_timed/giltene/jhiccup.csv +++ b/results/combined/merges_timed/giltene/jhiccup.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,d7891ccaab5a84dd05d0c5272609b89ebd1b0a22,cff9ba508b79a8ea7cb050c77e5d3b67a5e85ebf,04d63c4409f7fc55c85c4ed96274252b4613f0f8,,True,True,0fdfad91f0832933588e70df22f37fc4f9ca0841640e1f006a0d742cec42d1da,Tests_passed,26f21b04480af7c661e3a78bbd4daa51958edb2a85d3c57b60141aa7893523e7,Tests_passed,True,True,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,0.04380512237548828,0.04679250717163086,0.04210352897644043,0.035044193267822266,0.0547184944152832,0.050103187561035156,0.044306278228759766,0.17638349533081055,0.04933428764343262,0.1470317840576172,0.14763259887695312,0.10360598564147949,0.5432846546173096,0.20368528366088867 +24,refs/heads/master,d7891ccaab5a84dd05d0c5272609b89ebd1b0a22,cff9ba508b79a8ea7cb050c77e5d3b67a5e85ebf,04d63c4409f7fc55c85c4ed96274252b4613f0f8,,True,True,0fdfad91f0832933588e70df22f37fc4f9ca0841640e1f006a0d742cec42d1da,Tests_passed,26f21b04480af7c661e3a78bbd4daa51958edb2a85d3c57b60141aa7893523e7,Tests_passed,True,True,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,0.04380512237548828,0.04679250717163086,0.04210352897644043,0.035044193267822266,0.0547184944152832,0.050103187561035156,0.044306278228759766,0.17638349533081055,0.04933428764343262,0.14476370811462402,0.14539122581481934,0.10360598564147949,0.5432846546173096,0.20368528366088867 diff --git a/results/combined/merges_timed/gini/dropwizard-gelf.csv b/results/combined/merges_timed/gini/dropwizard-gelf.csv index f589d4cd5d..99b597adf8 100644 --- a/results/combined/merges_timed/gini/dropwizard-gelf.csv +++ b/results/combined/merges_timed/gini/dropwizard-gelf.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,b1cd41cdb5bfe0b33d5db7718beaa984692e83ce,f6e7bbc12ed553c961d6500d003758b558eb2eb6,7bd73b3b895934e2745d4e86a224ee5de6cfe403,,8acdc5b2078b573101ecca3d863d9838fdc65edb266090772b12cafedd52ecf6,Tests_passed,c445b3a0de324fdbf75ddcada0e1df47625412c029afc67ebde4c0afbbf4511a,Tests_passed,True,True,True,True,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,aac1296d48b6d5d2eee3669f82be0d959ef34fda232f93eafe9b4bb949b86d64,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,f36437a0f1f606af6be10a17b74bae8413b1eceb84de93a78e2d6a46b8588660,Merge_failed,f36437a0f1f606af6be10a17b74bae8413b1eceb84de93a78e2d6a46b8588660,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,5d567941153a325083d50c3cd83b92f336177fc09ed043bfc88eb08eef0a6e41,Merge_failed,dfb2b1ba7d1f2183880da9c1640a5668df3af0ea1af23c0fed41c218c717ed6a,0.007695436477661133,0.007870674133300781,0.007933616638183594,0.007806539535522461,0.007956266403198242,0.008195638656616211,0.008347272872924805,0.05582594871520996,0.015309333801269531,0.15695619583129883,0.15827608108520508,0.17441821098327637,0.7540080547332764,0.16476202011108398 +8,refs/heads/master,b1cd41cdb5bfe0b33d5db7718beaa984692e83ce,f6e7bbc12ed553c961d6500d003758b558eb2eb6,7bd73b3b895934e2745d4e86a224ee5de6cfe403,,8acdc5b2078b573101ecca3d863d9838fdc65edb266090772b12cafedd52ecf6,Tests_passed,c445b3a0de324fdbf75ddcada0e1df47625412c029afc67ebde4c0afbbf4511a,Tests_passed,True,True,True,True,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,aac1296d48b6d5d2eee3669f82be0d959ef34fda232f93eafe9b4bb949b86d64,Merge_failed,586b764ddac85b60680e4d49ed4b496307b919d50a5e179b53a6ec5adec7c357,Merge_failed,f36437a0f1f606af6be10a17b74bae8413b1eceb84de93a78e2d6a46b8588660,Merge_failed,f36437a0f1f606af6be10a17b74bae8413b1eceb84de93a78e2d6a46b8588660,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,5d567941153a325083d50c3cd83b92f336177fc09ed043bfc88eb08eef0a6e41,Merge_failed,dfb2b1ba7d1f2183880da9c1640a5668df3af0ea1af23c0fed41c218c717ed6a,0.007695436477661133,0.007870674133300781,0.007933616638183594,0.007806539535522461,0.007956266403198242,0.008195638656616211,0.008347272872924805,0.05582594871520996,0.015309333801269531,0.15571069717407227,0.1614055633544922,0.17441821098327637,0.7540080547332764,0.16476202011108398 diff --git a/results/combined/merges_timed/gitools/gitools.csv b/results/combined/merges_timed/gitools/gitools.csv index 824770c267..3cb8eaaa28 100644 --- a/results/combined/merges_timed/gitools/gitools.csv +++ b/results/combined/merges_timed/gitools/gitools.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -67,refs/heads/develop,f3903af522feb02e11fd24b68fe5c1d56608aa60,a257a960764251de0a98fd364a0249f69e965901,92155a3fbda034802dc90b8c6f99933fc812d9f6,,faa95e610ff712a31bb03f0ef96692efeca0545d9af00aac376264d1270ed459,Tests_passed,7798b09efc2001f0d641acf0875b043bef91c1906ea8ea849b0bfc1aed32dbec,Tests_passed,True,True,True,True,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,f1366b3b81512cdbb3d536e2e350652877f92d0ca23cc89aa8e5efdc0d81e084,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,0.07227277755737305,0.06765937805175781,0.06451225280761719,0.07369160652160645,0.06283330917358398,0.04851126670837402,0.06457734107971191,0.18639564514160156,0.07112622261047363,0.16230559349060059,0.16163039207458496,0.11374831199645996,0.8357946872711182,0.41036272048950195 +67,refs/heads/develop,f3903af522feb02e11fd24b68fe5c1d56608aa60,a257a960764251de0a98fd364a0249f69e965901,92155a3fbda034802dc90b8c6f99933fc812d9f6,,faa95e610ff712a31bb03f0ef96692efeca0545d9af00aac376264d1270ed459,Tests_passed,7798b09efc2001f0d641acf0875b043bef91c1906ea8ea849b0bfc1aed32dbec,Tests_passed,True,True,True,True,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,f1366b3b81512cdbb3d536e2e350652877f92d0ca23cc89aa8e5efdc0d81e084,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,0.07227277755737305,0.06765937805175781,0.06451225280761719,0.07369160652160645,0.06283330917358398,0.04851126670837402,0.06457734107971191,0.18639564514160156,0.07112622261047363,0.15842342376708984,0.1602017879486084,0.11374831199645996,0.8357946872711182,0.41036272048950195 diff --git a/results/combined/merges_timed/giusepperizzo/nerd4java.csv b/results/combined/merges_timed/giusepperizzo/nerd4java.csv index edb86d4b23..40f8d19757 100644 --- a/results/combined/merges_timed/giusepperizzo/nerd4java.csv +++ b/results/combined/merges_timed/giusepperizzo/nerd4java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,2aadca9519e8fb2a4deeebc9b9ea84c80ea99bc6,601cd85d90c07c437fe308ece191569491a4bd60,7d6f9ef82321090583acc0f9df5d0fa8963f3ae0,,True,True,cf61ee6aea03216e56e36dcd3383e236dff6bd0530d5132733d2f098179ac981,Tests_passed,b2ab4c6a026133cfba798cba574544d9beee86dd3a5b3d8e284b0e8de6800723,Tests_passed,True,True,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,0.03541731834411621,0.04048347473144531,0.03926539421081543,0.04137825965881348,0.03510928153991699,0.03944277763366699,0.041933298110961914,0.16466879844665527,0.04042863845825195,0.15776801109313965,0.2394886016845703,0.11331558227539062,0.4801347255706787,0.18338561058044434 +2,refs/heads/master,2aadca9519e8fb2a4deeebc9b9ea84c80ea99bc6,601cd85d90c07c437fe308ece191569491a4bd60,7d6f9ef82321090583acc0f9df5d0fa8963f3ae0,,True,True,cf61ee6aea03216e56e36dcd3383e236dff6bd0530d5132733d2f098179ac981,Tests_passed,b2ab4c6a026133cfba798cba574544d9beee86dd3a5b3d8e284b0e8de6800723,Tests_passed,True,True,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,0.03541731834411621,0.04048347473144531,0.03926539421081543,0.04137825965881348,0.03510928153991699,0.03944277763366699,0.041933298110961914,0.16466879844665527,0.04042863845825195,0.14157414436340332,0.14336156845092773,0.11331558227539062,0.4801347255706787,0.18338561058044434 diff --git a/results/combined/merges_timed/glamdring/aardwark.csv b/results/combined/merges_timed/glamdring/aardwark.csv index d6ebc68ec2..807e7f5d80 100644 --- a/results/combined/merges_timed/glamdring/aardwark.csv +++ b/results/combined/merges_timed/glamdring/aardwark.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,8bab377cc754b72f9b0d1181a98227787b43758a,12af56162aaf2449a6fd642ba890112a38f4e7d0,4bdde8ed558c76923d845169a63b03ed35162761,,True,True,7cf3e7509213b3a5efc6e8e5ce377cb7dd31333d087e92390d0555bf621b34e9,Tests_passed,b183aaa6130ecdc7cf137a384d50d096599a2374722fa163b181c20d20252c61,Tests_passed,True,True,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,448f59c5ff1ff934d7908c9a9dda0ea7a89cf9a95b30e512fb82ff805ab22fa9,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,30f69eda9e433bae5caf27df2d97b59453d74be49a5fff5fe1050d2354ca6f59,Merge_failed,270b68dd9b4dc7807f582cdb2eb48cb40885e2135d7ece79ca31a9151129f958,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,ed3e0e1b261da130c758f645813f5862c012848b683eaec93aa6c00b9b0bb351,Merge_failed,a83acc620d07cf99c37263ace4b016e2f83ba3836545648d4b7b780fc6b2b206,0.04043436050415039,0.0368497371673584,0.04034423828125,0.03921055793762207,0.039563894271850586,0.04023909568786621,0.04023480415344238,0.22007083892822266,0.0733194351196289,0.06475496292114258,0.0744936466217041,0.16844654083251953,1.0568814277648926,0.1775503158569336 +5,refs/heads/master,8bab377cc754b72f9b0d1181a98227787b43758a,12af56162aaf2449a6fd642ba890112a38f4e7d0,4bdde8ed558c76923d845169a63b03ed35162761,,True,True,7cf3e7509213b3a5efc6e8e5ce377cb7dd31333d087e92390d0555bf621b34e9,Tests_passed,b183aaa6130ecdc7cf137a384d50d096599a2374722fa163b181c20d20252c61,Tests_passed,True,True,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,448f59c5ff1ff934d7908c9a9dda0ea7a89cf9a95b30e512fb82ff805ab22fa9,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,30f69eda9e433bae5caf27df2d97b59453d74be49a5fff5fe1050d2354ca6f59,Merge_failed,270b68dd9b4dc7807f582cdb2eb48cb40885e2135d7ece79ca31a9151129f958,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,ed3e0e1b261da130c758f645813f5862c012848b683eaec93aa6c00b9b0bb351,Merge_failed,a83acc620d07cf99c37263ace4b016e2f83ba3836545648d4b7b780fc6b2b206,0.04043436050415039,0.0368497371673584,0.04034423828125,0.03921055793762207,0.039563894271850586,0.04023909568786621,0.04023480415344238,0.22007083892822266,0.0733194351196289,0.06497812271118164,0.06360840797424316,0.16844654083251953,1.0568814277648926,0.1775503158569336 diff --git a/results/combined/merges_timed/glenkpeterson/fp4java7.csv b/results/combined/merges_timed/glenkpeterson/fp4java7.csv index d376a513d7..c80549d1d8 100644 --- a/results/combined/merges_timed/glenkpeterson/fp4java7.csv +++ b/results/combined/merges_timed/glenkpeterson/fp4java7.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,Tests_passed,True,True,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,afb2665f8919f07710e634bd72739f88cdd8df64ca6a71c8040d741911aeb714,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d704521e13b60e4b25c8931ca39d60f0b50e1d42e5c467ae4ae69c8eb6b08547,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,2ee8270f5b182c860280c43a90fd2c8f5b3077228b96c62ace711101c100bd89,Merge_failed,46c3531e949fa5c64cab7513d22d21627781e1a3bc662e40a7fdd075131ae6fc,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,0.0763552188873291,0.07716488838195801,0.09298086166381836,0.08633732795715332,0.08066844940185547,0.08858489990234375,0.08294558525085449,0.9754092693328857,0.1455068588256836,1.7014212608337402,1.7011442184448242,0.8740217685699463,15.489113092422485,0.42170238494873047 +6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,Tests_passed,True,True,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,afb2665f8919f07710e634bd72739f88cdd8df64ca6a71c8040d741911aeb714,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d704521e13b60e4b25c8931ca39d60f0b50e1d42e5c467ae4ae69c8eb6b08547,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,2ee8270f5b182c860280c43a90fd2c8f5b3077228b96c62ace711101c100bd89,Merge_failed,46c3531e949fa5c64cab7513d22d21627781e1a3bc662e40a7fdd075131ae6fc,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,0.0763552188873291,0.07716488838195801,0.09298086166381836,0.08633732795715332,0.08066844940185547,0.08858489990234375,0.08294558525085449,0.9754092693328857,0.1455068588256836,1.6811120510101318,1.6872820854187012,0.8740217685699463,15.489113092422485,0.42170238494873047 diff --git a/results/combined/merges_timed/glenkpeterson/j-cicle.csv b/results/combined/merges_timed/glenkpeterson/j-cicle.csv index 1bf5415542..abc3d7ffb9 100644 --- a/results/combined/merges_timed/glenkpeterson/j-cicle.csv +++ b/results/combined/merges_timed/glenkpeterson/j-cicle.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,Tests_passed,True,True,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,afb2665f8919f07710e634bd72739f88cdd8df64ca6a71c8040d741911aeb714,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d704521e13b60e4b25c8931ca39d60f0b50e1d42e5c467ae4ae69c8eb6b08547,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,2ee8270f5b182c860280c43a90fd2c8f5b3077228b96c62ace711101c100bd89,Merge_failed,46c3531e949fa5c64cab7513d22d21627781e1a3bc662e40a7fdd075131ae6fc,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,0.06952524185180664,0.07091760635375977,0.08957076072692871,0.08635234832763672,0.07971477508544922,0.08589744567871094,0.08394312858581543,0.9148585796356201,0.11381125450134277,1.6643688678741455,1.6710915565490723,0.8695683479309082,15.517658233642578,0.4151332378387451 +6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,Tests_passed,True,True,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,afb2665f8919f07710e634bd72739f88cdd8df64ca6a71c8040d741911aeb714,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d704521e13b60e4b25c8931ca39d60f0b50e1d42e5c467ae4ae69c8eb6b08547,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,2ee8270f5b182c860280c43a90fd2c8f5b3077228b96c62ace711101c100bd89,Merge_failed,46c3531e949fa5c64cab7513d22d21627781e1a3bc662e40a7fdd075131ae6fc,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,0.06952524185180664,0.07091760635375977,0.08957076072692871,0.08635234832763672,0.07971477508544922,0.08589744567871094,0.08394312858581543,0.9148585796356201,0.11381125450134277,1.6930720806121826,1.6770260334014893,0.8695683479309082,15.517658233642578,0.4151332378387451 diff --git a/results/combined/merges_timed/glenkpeterson/j-sicle.csv b/results/combined/merges_timed/glenkpeterson/j-sicle.csv index 2a7bd06909..1335140e2a 100644 --- a/results/combined/merges_timed/glenkpeterson/j-sicle.csv +++ b/results/combined/merges_timed/glenkpeterson/j-sicle.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,Tests_passed,True,True,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,afb2665f8919f07710e634bd72739f88cdd8df64ca6a71c8040d741911aeb714,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d704521e13b60e4b25c8931ca39d60f0b50e1d42e5c467ae4ae69c8eb6b08547,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,2ee8270f5b182c860280c43a90fd2c8f5b3077228b96c62ace711101c100bd89,Merge_failed,46c3531e949fa5c64cab7513d22d21627781e1a3bc662e40a7fdd075131ae6fc,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,0.07547259330749512,0.07674622535705566,0.08587813377380371,0.08059549331665039,0.08372211456298828,0.0804588794708252,0.08191323280334473,0.9583835601806641,0.11998915672302246,1.677706003189087,1.6775059700012207,0.8713035583496094,15.763499736785889,0.42267870903015137 +6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,Tests_passed,True,True,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,afb2665f8919f07710e634bd72739f88cdd8df64ca6a71c8040d741911aeb714,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d704521e13b60e4b25c8931ca39d60f0b50e1d42e5c467ae4ae69c8eb6b08547,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,043817af079507718d5ebfe937bfb1fb33513d0e7b896cfe05f3020246ef19a2,Merge_failed,2ee8270f5b182c860280c43a90fd2c8f5b3077228b96c62ace711101c100bd89,Merge_failed,46c3531e949fa5c64cab7513d22d21627781e1a3bc662e40a7fdd075131ae6fc,Merge_failed,ca5738823aa7a36dee77eda4cff8533ab4609d12dd08b68268fdf0fbcba8c89a,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,d8d0e905af7f85e8bab6792061b56dedc409a4f3ff798f9064ca5149b0c6f545,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,0.07547259330749512,0.07674622535705566,0.08587813377380371,0.08059549331665039,0.08372211456298828,0.0804588794708252,0.08191323280334473,0.9583835601806641,0.11998915672302246,1.6912128925323486,1.6948554515838623,0.8713035583496094,15.763499736785889,0.42267870903015137 diff --git a/results/combined/merges_timed/glowroot/glowroot.csv b/results/combined/merges_timed/glowroot/glowroot.csv index 833717c69c..5bea5a42c2 100644 --- a/results/combined/merges_timed/glowroot/glowroot.csv +++ b/results/combined/merges_timed/glowroot/glowroot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/remotes/origin/pull/724,5edc6961f8576c72256fe9d28b358dc6e35ff997,dbcbb453a0db7c77cf8cf7a43797d4b9e2d214f7,b65d9a9f8972dca4e392c61a329110a32d3826ce,,True,True,29c8903501e26b98c7b7c54ee02b034c3c6bb59aa0fdb3b13ab5e21657d06a62,Tests_passed,1496169c6b0ff819f6c459675878b405b429592a0a7889bdf6fafa87a9f8683d,Tests_passed,True,True,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_passed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_passed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,0.1112508773803711,0.11385107040405273,0.13102293014526367,0.133469820022583,0.1291975975036621,0.12977027893066406,0.13034915924072266,0.28981733322143555,0.11258363723754883,0.6657974720001221,0.6640498638153076,0.2781994342803955,0.11524629592895508,2.034297227859497 +12,refs/remotes/origin/pull/724,5edc6961f8576c72256fe9d28b358dc6e35ff997,dbcbb453a0db7c77cf8cf7a43797d4b9e2d214f7,b65d9a9f8972dca4e392c61a329110a32d3826ce,,True,True,29c8903501e26b98c7b7c54ee02b034c3c6bb59aa0fdb3b13ab5e21657d06a62,Tests_passed,1496169c6b0ff819f6c459675878b405b429592a0a7889bdf6fafa87a9f8683d,Tests_passed,True,True,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_passed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_passed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,0.1112508773803711,0.11385107040405273,0.13102293014526367,0.133469820022583,0.1291975975036621,0.12977027893066406,0.13034915924072266,0.28981733322143555,0.11258363723754883,0.6630134582519531,0.6545450687408447,0.2781994342803955,0.11524629592895508,2.034297227859497 diff --git a/results/combined/merges_timed/gooddata/gooddata-cl.csv b/results/combined/merges_timed/gooddata/gooddata-cl.csv index da6d7a9c3a..3b4df1985e 100644 --- a/results/combined/merges_timed/gooddata/gooddata-cl.csv +++ b/results/combined/merges_timed/gooddata/gooddata-cl.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -101,refs/heads/master,18faa1c4c7f3b77e27be62e841e0f5959941334c,6a016ec9d17f2137a87b6eaa2d8d118238d66299,99e0c47c5fbfbcb85a06fb95003c32c1ada9a606,,fd6e17a570774e974af64700645bfef8570d05f3f680b458fcc51e537571f62d,Tests_passed,ea47282fc6151656c888d2979883d9cbc9257fe57cc3f20f837db37db441b8cd,Tests_passed,True,True,True,True,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,7b2773ba670fe95d5eb825697011b172019e1f02bb615f5cad836d5fcb191d9e,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,7b2773ba670fe95d5eb825697011b172019e1f02bb615f5cad836d5fcb191d9e,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,dd78e3bb4b717ce62861b5425855d77189385c341bdb496b7771028ed6fbdb03,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,0.01885533332824707,0.01935410499572754,0.024562835693359375,0.024289846420288086,0.024566173553466797,0.024010896682739258,0.024160146713256836,0.05366802215576172,0.018850326538085938,0.1759500503540039,0.17829298973083496,0.07465958595275879,1.134699821472168,0.4627676010131836 +101,refs/heads/master,18faa1c4c7f3b77e27be62e841e0f5959941334c,6a016ec9d17f2137a87b6eaa2d8d118238d66299,99e0c47c5fbfbcb85a06fb95003c32c1ada9a606,,fd6e17a570774e974af64700645bfef8570d05f3f680b458fcc51e537571f62d,Tests_passed,ea47282fc6151656c888d2979883d9cbc9257fe57cc3f20f837db37db441b8cd,Tests_passed,True,True,True,True,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,7b2773ba670fe95d5eb825697011b172019e1f02bb615f5cad836d5fcb191d9e,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,7b2773ba670fe95d5eb825697011b172019e1f02bb615f5cad836d5fcb191d9e,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,dd78e3bb4b717ce62861b5425855d77189385c341bdb496b7771028ed6fbdb03,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,0.01885533332824707,0.01935410499572754,0.024562835693359375,0.024289846420288086,0.024566173553466797,0.024010896682739258,0.024160146713256836,0.05366802215576172,0.018850326538085938,0.17433619499206543,0.17630982398986816,0.07465958595275879,1.134699821472168,0.4627676010131836 diff --git a/results/combined/merges_timed/google/closure-stylesheets.csv b/results/combined/merges_timed/google/closure-stylesheets.csv index a3e4d2c71f..1638ea9f99 100644 --- a/results/combined/merges_timed/google/closure-stylesheets.csv +++ b/results/combined/merges_timed/google/closure-stylesheets.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/remotes/origin/pull/79,db92c42dd890921c3f05b3a5ad70436b6d77f9b4,f7fe702fc889653584011e04580f2a17acfe3384,d2c0cce5c11891c086a3d055ec84e96d5b9cb559,,d1cb7d86dc008c515bc6d50dad932d23ba24e7b120494ac95899a207fd332ce4,Tests_passed,a5fa43b88ad30c2a5aa421ca7c3bf481a28d6397e415a3fea44e55f0fe02d386,Tests_passed,True,True,True,True,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_failed,0d7d7cdbd5e530b29df2b19150bb085a8996171dfe27ad114c45fe458cc8086d,Tests_failed,0d7d7cdbd5e530b29df2b19150bb085a8996171dfe27ad114c45fe458cc8086d,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,0.06411147117614746,0.06545090675354004,0.06354260444641113,0.08661222457885742,0.07178592681884766,0.08006119728088379,0.08917021751403809,0.38390326499938965,0.06840705871582031,0.6322681903839111,0.6395609378814697,0.272322416305542,3.4496538639068604,0.43152356147766113 +18,refs/remotes/origin/pull/79,db92c42dd890921c3f05b3a5ad70436b6d77f9b4,f7fe702fc889653584011e04580f2a17acfe3384,d2c0cce5c11891c086a3d055ec84e96d5b9cb559,,d1cb7d86dc008c515bc6d50dad932d23ba24e7b120494ac95899a207fd332ce4,Tests_passed,a5fa43b88ad30c2a5aa421ca7c3bf481a28d6397e415a3fea44e55f0fe02d386,Tests_passed,True,True,True,True,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_failed,0d7d7cdbd5e530b29df2b19150bb085a8996171dfe27ad114c45fe458cc8086d,Tests_failed,0d7d7cdbd5e530b29df2b19150bb085a8996171dfe27ad114c45fe458cc8086d,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,0.06411147117614746,0.06545090675354004,0.06354260444641113,0.08661222457885742,0.07178592681884766,0.08006119728088379,0.08917021751403809,0.38390326499938965,0.06840705871582031,0.6273589134216309,0.6272726058959961,0.272322416305542,3.4496538639068604,0.43152356147766113 diff --git a/results/combined/merges_timed/google/compile-testing.csv b/results/combined/merges_timed/google/compile-testing.csv index 68c1cac937..3b57a2585c 100644 --- a/results/combined/merges_timed/google/compile-testing.csv +++ b/results/combined/merges_timed/google/compile-testing.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -36,refs/heads/main,608e1cb92ab715862a2f545cf3c57e6d35ea8216,68793277942607913ed80406a80bc85e5f704d93,e4526c30efb60151257f09ebc7195b2c850acfbf,,True,True,255f5503903ef25b5c4b1e70e49d93440bd497b95b73d207b44cc4e2a7c55e97,Tests_passed,6e32f9694974e9b09a3c3d28bcbb2a22632453716e92279cfb2dbb4170850915,Tests_passed,True,True,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,ae3d4678be73ad075c3a8e3b22d641e530b5ac6839a9c27e622df820ec0f9bea,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Tests_failed,ba39163dc7f7244d266d72f0cdc149006906f72f2b3f7a41ea3770b41e615d40,Tests_failed,ba39163dc7f7244d266d72f0cdc149006906f72f2b3f7a41ea3770b41e615d40,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,2777ba35e93e405f30548acbe3e64e7d3c2aa7eefa15ae1e4f54f0669343be31,0.0338749885559082,0.03620719909667969,0.040280818939208984,0.03146195411682129,0.04198789596557617,0.04385256767272949,0.036193132400512695,0.16551804542541504,0.07395482063293457,0.1647799015045166,0.16508173942565918,0.11100387573242188,0.8191583156585693,0.20317649841308594 +36,refs/heads/main,608e1cb92ab715862a2f545cf3c57e6d35ea8216,68793277942607913ed80406a80bc85e5f704d93,e4526c30efb60151257f09ebc7195b2c850acfbf,,True,True,255f5503903ef25b5c4b1e70e49d93440bd497b95b73d207b44cc4e2a7c55e97,Tests_passed,6e32f9694974e9b09a3c3d28bcbb2a22632453716e92279cfb2dbb4170850915,Tests_passed,True,True,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Merge_failed,ae3d4678be73ad075c3a8e3b22d641e530b5ac6839a9c27e622df820ec0f9bea,Merge_failed,16201419ab93d93d6d6c1d5044aaab8ccc9490dbf9b0424de44da3f009883ccf,Tests_failed,ba39163dc7f7244d266d72f0cdc149006906f72f2b3f7a41ea3770b41e615d40,Tests_failed,ba39163dc7f7244d266d72f0cdc149006906f72f2b3f7a41ea3770b41e615d40,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,2777ba35e93e405f30548acbe3e64e7d3c2aa7eefa15ae1e4f54f0669343be31,0.0338749885559082,0.03620719909667969,0.040280818939208984,0.03146195411682129,0.04198789596557617,0.04385256767272949,0.036193132400512695,0.16551804542541504,0.07395482063293457,0.1640481948852539,0.16300702095031738,0.11100387573242188,0.8191583156585693,0.20317649841308594 diff --git a/results/combined/merges_timed/google/error-prone.csv b/results/combined/merges_timed/google/error-prone.csv index 943b0fa608..9edb2fee03 100644 --- a/results/combined/merges_timed/google/error-prone.csv +++ b/results/combined/merges_timed/google/error-prone.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -148,refs/remotes/origin/pull/3037,7c82fb57c57be56bc8276821c37372d1f2c3b8c0,67e44eb939e948219dbd6a44e80f1453bf64dd76,bc5c994d5cdbdd9e06afd636c21c99e82ff3246f,,True,True,f6e7391365b398d6e0949117d67df87c22cced148659b875a80e83f5a8a9378f,Tests_passed,d23dbee252084f2200a601c21af777c87250b538b39c22f7c9bda9265453dce3,Tests_passed,True,True,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,00bb3c90f7f7633b405f74d4d209a482595d1255b2a193f5dabdf721c5bfe822,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,c130c3795ba71694e4cbaa4d38ab11fca352618a6a43e7ef051b318f35ee7a86,Merge_failed,c130c3795ba71694e4cbaa4d38ab11fca352618a6a43e7ef051b318f35ee7a86,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,0.01760697364807129,0.018378257751464844,0.016532182693481445,0.016537904739379883,0.016633987426757812,0.017181873321533203,0.016862869262695312,0.1194908618927002,0.09250164031982422,0.12728452682495117,0.1275920867919922,0.13504314422607422,0.021723508834838867,0.40668463706970215 +148,refs/remotes/origin/pull/3037,7c82fb57c57be56bc8276821c37372d1f2c3b8c0,67e44eb939e948219dbd6a44e80f1453bf64dd76,bc5c994d5cdbdd9e06afd636c21c99e82ff3246f,,True,True,f6e7391365b398d6e0949117d67df87c22cced148659b875a80e83f5a8a9378f,Tests_passed,d23dbee252084f2200a601c21af777c87250b538b39c22f7c9bda9265453dce3,Tests_passed,True,True,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,00bb3c90f7f7633b405f74d4d209a482595d1255b2a193f5dabdf721c5bfe822,Merge_failed,a6f3a1f62a16177f0c0ab0dd604d98038e175ae8fa36e2dde6b4b83e685e9db7,Merge_failed,c130c3795ba71694e4cbaa4d38ab11fca352618a6a43e7ef051b318f35ee7a86,Merge_failed,c130c3795ba71694e4cbaa4d38ab11fca352618a6a43e7ef051b318f35ee7a86,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,0.01760697364807129,0.018378257751464844,0.016532182693481445,0.016537904739379883,0.016633987426757812,0.017181873321533203,0.016862869262695312,0.1194908618927002,0.09250164031982422,0.1277778148651123,0.12856483459472656,0.13504314422607422,0.021723508834838867,0.40668463706970215 diff --git a/results/combined/merges_timed/google/google-java-format.csv b/results/combined/merges_timed/google/google-java-format.csv index 1e3d2c676b..60d5e13bbb 100644 --- a/results/combined/merges_timed/google/google-java-format.csv +++ b/results/combined/merges_timed/google/google-java-format.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/195,48316cdcafbef41ab52e86d0a530324cf5384310,b9cdd825f7f1b1c42965e7662b8193a7c6c822d2,c48ee99f0240e0e51af842b3cf17793a83508bd4,,True,True,414989cdb218b577e803c4ef6dd7f76a6558a95dbe15c5dff230056d11c6673f,Tests_passed,5c22244fd9653b2585d8fce8d65743b10260cfa86595f6c77b72b4d2ac2d88ea,Tests_passed,True,True,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,a2bf12c51e1298751cec7a732cb1040197b20263453e1380caa519e96100d774,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,ce4aade0aaa85a78b18b41d90b48341483a9ec1c82daad3ea6e164bfc441f4c1,Merge_failed,ce4aade0aaa85a78b18b41d90b48341483a9ec1c82daad3ea6e164bfc441f4c1,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Merge_failed,ce57512c67612f9fa7fff8afe7fcf19c7e54a81fd0bc41670cf95a853b24b638,0.039758920669555664,0.044445037841796875,0.03286886215209961,0.0421757698059082,0.04684877395629883,0.04092741012573242,0.042246103286743164,0.25055360794067383,0.06353497505187988,0.2269442081451416,0.22425270080566406,0.15688300132751465,1.8062303066253662,0.24623751640319824 +4,refs/remotes/origin/pull/195,48316cdcafbef41ab52e86d0a530324cf5384310,b9cdd825f7f1b1c42965e7662b8193a7c6c822d2,c48ee99f0240e0e51af842b3cf17793a83508bd4,,True,True,414989cdb218b577e803c4ef6dd7f76a6558a95dbe15c5dff230056d11c6673f,Tests_passed,5c22244fd9653b2585d8fce8d65743b10260cfa86595f6c77b72b4d2ac2d88ea,Tests_passed,True,True,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,a2bf12c51e1298751cec7a732cb1040197b20263453e1380caa519e96100d774,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,ce4aade0aaa85a78b18b41d90b48341483a9ec1c82daad3ea6e164bfc441f4c1,Merge_failed,ce4aade0aaa85a78b18b41d90b48341483a9ec1c82daad3ea6e164bfc441f4c1,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Merge_failed,ce57512c67612f9fa7fff8afe7fcf19c7e54a81fd0bc41670cf95a853b24b638,0.039758920669555664,0.044445037841796875,0.03286886215209961,0.0421757698059082,0.04684877395629883,0.04092741012573242,0.042246103286743164,0.25055360794067383,0.06353497505187988,0.21629643440246582,0.22287464141845703,0.15688300132751465,1.8062303066253662,0.24623751640319824 diff --git a/results/combined/merges_timed/google/guice.csv b/results/combined/merges_timed/google/guice.csv index cc195b0dbe..1084c894c1 100644 --- a/results/combined/merges_timed/google/guice.csv +++ b/results/combined/merges_timed/google/guice.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -107,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,Tests_passed,True,True,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,92a6ec2c93e7eb7ff1291d0937bd42e03503dd42a83a11e0e671f51067c23aa3,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,0e3ca04cd06b25b923f632f4cadcec0cf63d6d80f475cc4ba805f7dc1480b756,Merge_failed,0e3ca04cd06b25b923f632f4cadcec0cf63d6d80f475cc4ba805f7dc1480b756,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,0.05345892906188965,0.056970834732055664,0.05604887008666992,0.07629680633544922,0.06354379653930664,0.028115510940551758,0.03088545799255371,0.35352015495300293,0.13332247734069824,0.1765120029449463,0.1791071891784668,0.15186333656311035,0.06041073799133301,0.5200583934783936 +107,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,Tests_passed,True,True,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,92a6ec2c93e7eb7ff1291d0937bd42e03503dd42a83a11e0e671f51067c23aa3,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,0e3ca04cd06b25b923f632f4cadcec0cf63d6d80f475cc4ba805f7dc1480b756,Merge_failed,0e3ca04cd06b25b923f632f4cadcec0cf63d6d80f475cc4ba805f7dc1480b756,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,0.05345892906188965,0.056970834732055664,0.05604887008666992,0.07629680633544922,0.06354379653930664,0.028115510940551758,0.03088545799255371,0.35352015495300293,0.13332247734069824,0.17613840103149414,0.17796540260314941,0.15186333656311035,0.06041073799133301,0.5200583934783936 diff --git a/results/combined/merges_timed/google/gwtmockito.csv b/results/combined/merges_timed/google/gwtmockito.csv index d9bb248a66..b284da2824 100644 --- a/results/combined/merges_timed/google/gwtmockito.csv +++ b/results/combined/merges_timed/google/gwtmockito.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,eec530f0d51313698a334c7dbf5906d950994698,3abecd684fe2109616c9cbf2e9c84c9ac962f129,392723cada499dd23b6808932e3007614dbef0e6,,True,True,05172c84133878ea46ab524752cf6bf05b88f3a47c8313479d48f7b3717bbe4f,Tests_passed,b5fbabb3e1ecf8afa1b951f857fd02b4be01a0e14172382e845d35a259e75ae2,Tests_passed,True,True,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,0.03579115867614746,0.04490041732788086,0.011561393737792969,0.037717580795288086,0.04535531997680664,0.04867100715637207,0.04729175567626953,0.16033220291137695,0.04659605026245117,0.16245102882385254,0.16218924522399902,0.10518383979797363,0.9591810703277588,0.19324374198913574 +8,refs/heads/master,eec530f0d51313698a334c7dbf5906d950994698,3abecd684fe2109616c9cbf2e9c84c9ac962f129,392723cada499dd23b6808932e3007614dbef0e6,,True,True,05172c84133878ea46ab524752cf6bf05b88f3a47c8313479d48f7b3717bbe4f,Tests_passed,b5fbabb3e1ecf8afa1b951f857fd02b4be01a0e14172382e845d35a259e75ae2,Tests_passed,True,True,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,0.03579115867614746,0.04490041732788086,0.011561393737792969,0.037717580795288086,0.04535531997680664,0.04867100715637207,0.04729175567626953,0.16033220291137695,0.04659605026245117,0.16043829917907715,0.15981626510620117,0.10518383979797363,0.9591810703277588,0.19324374198913574 diff --git a/results/combined/merges_timed/google/identity-toolkit-java-client.csv b/results/combined/merges_timed/google/identity-toolkit-java-client.csv index 415ffcd508..ff4f4f42c9 100644 --- a/results/combined/merges_timed/google/identity-toolkit-java-client.csv +++ b/results/combined/merges_timed/google/identity-toolkit-java-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/remotes/origin/pull/38,f6edc3c022d66b33913deaac59cb7f42ab46303a,b86a722430a5458bc1183b2133b55de75eb71c2e,7d39b4815e3aef9aa5944f44ce7a96fb4915a7ba,,True,True,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,True,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,0.044400930404663086,0.04256844520568848,0.04122185707092285,0.04743671417236328,0.0451812744140625,0.039623260498046875,0.043646812438964844,0.1410996913909912,0.0455632209777832,0.1637275218963623,0.16384506225585938,0.10522770881652832,1.1406700611114502,0.19710636138916016 +24,refs/remotes/origin/pull/38,f6edc3c022d66b33913deaac59cb7f42ab46303a,b86a722430a5458bc1183b2133b55de75eb71c2e,7d39b4815e3aef9aa5944f44ce7a96fb4915a7ba,,True,True,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,True,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,0.044400930404663086,0.04256844520568848,0.04122185707092285,0.04743671417236328,0.0451812744140625,0.039623260498046875,0.043646812438964844,0.1410996913909912,0.0455632209777832,0.16509199142456055,0.16534709930419922,0.10522770881652832,1.1406700611114502,0.19710636138916016 diff --git a/results/combined/merges_timed/google/truth.csv b/results/combined/merges_timed/google/truth.csv index c96a66c6f7..8ecc4e2eaf 100644 --- a/results/combined/merges_timed/google/truth.csv +++ b/results/combined/merges_timed/google/truth.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -110,refs/heads/master,9289ed34ae5c0561c9e33dbb7b7b7c6750e4a410,2bb82cafdf685242cf1cb0b915800f0bd2d6b0cc,2bd108d91dc1f0cdda8ef5767b0a10af40af7f57,,True,True,65e865e9e9ccd9dccc0cdf0150df3b34a406dd47e8cf3b06dc5380009ea54141,Tests_passed,7f1db2e138c97832484c628f6bbb8a789bb7bb9e2232377758334faab73bf20f,Tests_passed,True,True,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,300c676505f72e7428b3c7f0e7194f14b182f80c35afeae42fadf52311f0d32d,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,7f51c8fa7ec9b9cea1fb1ed1d0c62c266244a10274c291443ef3fcfd586fc05e,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,3521afc8116147d85468d1cdc24b30160fdba1a4ce7f69c31ddce3135f273c3a,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,87b272964b969e8f6161516fcc5739028435d9cf54e712598c21083d00ccd1a7,Merge_failed,87b272964b969e8f6161516fcc5739028435d9cf54e712598c21083d00ccd1a7,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,cc247b80711a9a16f4b8a637dad8342f2f066db25b5c8f0e577e9025a5906f09,Merge_failed,e3d7506501f26070d043f65d789b0653dfed02c6a8cc18afbd49233347fd1166,0.010350465774536133,0.00928187370300293,0.009069681167602539,0.009403705596923828,0.009437322616577148,0.009463787078857422,0.009218692779541016,0.06131410598754883,0.03188896179199219,0.224837064743042,0.22593355178833008,0.12194585800170898,1.2289559841156006,0.20983028411865234 +110,refs/heads/master,9289ed34ae5c0561c9e33dbb7b7b7c6750e4a410,2bb82cafdf685242cf1cb0b915800f0bd2d6b0cc,2bd108d91dc1f0cdda8ef5767b0a10af40af7f57,,True,True,65e865e9e9ccd9dccc0cdf0150df3b34a406dd47e8cf3b06dc5380009ea54141,Tests_passed,7f1db2e138c97832484c628f6bbb8a789bb7bb9e2232377758334faab73bf20f,Tests_passed,True,True,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,300c676505f72e7428b3c7f0e7194f14b182f80c35afeae42fadf52311f0d32d,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,7f51c8fa7ec9b9cea1fb1ed1d0c62c266244a10274c291443ef3fcfd586fc05e,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,3521afc8116147d85468d1cdc24b30160fdba1a4ce7f69c31ddce3135f273c3a,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,87b272964b969e8f6161516fcc5739028435d9cf54e712598c21083d00ccd1a7,Merge_failed,87b272964b969e8f6161516fcc5739028435d9cf54e712598c21083d00ccd1a7,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,cc247b80711a9a16f4b8a637dad8342f2f066db25b5c8f0e577e9025a5906f09,Merge_failed,e3d7506501f26070d043f65d789b0653dfed02c6a8cc18afbd49233347fd1166,0.010350465774536133,0.00928187370300293,0.009069681167602539,0.009403705596923828,0.009437322616577148,0.009463787078857422,0.009218692779541016,0.06131410598754883,0.03188896179199219,0.22419095039367676,0.22481107711791992,0.12194585800170898,1.2289559841156006,0.20983028411865234 diff --git a/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv b/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv index fc7f5636a6..88e8c69887 100644 --- a/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv +++ b/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -955,refs/remotes/origin/Neenu1995-patch-3,1fa53a817ac6c3962ed89645b0ca86e276e73bdb,5d8d1237244e0c8b9a76dc66782d6c69cdd916ac,86065a7fc7d130977a40b99b2bf77d6889d84418,,True,True,b16ac46f049d06e80e45614469dbf59bb2d368b58f4ce792b254fdc5d93449fb,Tests_passed,a4d336918f7ec4998f682688726e185c62d12c2a625ac21823c68101e574b9a2,Tests_passed,True,True,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,0.0189969539642334,0.01877140998840332,0.022920846939086914,0.023005962371826172,0.02284526824951172,0.023261547088623047,0.02339458465576172,0.05188441276550293,0.01872730255126953,0.16637468338012695,0.17072272300720215,0.0745542049407959,1.4598751068115234,2.7043545246124268 +955,refs/remotes/origin/Neenu1995-patch-3,1fa53a817ac6c3962ed89645b0ca86e276e73bdb,5d8d1237244e0c8b9a76dc66782d6c69cdd916ac,86065a7fc7d130977a40b99b2bf77d6889d84418,,True,True,b16ac46f049d06e80e45614469dbf59bb2d368b58f4ce792b254fdc5d93449fb,Tests_passed,a4d336918f7ec4998f682688726e185c62d12c2a625ac21823c68101e574b9a2,Tests_passed,True,True,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,0.0189969539642334,0.01877140998840332,0.022920846939086914,0.023005962371826172,0.02284526824951172,0.023261547088623047,0.02339458465576172,0.05188441276550293,0.01872730255126953,0.1676023006439209,0.16669201850891113,0.0745542049407959,1.4598751068115234,2.7043545246124268 diff --git a/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv b/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv index ec2f11987d..1070accc29 100644 --- a/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv +++ b/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,8e04ccd0191c04aa74799a10ec32adefa0e1800a,cf3945112d4fb7b8d6907b6d801cd6f0ff33c1df,dc10b3241e4dcf41b74259f2bee758a776c3e4da,,True,True,dca5e099a34494c2542109ed2f67e540e6b1a8cdfa9025a535d9508a4994ef55,Tests_passed,4d6107c7ac2a21b62880c061b98a066df5393838964f2947a295dddf5f3bb2c1,Tests_passed,True,True,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,0.009694814682006836,0.009704351425170898,0.010267019271850586,0.010416507720947266,0.010201454162597656,0.010245800018310547,0.010239839553833008,0.034464120864868164,0.00948333740234375,0.15500211715698242,0.15600252151489258,0.06564879417419434,0.8232579231262207,0.16172337532043457 +6,refs/heads/master,8e04ccd0191c04aa74799a10ec32adefa0e1800a,cf3945112d4fb7b8d6907b6d801cd6f0ff33c1df,dc10b3241e4dcf41b74259f2bee758a776c3e4da,,True,True,dca5e099a34494c2542109ed2f67e540e6b1a8cdfa9025a535d9508a4994ef55,Tests_passed,4d6107c7ac2a21b62880c061b98a066df5393838964f2947a295dddf5f3bb2c1,Tests_passed,True,True,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,0.009694814682006836,0.009704351425170898,0.010267019271850586,0.010416507720947266,0.010201454162597656,0.010245800018310547,0.010239839553833008,0.034464120864868164,0.00948333740234375,0.15693092346191406,0.15498948097229004,0.06564879417419434,0.8232579231262207,0.16172337532043457 diff --git a/results/combined/merges_timed/gpedro/slack-webhook.csv b/results/combined/merges_timed/gpedro/slack-webhook.csv index c5dd172182..5808ec253d 100644 --- a/results/combined/merges_timed/gpedro/slack-webhook.csv +++ b/results/combined/merges_timed/gpedro/slack-webhook.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/remotes/origin/pull/41,566974e6f460456d9dbd46a27b39d49b50964c67,66aa7d7688037883abc3af82259df71ffe030fba,bcb855e94165d363b7594ad88124ee4e3691dd55,,3fbc2ea8ee1656d19e9b4eda46020ae9f7cb5d0e775bfbc3c361aa930890974e,Tests_passed,b8cbd74e5aa723b4164bdc734ed836647972b3f2f5dd2e72f87c0945a726c25c,Tests_passed,True,True,True,True,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,e55ef79de5e925f4d4a90a181b6ee9aa93cb7baa48fd12bc030d5a0a507d2847,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,897456f944eb89ef5dc4cffc7ede52cd0bcb38907ca48aeed2cd71e5aa0a12f2,Merge_failed,897456f944eb89ef5dc4cffc7ede52cd0bcb38907ca48aeed2cd71e5aa0a12f2,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Merge_failed,4722ec2d77158a6890c4466553967dd1ab9b87c4b9b4b4728088c3c128e202f2,0.03994560241699219,0.04597592353820801,0.035974979400634766,0.04569435119628906,0.03873300552368164,0.03251242637634277,0.039237022399902344,0.16608262062072754,0.06402468681335449,0.0807185173034668,0.0806429386138916,0.10605573654174805,0.6003727912902832,0.19137120246887207 +5,refs/remotes/origin/pull/41,566974e6f460456d9dbd46a27b39d49b50964c67,66aa7d7688037883abc3af82259df71ffe030fba,bcb855e94165d363b7594ad88124ee4e3691dd55,,3fbc2ea8ee1656d19e9b4eda46020ae9f7cb5d0e775bfbc3c361aa930890974e,Tests_passed,b8cbd74e5aa723b4164bdc734ed836647972b3f2f5dd2e72f87c0945a726c25c,Tests_passed,True,True,True,True,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,e55ef79de5e925f4d4a90a181b6ee9aa93cb7baa48fd12bc030d5a0a507d2847,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,897456f944eb89ef5dc4cffc7ede52cd0bcb38907ca48aeed2cd71e5aa0a12f2,Merge_failed,897456f944eb89ef5dc4cffc7ede52cd0bcb38907ca48aeed2cd71e5aa0a12f2,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Merge_failed,4722ec2d77158a6890c4466553967dd1ab9b87c4b9b4b4728088c3c128e202f2,0.03994560241699219,0.04597592353820801,0.035974979400634766,0.04569435119628906,0.03873300552368164,0.03251242637634277,0.039237022399902344,0.16608262062072754,0.06402468681335449,0.08094024658203125,0.08026528358459473,0.10605573654174805,0.6003727912902832,0.19137120246887207 diff --git a/results/combined/merges_timed/graphaware/neo4j-noderank.csv b/results/combined/merges_timed/graphaware/neo4j-noderank.csv index bb041b3e1c..51a816f1ea 100644 --- a/results/combined/merges_timed/graphaware/neo4j-noderank.csv +++ b/results/combined/merges_timed/graphaware/neo4j-noderank.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,01ca7a83cadb126fcef90405f4a8036ac2a22a02,b78badfb88462adb87978da091e7b7213e3aa6a1,19602ad06a849def37a2de307a320871c1328fa2,,True,True,b739cf8e7d2ddc904d23ed4d66172c163ca413d14e78fe6d07f25048595de770,Tests_passed,76bc71509d3cb6f40997b441785bfd2d0a99c13d3ffaff70a495597d6db6eeae,Tests_passed,True,True,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,a0b8645cbbfe24cecd504ca8de488be49dda1f96327e7a8fd7242a793a3ed225,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Merge_failed,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Merge_failed,48315006e3db4fbb589208990deb9de40271232d047165b2f7e7bc29e8c043d5,0.03881120681762695,0.010079145431518555,0.0406341552734375,0.04339456558227539,0.04344344139099121,0.0417025089263916,0.03421664237976074,0.2324082851409912,0.062460899353027344,0.15260052680969238,0.15262293815612793,0.16808867454528809,0.6346402168273926,0.20989537239074707 +4,refs/heads/master,01ca7a83cadb126fcef90405f4a8036ac2a22a02,b78badfb88462adb87978da091e7b7213e3aa6a1,19602ad06a849def37a2de307a320871c1328fa2,,True,True,b739cf8e7d2ddc904d23ed4d66172c163ca413d14e78fe6d07f25048595de770,Tests_passed,76bc71509d3cb6f40997b441785bfd2d0a99c13d3ffaff70a495597d6db6eeae,Tests_passed,True,True,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,a0b8645cbbfe24cecd504ca8de488be49dda1f96327e7a8fd7242a793a3ed225,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Merge_failed,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Merge_failed,48315006e3db4fbb589208990deb9de40271232d047165b2f7e7bc29e8c043d5,0.03881120681762695,0.010079145431518555,0.0406341552734375,0.04339456558227539,0.04344344139099121,0.0417025089263916,0.03421664237976074,0.2324082851409912,0.062460899353027344,0.15245652198791504,0.15201139450073242,0.16808867454528809,0.6346402168273926,0.20989537239074707 diff --git a/results/combined/merges_timed/graphity/graphity-client.csv b/results/combined/merges_timed/graphity/graphity-client.csv index 3e1eeb1e0c..6e7e395802 100644 --- a/results/combined/merges_timed/graphity/graphity-client.csv +++ b/results/combined/merges_timed/graphity/graphity-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/heads/master,2a8e8c75e97d82b9c1bf5562af018b45f86d3120,4f9464b5b8eadf89842546b95f4c25f03d6de7a4,5d8fb283a53c4f40897bb50f7003c5453bb2d1df,,True,True,bca72e5f7a121e2b7c9742dd6d912b8bb96c19728bfa385f97e30cda07bd9a5d,Tests_passed,e58d47f1eb3a9defe1a30ee25b100aaf65649fe7c9b820adb971c9b192f9c5fa,Tests_passed,True,True,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,43b156ebaec368c0402390f6b0e900cdbbc5901869b3edacaa4a1437a9c0ddcc,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,43b156ebaec368c0402390f6b0e900cdbbc5901869b3edacaa4a1437a9c0ddcc,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,fce8175c364afaa8764f8a05f1356e590c2e4d6370e36649d056e6565a7f9d6a,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,63baefec613a4219c0d8bbf4b2b27d622216cac94b7720da99dab036df38d3d1,Merge_failed,63baefec613a4219c0d8bbf4b2b27d622216cac94b7720da99dab036df38d3d1,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,295dc05b06b9a474ae07c712784fd5605e6feaf3daa0158b4b822d0d6d35c607,0.04575514793395996,0.054825544357299805,0.032572269439697266,0.02664351463317871,0.047010183334350586,0.05107283592224121,0.05192232131958008,0.07908177375793457,0.07255935668945312,0.15500497817993164,0.15619993209838867,0.11442303657531738,0.6508941650390625,0.2458956241607666 +25,refs/heads/master,2a8e8c75e97d82b9c1bf5562af018b45f86d3120,4f9464b5b8eadf89842546b95f4c25f03d6de7a4,5d8fb283a53c4f40897bb50f7003c5453bb2d1df,,True,True,bca72e5f7a121e2b7c9742dd6d912b8bb96c19728bfa385f97e30cda07bd9a5d,Tests_passed,e58d47f1eb3a9defe1a30ee25b100aaf65649fe7c9b820adb971c9b192f9c5fa,Tests_passed,True,True,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,43b156ebaec368c0402390f6b0e900cdbbc5901869b3edacaa4a1437a9c0ddcc,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,43b156ebaec368c0402390f6b0e900cdbbc5901869b3edacaa4a1437a9c0ddcc,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,fce8175c364afaa8764f8a05f1356e590c2e4d6370e36649d056e6565a7f9d6a,Merge_failed,ce26dc2b854c53281bd8c58b483e29a9c756eb91f42542129316fa1b29a3acc5,Merge_failed,63baefec613a4219c0d8bbf4b2b27d622216cac94b7720da99dab036df38d3d1,Merge_failed,63baefec613a4219c0d8bbf4b2b27d622216cac94b7720da99dab036df38d3d1,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,295dc05b06b9a474ae07c712784fd5605e6feaf3daa0158b4b822d0d6d35c607,0.04575514793395996,0.054825544357299805,0.032572269439697266,0.02664351463317871,0.047010183334350586,0.05107283592224121,0.05192232131958008,0.07908177375793457,0.07255935668945312,0.15510106086730957,0.1561110019683838,0.11442303657531738,0.6508941650390625,0.2458956241607666 diff --git a/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv b/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv index 39160198e4..9f6b8f5a04 100644 --- a/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv +++ b/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,63afb94bcd157b7ffe10dcef43743a33946c65ff,3d1fd37c02b7c581c557a51b252d80769486b6bf,69d6d1cfd2703a67895e69a54b3fcb023486ceab,,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,fd24f961bdb1aecd6946626939129009f14f5d0a88ed8a33f96958841217a762,Tests_passed,True,True,True,True,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,60bfb63b214860f427d22fc3be2973563e6309b787ab9744312b3997658a06f9,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,4aff6822d58bf31f0b0baa7d98b93b44611d89cf6daec95a34ea9714a04d2048,Merge_failed,4aff6822d58bf31f0b0baa7d98b93b44611d89cf6daec95a34ea9714a04d2048,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,2ce71682c30b454d6ceb2382b4ea0e12d76a7a0aa76aa540ca8be9f9e27b6d8a,0.062256574630737305,0.04365801811218262,0.06002449989318848,0.04974818229675293,0.054126739501953125,0.06640267372131348,0.06296443939208984,0.2233598232269287,0.0536189079284668,0.158843994140625,0.15897536277770996,0.16398215293884277,1.3605239391326904,0.19891595840454102 +7,refs/heads/master,63afb94bcd157b7ffe10dcef43743a33946c65ff,3d1fd37c02b7c581c557a51b252d80769486b6bf,69d6d1cfd2703a67895e69a54b3fcb023486ceab,,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,fd24f961bdb1aecd6946626939129009f14f5d0a88ed8a33f96958841217a762,Tests_passed,True,True,True,True,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,60bfb63b214860f427d22fc3be2973563e6309b787ab9744312b3997658a06f9,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,4aff6822d58bf31f0b0baa7d98b93b44611d89cf6daec95a34ea9714a04d2048,Merge_failed,4aff6822d58bf31f0b0baa7d98b93b44611d89cf6daec95a34ea9714a04d2048,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,2ce71682c30b454d6ceb2382b4ea0e12d76a7a0aa76aa540ca8be9f9e27b6d8a,0.062256574630737305,0.04365801811218262,0.06002449989318848,0.04974818229675293,0.054126739501953125,0.06640267372131348,0.06296443939208984,0.2233598232269287,0.0536189079284668,0.15905022621154785,0.15930557250976562,0.16398215293884277,1.3605239391326904,0.19891595840454102 diff --git a/results/combined/merges_timed/greenlaw110/rythm.csv b/results/combined/merges_timed/greenlaw110/rythm.csv index c8c1221b60..a1525b93b7 100644 --- a/results/combined/merges_timed/greenlaw110/rythm.csv +++ b/results/combined/merges_timed/greenlaw110/rythm.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,d9f68867177eb40765426874c583d9a70c5a4da8,e088577eb5a25ca06c9c4d9b55f90411af1fed87,7a55514a2ed5fbe7bc1b7a62b1ef8875acb5022e,,True,True,0ab73f64daea558fd3c8b4439fce916828af4f6be054b5b414cbbf8e2224a00b,Tests_passed,44f6503cd197e144e642eb737680fb2579d2e56ed3f9f2b96d79fce244385aa1,Tests_passed,True,True,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,0.021421194076538086,0.021729230880737305,0.02681565284729004,0.014297723770141602,0.0263979434967041,0.02720355987548828,0.02721881866455078,0.04649829864501953,0.021803855895996094,0.16231989860534668,0.1595158576965332,0.07649898529052734,0.6062009334564209,0.2130146026611328 +15,refs/heads/master,d9f68867177eb40765426874c583d9a70c5a4da8,e088577eb5a25ca06c9c4d9b55f90411af1fed87,7a55514a2ed5fbe7bc1b7a62b1ef8875acb5022e,,True,True,0ab73f64daea558fd3c8b4439fce916828af4f6be054b5b414cbbf8e2224a00b,Tests_passed,44f6503cd197e144e642eb737680fb2579d2e56ed3f9f2b96d79fce244385aa1,Tests_passed,True,True,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,0.021421194076538086,0.021729230880737305,0.02681565284729004,0.014297723770141602,0.0263979434967041,0.02720355987548828,0.02721881866455078,0.04649829864501953,0.021803855895996094,0.1584930419921875,0.15950989723205566,0.07649898529052734,0.6062009334564209,0.2130146026611328 diff --git a/results/combined/merges_timed/greenmail-mail-test/greenmail.csv b/results/combined/merges_timed/greenmail-mail-test/greenmail.csv index 37e6932fb2..559bec2b99 100644 --- a/results/combined/merges_timed/greenmail-mail-test/greenmail.csv +++ b/results/combined/merges_timed/greenmail-mail-test/greenmail.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -57,refs/remotes/origin/pull/294,e152dc4b90c0ad478ee886f8b110c5b220d46b05,d3ea847b346eb8879c2509681601175362e98875,2029ffd8f633897fa35c933c3ef46f969664dafe,,True,True,25c6de389e070410d9bd2baf703df18e116736f675d91bfce83fe2188f3c799a,Tests_passed,face7a5e90020187a96ed0a13ab332d8091de7f093cc0f42386589e7aaec5c8d,Tests_passed,True,True,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,ff91e027bd0192829192980bc8b6e28cf45114748d096eab042cb34746bb68eb,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,ba917e0d833e51d165970f06f7444f10d54bc2eea895221a4becfdbc69732a71,Merge_failed,ba917e0d833e51d165970f06f7444f10d54bc2eea895221a4becfdbc69732a71,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_failed,878e6b6046d8ba88b5f2d2104650be28ba25b6f4e35c929b0402c7a6ff470f3d,0.020759105682373047,0.012636423110961914,0.023023605346679688,0.01642155647277832,0.02302718162536621,0.023311614990234375,0.022675514221191406,0.05486464500427246,0.028931379318237305,0.0752863883972168,0.07457637786865234,0.07707500457763672,0.6110186576843262,0.23534250259399414 +57,refs/remotes/origin/pull/294,e152dc4b90c0ad478ee886f8b110c5b220d46b05,d3ea847b346eb8879c2509681601175362e98875,2029ffd8f633897fa35c933c3ef46f969664dafe,,True,True,25c6de389e070410d9bd2baf703df18e116736f675d91bfce83fe2188f3c799a,Tests_passed,face7a5e90020187a96ed0a13ab332d8091de7f093cc0f42386589e7aaec5c8d,Tests_passed,True,True,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,ff91e027bd0192829192980bc8b6e28cf45114748d096eab042cb34746bb68eb,Merge_failed,434dd56f5fd47055044fbdf171dd0cad95ed90ff3d76f17d44d31da02cfe5f0e,Merge_failed,ba917e0d833e51d165970f06f7444f10d54bc2eea895221a4becfdbc69732a71,Merge_failed,ba917e0d833e51d165970f06f7444f10d54bc2eea895221a4becfdbc69732a71,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_failed,878e6b6046d8ba88b5f2d2104650be28ba25b6f4e35c929b0402c7a6ff470f3d,0.020759105682373047,0.012636423110961914,0.023023605346679688,0.01642155647277832,0.02302718162536621,0.023311614990234375,0.022675514221191406,0.05486464500427246,0.028931379318237305,0.07536149024963379,0.07517576217651367,0.07707500457763672,0.6110186576843262,0.23534250259399414 diff --git a/results/combined/merges_timed/greese/dasein-cloud-core.csv b/results/combined/merges_timed/greese/dasein-cloud-core.csv index 979bb63451..fef4eef081 100644 --- a/results/combined/merges_timed/greese/dasein-cloud-core.csv +++ b/results/combined/merges_timed/greese/dasein-cloud-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -219,refs/heads/master,841d623662ccc6ce6d67310f65a26c751ae02e0e,5290164d76259e90ccc744a4a51d7492a5ea2eb9,3be7127c3dd09899fa0a9f5058a8787245611f81,,True,True,483a04f4ddb6cce3ab81233802959831f7890b7a483ff16e01f6441f8e5ec2f4,Tests_passed,7b3b7846b4ca1c82110f60d262f6a951adb29456a1009bd063d9c7306a53408a,Tests_passed,True,True,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,d423e9e3d96c6dd2a976a5a8c88d4db7f88b11f055d084a461367161d63f27d1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,d423e9e3d96c6dd2a976a5a8c88d4db7f88b11f055d084a461367161d63f27d1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,596f696f4dac713da51c17fa04a736949dbf3766230c6733ced71e1acaa6ba60,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,0.012648344039916992,0.04090523719787598,0.04495859146118164,0.039872169494628906,0.02680802345275879,0.03631281852722168,0.026134729385375977,0.12583494186401367,0.044402360916137695,0.18868732452392578,0.18801021575927734,0.07440733909606934,1.2853891849517822,0.21598482131958008 +219,refs/heads/master,841d623662ccc6ce6d67310f65a26c751ae02e0e,5290164d76259e90ccc744a4a51d7492a5ea2eb9,3be7127c3dd09899fa0a9f5058a8787245611f81,,True,True,483a04f4ddb6cce3ab81233802959831f7890b7a483ff16e01f6441f8e5ec2f4,Tests_passed,7b3b7846b4ca1c82110f60d262f6a951adb29456a1009bd063d9c7306a53408a,Tests_passed,True,True,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,d423e9e3d96c6dd2a976a5a8c88d4db7f88b11f055d084a461367161d63f27d1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,d423e9e3d96c6dd2a976a5a8c88d4db7f88b11f055d084a461367161d63f27d1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,596f696f4dac713da51c17fa04a736949dbf3766230c6733ced71e1acaa6ba60,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,0.012648344039916992,0.04090523719787598,0.04495859146118164,0.039872169494628906,0.02680802345275879,0.03631281852722168,0.026134729385375977,0.12583494186401367,0.044402360916137695,0.1839756965637207,0.18396782875061035,0.07440733909606934,1.2853891849517822,0.21598482131958008 diff --git a/results/combined/merges_timed/gridgain/yardstick.csv b/results/combined/merges_timed/gridgain/yardstick.csv index 03ae2d4631..830899d6f7 100644 --- a/results/combined/merges_timed/gridgain/yardstick.csv +++ b/results/combined/merges_timed/gridgain/yardstick.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,094b8c16a3d14302e26113a542cc760f07a36007,32183ef3c8feb4b54a40047ea9aa93e2de372abf,b112625effff3d71f6d013960afe1c39d433a923,,True,True,036666862ab023d692f66b134b3ea54d0a1979a98b2692d6cc5a44f0b1b45373,Tests_passed,f1952b5c43a667a084ebf1d5680f6eaa5cad790b9f422d70248f23084d31ead4,Tests_passed,True,True,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,0.043456077575683594,0.0452883243560791,0.05102872848510742,0.04962038993835449,0.04447031021118164,0.05230855941772461,0.05262422561645508,0.15249204635620117,0.04494881629943848,0.15624046325683594,0.15552926063537598,0.10938072204589844,0.7755532264709473,0.29114246368408203 +14,refs/heads/master,094b8c16a3d14302e26113a542cc760f07a36007,32183ef3c8feb4b54a40047ea9aa93e2de372abf,b112625effff3d71f6d013960afe1c39d433a923,,True,True,036666862ab023d692f66b134b3ea54d0a1979a98b2692d6cc5a44f0b1b45373,Tests_passed,f1952b5c43a667a084ebf1d5680f6eaa5cad790b9f422d70248f23084d31ead4,Tests_passed,True,True,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,0.043456077575683594,0.0452883243560791,0.05102872848510742,0.04962038993835449,0.04447031021118164,0.05230855941772461,0.05262422561645508,0.15249204635620117,0.04494881629943848,0.15302777290344238,0.15383100509643555,0.10938072204589844,0.7755532264709473,0.29114246368408203 diff --git a/results/combined/merges_timed/grove/presto.csv b/results/combined/merges_timed/grove/presto.csv index 9eabe0cf47..f3bc4263e8 100644 --- a/results/combined/merges_timed/grove/presto.csv +++ b/results/combined/merges_timed/grove/presto.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -64,refs/heads/develop,a5fd26fc395910e29b06fc2ecd2c1b73e23c5302,dea6844b19d27a50e13b38583b9725f0dafdee9e,574ca670a35f9747d61a248662614fdcdfc1a2c5,,True,True,074f92109209ed78678deb35bcee52a7a6669a4096ae2372208cba8c64a7ef5d,Tests_passed,c3751098e5cf4e4b0d3708b9b539c9cf6016699fdb92310fe0c8aec276f9aee0,Tests_passed,True,True,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,a7c44fd6f0ce199538add95d6de82ef1124973f85a72d6162dd5821abeb4b76e,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,a7c44fd6f0ce199538add95d6de82ef1124973f85a72d6162dd5821abeb4b76e,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,8669fc488b15f34d199e46d4840c0c2d19eacada185bd7326a1e9a4b5a03a0cc,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,8ad0f5bd58d4afb46e10f2675c03fc4b64f3c04d5352ebfc9051b68b3a290f0c,Merge_failed,8ad0f5bd58d4afb46e10f2675c03fc4b64f3c04d5352ebfc9051b68b3a290f0c,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Merge_failed,f8c975ad2d36b4c490bc95d23e9bbb20f182bf25921d6c510d33ee74c9260743,0.040767669677734375,0.0500178337097168,0.05116987228393555,0.0509190559387207,0.061208248138427734,0.043459415435791016,0.04870963096618652,0.1896038055419922,0.06720256805419922,0.07928133010864258,0.08051466941833496,0.13439011573791504,1.3830535411834717,0.21884751319885254 +64,refs/heads/develop,a5fd26fc395910e29b06fc2ecd2c1b73e23c5302,dea6844b19d27a50e13b38583b9725f0dafdee9e,574ca670a35f9747d61a248662614fdcdfc1a2c5,,True,True,074f92109209ed78678deb35bcee52a7a6669a4096ae2372208cba8c64a7ef5d,Tests_passed,c3751098e5cf4e4b0d3708b9b539c9cf6016699fdb92310fe0c8aec276f9aee0,Tests_passed,True,True,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,a7c44fd6f0ce199538add95d6de82ef1124973f85a72d6162dd5821abeb4b76e,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,a7c44fd6f0ce199538add95d6de82ef1124973f85a72d6162dd5821abeb4b76e,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,8669fc488b15f34d199e46d4840c0c2d19eacada185bd7326a1e9a4b5a03a0cc,Merge_failed,549b42fb71d52f1582089d1c48dc9bed74a796e08af435c3026e0c5a53222421,Merge_failed,8ad0f5bd58d4afb46e10f2675c03fc4b64f3c04d5352ebfc9051b68b3a290f0c,Merge_failed,8ad0f5bd58d4afb46e10f2675c03fc4b64f3c04d5352ebfc9051b68b3a290f0c,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Merge_failed,f8c975ad2d36b4c490bc95d23e9bbb20f182bf25921d6c510d33ee74c9260743,0.040767669677734375,0.0500178337097168,0.05116987228393555,0.0509190559387207,0.061208248138427734,0.043459415435791016,0.04870963096618652,0.1896038055419922,0.06720256805419922,0.07981014251708984,0.07982897758483887,0.13439011573791504,1.3830535411834717,0.21884751319885254 diff --git a/results/combined/merges_timed/grundid/nfctools.csv b/results/combined/merges_timed/grundid/nfctools.csv index b3913dd757..674098358a 100644 --- a/results/combined/merges_timed/grundid/nfctools.csv +++ b/results/combined/merges_timed/grundid/nfctools.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,2c2a51262a91233576dbe1b94adf94d040103525,ac436f67afac76d8cfe416884952d513653d04a9,5f456359d7dc8abb41247de59caa2d896f5fbbc2,,12149ef240e3568470e93a8efdfca36a4e284154bbc85b95d13a60cbc8e39c09,Tests_passed,5f556d386d8daa754e9d75a00f96d9a6dacb73afafeb6b53b31dc78fc24a263a,Tests_passed,True,True,True,True,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,3ca2f672944a5c869a19ce9253cc9decc71d846b4f7855cb8ede6408a759625c,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Merge_failed,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_failed,e5c64c8e8b9c6f7b982ed2800986b439f1343853ce98649496b3cdd310b33e3a,0.060439109802246094,0.05879688262939453,0.05813765525817871,0.06513261795043945,0.060800790786743164,0.05149078369140625,0.053951263427734375,0.17128372192382812,0.08173084259033203,0.14938688278198242,0.15335774421691895,0.13067150115966797,0.4301767349243164,0.32093286514282227 +7,refs/heads/master,2c2a51262a91233576dbe1b94adf94d040103525,ac436f67afac76d8cfe416884952d513653d04a9,5f456359d7dc8abb41247de59caa2d896f5fbbc2,,12149ef240e3568470e93a8efdfca36a4e284154bbc85b95d13a60cbc8e39c09,Tests_passed,5f556d386d8daa754e9d75a00f96d9a6dacb73afafeb6b53b31dc78fc24a263a,Tests_passed,True,True,True,True,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,3ca2f672944a5c869a19ce9253cc9decc71d846b4f7855cb8ede6408a759625c,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Merge_failed,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_failed,e5c64c8e8b9c6f7b982ed2800986b439f1343853ce98649496b3cdd310b33e3a,0.060439109802246094,0.05879688262939453,0.05813765525817871,0.06513261795043945,0.060800790786743164,0.05149078369140625,0.053951263427734375,0.17128372192382812,0.08173084259033203,0.15210604667663574,0.15247678756713867,0.13067150115966797,0.4301767349243164,0.32093286514282227 diff --git a/results/combined/merges_timed/grunka/fortuna.csv b/results/combined/merges_timed/grunka/fortuna.csv index 37ecdd60a7..97238f85fa 100644 --- a/results/combined/merges_timed/grunka/fortuna.csv +++ b/results/combined/merges_timed/grunka/fortuna.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/remotes/origin/pull/1,b53b9078df7906fa163e52bf892e8f120c7784ca,e387b50474e7e19df4428a630dfa71e60c28824a,d038300dbf0151a6bde3a1c9dd77a7f7ac4df050,,True,True,c2353a21c685c4fe46db4c570183b1b46cef1a2daacca8cf16f4ec0e6a8939ca,Tests_passed,8eddbe1d714bcb573edaa2f601f83af565afe376078aeee20611b344f2787f16,Tests_passed,True,True,Merge_failed,fc62729528e9cb16c2bf63c9ca7250e1258e414e4a8766bd798080bb1189b762,Merge_failed,c50a068cf49bf55bb59092c58b5aabc82bec04e74194f098275efc3e1b832a4b,Merge_failed,fc62729528e9cb16c2bf63c9ca7250e1258e414e4a8766bd798080bb1189b762,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,e39a8f0616da2f5097bde218baa825d7ffcc73cdd4fa7b2b76ca12bade4f0e7e,Merge_failed,fc62729528e9cb16c2bf63c9ca7250e1258e414e4a8766bd798080bb1189b762,Merge_failed,a4390e4e427fe29b7c9385ea4787820cb83325d9c73a140491f3b7d14711d855,Merge_failed,608c137863ab14d9a34ae3d5e9e685a700557b7a2b01d7881bac3d9d40397366,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,3a376f471ccbff178f421675e314ea71ba8aad4a4faabf558346f57521de2517,Merge_failed,23a05aa1f8ae94d72a505a8994de4733f0f5e067c2b8998e40bbfdd620c063b2,0.04694247245788574,0.04844260215759277,0.05316162109375,0.05234932899475098,0.056101322174072266,0.022815942764282227,0.05246567726135254,0.24225831031799316,0.08220839500427246,0.14440250396728516,0.1434328556060791,0.18371152877807617,0.5730974674224854,0.21056270599365234 +11,refs/remotes/origin/pull/1,b53b9078df7906fa163e52bf892e8f120c7784ca,e387b50474e7e19df4428a630dfa71e60c28824a,d038300dbf0151a6bde3a1c9dd77a7f7ac4df050,,True,True,c2353a21c685c4fe46db4c570183b1b46cef1a2daacca8cf16f4ec0e6a8939ca,Tests_passed,8eddbe1d714bcb573edaa2f601f83af565afe376078aeee20611b344f2787f16,Tests_passed,True,True,Merge_failed,fc62729528e9cb16c2bf63c9ca7250e1258e414e4a8766bd798080bb1189b762,Merge_failed,c50a068cf49bf55bb59092c58b5aabc82bec04e74194f098275efc3e1b832a4b,Merge_failed,fc62729528e9cb16c2bf63c9ca7250e1258e414e4a8766bd798080bb1189b762,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,e39a8f0616da2f5097bde218baa825d7ffcc73cdd4fa7b2b76ca12bade4f0e7e,Merge_failed,fc62729528e9cb16c2bf63c9ca7250e1258e414e4a8766bd798080bb1189b762,Merge_failed,a4390e4e427fe29b7c9385ea4787820cb83325d9c73a140491f3b7d14711d855,Merge_failed,608c137863ab14d9a34ae3d5e9e685a700557b7a2b01d7881bac3d9d40397366,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,3a376f471ccbff178f421675e314ea71ba8aad4a4faabf558346f57521de2517,Merge_failed,23a05aa1f8ae94d72a505a8994de4733f0f5e067c2b8998e40bbfdd620c063b2,0.04694247245788574,0.04844260215759277,0.05316162109375,0.05234932899475098,0.056101322174072266,0.022815942764282227,0.05246567726135254,0.24225831031799316,0.08220839500427246,0.14203834533691406,0.14237642288208008,0.18371152877807617,0.5730974674224854,0.21056270599365234 diff --git a/results/combined/merges_timed/guhilling/cdi-test.csv b/results/combined/merges_timed/guhilling/cdi-test.csv index a0ce9f5a12..e7a9810c55 100644 --- a/results/combined/merges_timed/guhilling/cdi-test.csv +++ b/results/combined/merges_timed/guhilling/cdi-test.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/main,728b39ab384467c2a5bd8949528901cc9e532da6,558ef6bdc34c99dbbb3c1b43b683765af23b451e,e59f3187e74b6c45bced49be01756309a26daa31,,True,True,2d495716ef5fe5cae34e639c6401f5a971c63f0f51b3920087919ef33ae24e8a,Tests_passed,23bd722855ff0f4a9b8ad8aa0a951ed06e32d99de77b09636f2f72f05da10065,Tests_passed,True,True,Merge_failed,3c27cdc9507b0b7de075fb0158809f87765f94db5d9043e2b7a62679b3f50092,Merge_failed,a437c2ad067e061549bee79eccf46b336adf8ef003461fd179855aed9c8efe50,Merge_failed,3c27cdc9507b0b7de075fb0158809f87765f94db5d9043e2b7a62679b3f50092,Merge_failed,b22051724e02032b221340ac135c6a20e02c7b2d22a2d8161de868ccc1ad4f38,Merge_failed,11b55fd41dc56e97118a2f514cb6b48b0a1181366d34950b6c7612b8704dbb23,Merge_failed,11b55fd41dc56e97118a2f514cb6b48b0a1181366d34950b6c7612b8704dbb23,Merge_failed,11b55fd41dc56e97118a2f514cb6b48b0a1181366d34950b6c7612b8704dbb23,Merge_failed,632befcdf21315e0f682b15ae6998e6584006c77328983c62891b704457edcb6,Merge_failed,3c27cdc9507b0b7de075fb0158809f87765f94db5d9043e2b7a62679b3f50092,Merge_failed,fc3ac5f71575245f9e25e0bbf76e7b7733cc4fc43f46f0cd815fecf62265c9d2,Merge_failed,fc3ac5f71575245f9e25e0bbf76e7b7733cc4fc43f46f0cd815fecf62265c9d2,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,078c5f4e4e8ddb47a4bd5e78feb2481b9fd80b071ff05dc5c711d84372395d45,Merge_failed,78ad8afe5e4bf5ff19e658e92be85fb2bf5ce0e2ac2a868b3415affbb86c4c95,0.06470561027526855,0.062088727951049805,0.06378483772277832,0.0635380744934082,0.07671999931335449,0.05745887756347656,0.05684351921081543,2.241236925125122,0.2943394184112549,2.69500470161438,2.700171709060669,1.9729368686676025,10.513340473175049,0.33528733253479004 +3,refs/heads/main,728b39ab384467c2a5bd8949528901cc9e532da6,558ef6bdc34c99dbbb3c1b43b683765af23b451e,e59f3187e74b6c45bced49be01756309a26daa31,,True,True,2d495716ef5fe5cae34e639c6401f5a971c63f0f51b3920087919ef33ae24e8a,Tests_passed,23bd722855ff0f4a9b8ad8aa0a951ed06e32d99de77b09636f2f72f05da10065,Tests_passed,True,True,Merge_failed,3c27cdc9507b0b7de075fb0158809f87765f94db5d9043e2b7a62679b3f50092,Merge_failed,a437c2ad067e061549bee79eccf46b336adf8ef003461fd179855aed9c8efe50,Merge_failed,3c27cdc9507b0b7de075fb0158809f87765f94db5d9043e2b7a62679b3f50092,Merge_failed,b22051724e02032b221340ac135c6a20e02c7b2d22a2d8161de868ccc1ad4f38,Merge_failed,11b55fd41dc56e97118a2f514cb6b48b0a1181366d34950b6c7612b8704dbb23,Merge_failed,11b55fd41dc56e97118a2f514cb6b48b0a1181366d34950b6c7612b8704dbb23,Merge_failed,11b55fd41dc56e97118a2f514cb6b48b0a1181366d34950b6c7612b8704dbb23,Merge_failed,632befcdf21315e0f682b15ae6998e6584006c77328983c62891b704457edcb6,Merge_failed,3c27cdc9507b0b7de075fb0158809f87765f94db5d9043e2b7a62679b3f50092,Merge_failed,fc3ac5f71575245f9e25e0bbf76e7b7733cc4fc43f46f0cd815fecf62265c9d2,Merge_failed,fc3ac5f71575245f9e25e0bbf76e7b7733cc4fc43f46f0cd815fecf62265c9d2,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,078c5f4e4e8ddb47a4bd5e78feb2481b9fd80b071ff05dc5c711d84372395d45,Merge_failed,78ad8afe5e4bf5ff19e658e92be85fb2bf5ce0e2ac2a868b3415affbb86c4c95,0.06470561027526855,0.062088727951049805,0.06378483772277832,0.0635380744934082,0.07671999931335449,0.05745887756347656,0.05684351921081543,2.241236925125122,0.2943394184112549,2.690904378890991,2.69305682182312,1.9729368686676025,10.513340473175049,0.33528733253479004 diff --git a/results/combined/merges_timed/gwt-test-utils/gwt-test-utils.csv b/results/combined/merges_timed/gwt-test-utils/gwt-test-utils.csv index 1efb9c56d9..ffd47161d4 100644 --- a/results/combined/merges_timed/gwt-test-utils/gwt-test-utils.csv +++ b/results/combined/merges_timed/gwt-test-utils/gwt-test-utils.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,e65277e5e16f96f58ece40a889b291953522193c,efff4f30629859a45cc06fcaec59a8e15a66756a,7f9f72c2ed3a2ca75cc4b124ded0be4fdb247b36,,True,True,efd41c8f4772cbe50b19df2233114f2f0652169b520c8a69a5801e1b8e7c36de,Tests_passed,5a180168eb246b2256e408e2b3520fd3b64f1bdde485d6ba6d6f0000a4bc123f,Tests_passed,True,True,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,0.06538867950439453,0.06130099296569824,0.05102229118347168,0.05135464668273926,0.05623626708984375,0.061049461364746094,0.06355857849121094,0.3112502098083496,0.053818702697753906,0.4553091526031494,0.4552035331726074,0.22670650482177734,2.2529942989349365,0.636737585067749 +1,refs/heads/master,e65277e5e16f96f58ece40a889b291953522193c,efff4f30629859a45cc06fcaec59a8e15a66756a,7f9f72c2ed3a2ca75cc4b124ded0be4fdb247b36,,True,True,efd41c8f4772cbe50b19df2233114f2f0652169b520c8a69a5801e1b8e7c36de,Tests_passed,5a180168eb246b2256e408e2b3520fd3b64f1bdde485d6ba6d6f0000a4bc123f,Tests_passed,True,True,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,0.06538867950439453,0.06130099296569824,0.05102229118347168,0.05135464668273926,0.05623626708984375,0.061049461364746094,0.06355857849121094,0.3112502098083496,0.053818702697753906,0.4502882957458496,0.46682071685791016,0.22670650482177734,2.2529942989349365,0.636737585067749 diff --git a/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv b/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv index 7087fd8a8d..5d6b04c977 100644 --- a/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv +++ b/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -273,refs/heads/master,4fc9137691f262d79c1f7844d85659dea906122c,2bf9681565c5afb56975302f7b43f0b1047bb7df,d88b69006707290f80fc2b2015248303168a9c22,,True,True,b7b26bc5205b94a2a0e2a37bb032595181f027649c9ce9b15cf7fb5eab498f8c,Tests_passed,8a7a2318b73299229541277f9b490ae8d01aef524eb3dfe5f6f6ceaf50fb2a7e,Tests_passed,True,True,Merge_failed,82a5faed9e588998706a3ae0c694ee4c012ad921c3730cce09c4ca08ed84e468,Merge_failed,d6e22dc53cc6cf72cfa208e9bc5e41bba66c26a5c032fd4404e4b2594a638cef,Merge_failed,82a5faed9e588998706a3ae0c694ee4c012ad921c3730cce09c4ca08ed84e468,Merge_failed,a7aa76303efe1546928599e8877223b65d3817dc102cebcdd1c1b3d6843d9d7a,Merge_failed,3a63b0408f140fd3446530e66599b32c7763d79b1243c2eb36b1082ace4452d8,Merge_failed,3a63b0408f140fd3446530e66599b32c7763d79b1243c2eb36b1082ace4452d8,Merge_failed,82a5faed9e588998706a3ae0c694ee4c012ad921c3730cce09c4ca08ed84e468,Merge_failed,b4091a31ead2b107ea05f784721b58cfd4abf3cd37d97b5edb9480e14311320f,Merge_failed,82a5faed9e588998706a3ae0c694ee4c012ad921c3730cce09c4ca08ed84e468,Merge_failed,1b9fda8d6b3e337bb58560acaa44ef7a8f4948f92280e0d12c62076c9c583bb7,Merge_failed,a3a1d630dec48fb90d631b998abb42c907564e017a2854848392aea181c3a2e4,Merge_failed,f8aef93575b24911ab30eed5932828fe0bdc02f31e5f767baaddce3bbf5e6ca5,Merge_failed,6d4b5e1d084c118e17cd6a1cc5dfdd5ec798af5f4490b148306a51896cf93807,Merge_failed,95fb3f2d279be0522f7ffbb3b996f1243adc38842592ac0322010543083e05a3,0.03880167007446289,0.059484243392944336,0.06165170669555664,0.05971837043762207,0.061612844467163086,0.07290172576904297,0.04823184013366699,2.9213786125183105,0.13674259185791016,5.574307918548584,5.579274415969849,2.663084030151367,19.77274489402771,0.44933128356933594 +273,refs/heads/master,4fc9137691f262d79c1f7844d85659dea906122c,2bf9681565c5afb56975302f7b43f0b1047bb7df,d88b69006707290f80fc2b2015248303168a9c22,,True,True,b7b26bc5205b94a2a0e2a37bb032595181f027649c9ce9b15cf7fb5eab498f8c,Tests_passed,8a7a2318b73299229541277f9b490ae8d01aef524eb3dfe5f6f6ceaf50fb2a7e,Tests_passed,True,True,Merge_failed,82a5faed9e588998706a3ae0c694ee4c012ad921c3730cce09c4ca08ed84e468,Merge_failed,d6e22dc53cc6cf72cfa208e9bc5e41bba66c26a5c032fd4404e4b2594a638cef,Merge_failed,82a5faed9e588998706a3ae0c694ee4c012ad921c3730cce09c4ca08ed84e468,Merge_failed,a7aa76303efe1546928599e8877223b65d3817dc102cebcdd1c1b3d6843d9d7a,Merge_failed,3a63b0408f140fd3446530e66599b32c7763d79b1243c2eb36b1082ace4452d8,Merge_failed,3a63b0408f140fd3446530e66599b32c7763d79b1243c2eb36b1082ace4452d8,Merge_failed,82a5faed9e588998706a3ae0c694ee4c012ad921c3730cce09c4ca08ed84e468,Merge_failed,b4091a31ead2b107ea05f784721b58cfd4abf3cd37d97b5edb9480e14311320f,Merge_failed,82a5faed9e588998706a3ae0c694ee4c012ad921c3730cce09c4ca08ed84e468,Merge_failed,1b9fda8d6b3e337bb58560acaa44ef7a8f4948f92280e0d12c62076c9c583bb7,Merge_failed,a3a1d630dec48fb90d631b998abb42c907564e017a2854848392aea181c3a2e4,Merge_failed,f8aef93575b24911ab30eed5932828fe0bdc02f31e5f767baaddce3bbf5e6ca5,Merge_failed,6d4b5e1d084c118e17cd6a1cc5dfdd5ec798af5f4490b148306a51896cf93807,Merge_failed,95fb3f2d279be0522f7ffbb3b996f1243adc38842592ac0322010543083e05a3,0.03880167007446289,0.059484243392944336,0.06165170669555664,0.05971837043762207,0.061612844467163086,0.07290172576904297,0.04823184013366699,2.9213786125183105,0.13674259185791016,5.525285243988037,5.542192459106445,2.663084030151367,19.77274489402771,0.44933128356933594 diff --git a/results/combined/merges_timed/hansolo/steelseries-swing.csv b/results/combined/merges_timed/hansolo/steelseries-swing.csv index 04109fe72a..c2a381b324 100644 --- a/results/combined/merges_timed/hansolo/steelseries-swing.csv +++ b/results/combined/merges_timed/hansolo/steelseries-swing.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,cedcf92cbdcad2cacbd5024e498fc27743b9a3bb,1dd3e17fce2fe179b87f09d05280cc060c1c2cd1,f8353e7a7fd40ef96510bb7c916c7d98c1be5dc7,,c5ed1c77a88572d015ce9c1a57ffef874ff16034108983ad86af17e5441a9a34,Tests_passed,595be49e121f26a4ab8df4c3315ddf66690a84e1ca37af74df4858846c6325f1,Tests_passed,True,True,True,True,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_failed,50f14d998066177e016eb23391376f10fd816c373a6caefb8d90a1c997ba2ff6,Tests_failed,50f14d998066177e016eb23391376f10fd816c373a6caefb8d90a1c997ba2ff6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,0.0373377799987793,0.0379788875579834,0.06439423561096191,0.05734109878540039,0.032700300216674805,0.059618473052978516,0.0752251148223877,0.28786468505859375,0.03237009048461914,0.40319252014160156,0.3993659019470215,0.16938161849975586,4.507865905761719,0.27174830436706543 +3,refs/heads/master,cedcf92cbdcad2cacbd5024e498fc27743b9a3bb,1dd3e17fce2fe179b87f09d05280cc060c1c2cd1,f8353e7a7fd40ef96510bb7c916c7d98c1be5dc7,,c5ed1c77a88572d015ce9c1a57ffef874ff16034108983ad86af17e5441a9a34,Tests_passed,595be49e121f26a4ab8df4c3315ddf66690a84e1ca37af74df4858846c6325f1,Tests_passed,True,True,True,True,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_failed,50f14d998066177e016eb23391376f10fd816c373a6caefb8d90a1c997ba2ff6,Tests_failed,50f14d998066177e016eb23391376f10fd816c373a6caefb8d90a1c997ba2ff6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,0.0373377799987793,0.0379788875579834,0.06439423561096191,0.05734109878540039,0.032700300216674805,0.059618473052978516,0.0752251148223877,0.28786468505859375,0.03237009048461914,0.393953800201416,0.3984668254852295,0.16938161849975586,4.507865905761719,0.27174830436706543 diff --git a/results/combined/merges_timed/haraldwalker/user-agent-utils.csv b/results/combined/merges_timed/haraldwalker/user-agent-utils.csv index 4996951e09..b970f868e8 100644 --- a/results/combined/merges_timed/haraldwalker/user-agent-utils.csv +++ b/results/combined/merges_timed/haraldwalker/user-agent-utils.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/trunk,97242682eae8013625be47c8c513432d99ed305b,3d692feb91e6438feed318bcfd0550f1cedad290,4f3f972165b6407adc775b763649ae1b7ddceb4b,,True,True,600c3c40d5a655bc1d04abe0244a7d75ee41728152a9d319f59e9fcaa941f6e9,Tests_passed,b2d8f8478caeb7907d7b7843ad009c33d341e9646cc9b4b8b8f8c609795812e1,Tests_passed,True,True,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,0.040015220642089844,0.04243612289428711,0.04230499267578125,0.034894466400146484,0.05065631866455078,0.04614138603210449,0.059865713119506836,0.177534818649292,0.02348184585571289,0.19310975074768066,0.19968819618225098,0.11368346214294434,2.816448926925659,0.20619893074035645 +6,refs/heads/trunk,97242682eae8013625be47c8c513432d99ed305b,3d692feb91e6438feed318bcfd0550f1cedad290,4f3f972165b6407adc775b763649ae1b7ddceb4b,,True,True,600c3c40d5a655bc1d04abe0244a7d75ee41728152a9d319f59e9fcaa941f6e9,Tests_passed,b2d8f8478caeb7907d7b7843ad009c33d341e9646cc9b4b8b8f8c609795812e1,Tests_passed,True,True,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,0.040015220642089844,0.04243612289428711,0.04230499267578125,0.034894466400146484,0.05065631866455078,0.04614138603210449,0.059865713119506836,0.177534818649292,0.02348184585571289,0.18891263008117676,0.1886134147644043,0.11368346214294434,2.816448926925659,0.20619893074035645 diff --git a/results/combined/merges_timed/hdiv/hdiv.csv b/results/combined/merges_timed/hdiv/hdiv.csv index 6d08a52fd2..3494ecfd9e 100644 --- a/results/combined/merges_timed/hdiv/hdiv.csv +++ b/results/combined/merges_timed/hdiv/hdiv.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,3d002a41907d808d059bb7c1ff4aaf3a3a76f411,76f1f9fc5bf03cd2ff1696b65444189675b96ca2,50ed0486e9c518c3c9d3a6919e38effbe871f91f,,033cccee63cc3f7670b7a9e770a5a1790ee7cd90008aba465cf22a22766136cf,Tests_passed,fa75224b7fda1adedf30ec0339207cb18df05c988621cd389b86b2bee35c2afd,Tests_passed,True,True,True,True,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,7d41ab26acf5cd804df0e3f9cf590c439bc3d67588d5a71b5a8b69fb5e1ca450,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,044b36c5c68cca757137e74b3530f5d953b1674f973879bb7fabda760ef1a354,Merge_failed,044b36c5c68cca757137e74b3530f5d953b1674f973879bb7fabda760ef1a354,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,d1310bfda8547bd309eb384301584c124872d0b62c63fa251d1954008fb5021d,Merge_failed,e9e878c01ae12494dbb88221c6d3b8beb5c39115493b24786296751fbf092f33,0.022853374481201172,0.0572504997253418,0.06012773513793945,0.04733562469482422,0.05400538444519043,0.04455971717834473,0.05291891098022461,0.8184812068939209,0.08953452110290527,0.15676116943359375,0.1560215950012207,0.7011914253234863,1.4335262775421143,0.3094029426574707 +2,refs/heads/master,3d002a41907d808d059bb7c1ff4aaf3a3a76f411,76f1f9fc5bf03cd2ff1696b65444189675b96ca2,50ed0486e9c518c3c9d3a6919e38effbe871f91f,,033cccee63cc3f7670b7a9e770a5a1790ee7cd90008aba465cf22a22766136cf,Tests_passed,fa75224b7fda1adedf30ec0339207cb18df05c988621cd389b86b2bee35c2afd,Tests_passed,True,True,True,True,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,7d41ab26acf5cd804df0e3f9cf590c439bc3d67588d5a71b5a8b69fb5e1ca450,Merge_failed,9fa7d41d4be2e2ef316b62d71c3c753214a653eda21655cf5e98283d76e2a669,Merge_failed,044b36c5c68cca757137e74b3530f5d953b1674f973879bb7fabda760ef1a354,Merge_failed,044b36c5c68cca757137e74b3530f5d953b1674f973879bb7fabda760ef1a354,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,d1310bfda8547bd309eb384301584c124872d0b62c63fa251d1954008fb5021d,Merge_failed,e9e878c01ae12494dbb88221c6d3b8beb5c39115493b24786296751fbf092f33,0.022853374481201172,0.0572504997253418,0.06012773513793945,0.04733562469482422,0.05400538444519043,0.04455971717834473,0.05291891098022461,0.8184812068939209,0.08953452110290527,0.1379072666168213,0.15647363662719727,0.7011914253234863,1.4335262775421143,0.3094029426574707 diff --git a/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv b/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv index 71ec7709d2..ad33395617 100644 --- a/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv +++ b/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -56,refs/heads/master,127046e0c90ca79a98b818067ca1d47c66e2745b,89c43df4fbd64c0deda228b3721eabb235eeeb6a,f6fa7fdfcebffbdecbc94dc5b858f53fc49226de,,True,True,fc92a264f353c9873cd991a7a4dcd9a1c317cad777364f71242b8ee72c44516f,Tests_passed,92399ca42febcac70dd802560350ef996dfe9ca2551e1255e8f4bd97ddc7bec4,Tests_passed,True,True,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Merge_failed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Merge_failed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,c7e4ca3391f01dbb3e54cedcda92330bc0b163981a27cfb44f63f6ebfe3a7d8e,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,0.02932906150817871,0.0518956184387207,0.0480799674987793,0.028234004974365234,0.028704404830932617,0.03468632698059082,0.051006317138671875,0.11425399780273438,0.02374100685119629,0.10125494003295898,0.09706878662109375,0.08771491050720215,0.6546108722686768,0.24954509735107422 +56,refs/heads/master,127046e0c90ca79a98b818067ca1d47c66e2745b,89c43df4fbd64c0deda228b3721eabb235eeeb6a,f6fa7fdfcebffbdecbc94dc5b858f53fc49226de,,True,True,fc92a264f353c9873cd991a7a4dcd9a1c317cad777364f71242b8ee72c44516f,Tests_passed,92399ca42febcac70dd802560350ef996dfe9ca2551e1255e8f4bd97ddc7bec4,Tests_passed,True,True,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Merge_failed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Merge_failed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,c7e4ca3391f01dbb3e54cedcda92330bc0b163981a27cfb44f63f6ebfe3a7d8e,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,0.02932906150817871,0.0518956184387207,0.0480799674987793,0.028234004974365234,0.028704404830932617,0.03468632698059082,0.051006317138671875,0.11425399780273438,0.02374100685119629,0.10065913200378418,0.100616455078125,0.08771491050720215,0.6546108722686768,0.24954509735107422 diff --git a/results/combined/merges_timed/helpscout/helpscout-api-java.csv b/results/combined/merges_timed/helpscout/helpscout-api-java.csv index 55a029cae5..437aa5ed41 100644 --- a/results/combined/merges_timed/helpscout/helpscout-api-java.csv +++ b/results/combined/merges_timed/helpscout/helpscout-api-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,f606dc7048e32d8953594011ce7a80f8f325a5eb,f6b775455a0f59685e5a40fc597311bff6f01c7b,8f841dfa133c723515a234b19f123b8c5b2a4e83,,True,True,fa0d20130c3cff3b3b8f9913dc0afedd830cf8c8fcaa6fe22a50d77d09954e08,Tests_passed,32d1ec04af7938d97805196b6701280b7da35d683e3047b1ff26f679ca0ad17f,Tests_passed,True,True,Merge_failed,e57a4df834d13e9e259d74bdf1c13ca4a674cd2dd46f3209af73d658ef3ed5e0,Merge_failed,71addd5632dfa42395f681357e74d13bcb79440ff8b71b171963a829595d9ae5,Merge_failed,e57a4df834d13e9e259d74bdf1c13ca4a674cd2dd46f3209af73d658ef3ed5e0,Merge_failed,c8d08f1da79a1dd5dc8f19f57213dcf961c337802d3d665997c2602ff4fe328d,Merge_failed,ca4ada95d7aff3a52f89f0990eea0b342556957b73b0760efb381d71c12c0e3c,Merge_failed,ca4ada95d7aff3a52f89f0990eea0b342556957b73b0760efb381d71c12c0e3c,Merge_failed,e57a4df834d13e9e259d74bdf1c13ca4a674cd2dd46f3209af73d658ef3ed5e0,Merge_failed,c7b580145d762800c4ffa25081de3551e2834ccb8065b10b1f5c221a50a8049e,Merge_failed,e57a4df834d13e9e259d74bdf1c13ca4a674cd2dd46f3209af73d658ef3ed5e0,Merge_failed,0c8a26722d28bcebe685b6f0d08241524ad8c46d3e663b0dc8b2c54c690815b5,Merge_failed,0c8a26722d28bcebe685b6f0d08241524ad8c46d3e663b0dc8b2c54c690815b5,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,33d866029c769678c78bdccae388d87203c447ed2351d25c937d29d64df13474,Merge_failed,c8da6b370a1d00d54da443bb6c35e0a4532994cc63a7c0f65f5390480978eaf2,0.04920697212219238,0.04857969284057617,0.015218496322631836,0.0266110897064209,0.020058631896972656,0.042943477630615234,0.038201332092285156,0.4205927848815918,0.12290024757385254,0.22136521339416504,0.22769737243652344,0.4021458625793457,2.563270330429077,0.2278451919555664 +9,refs/heads/master,f606dc7048e32d8953594011ce7a80f8f325a5eb,f6b775455a0f59685e5a40fc597311bff6f01c7b,8f841dfa133c723515a234b19f123b8c5b2a4e83,,True,True,fa0d20130c3cff3b3b8f9913dc0afedd830cf8c8fcaa6fe22a50d77d09954e08,Tests_passed,32d1ec04af7938d97805196b6701280b7da35d683e3047b1ff26f679ca0ad17f,Tests_passed,True,True,Merge_failed,e57a4df834d13e9e259d74bdf1c13ca4a674cd2dd46f3209af73d658ef3ed5e0,Merge_failed,71addd5632dfa42395f681357e74d13bcb79440ff8b71b171963a829595d9ae5,Merge_failed,e57a4df834d13e9e259d74bdf1c13ca4a674cd2dd46f3209af73d658ef3ed5e0,Merge_failed,c8d08f1da79a1dd5dc8f19f57213dcf961c337802d3d665997c2602ff4fe328d,Merge_failed,ca4ada95d7aff3a52f89f0990eea0b342556957b73b0760efb381d71c12c0e3c,Merge_failed,ca4ada95d7aff3a52f89f0990eea0b342556957b73b0760efb381d71c12c0e3c,Merge_failed,e57a4df834d13e9e259d74bdf1c13ca4a674cd2dd46f3209af73d658ef3ed5e0,Merge_failed,c7b580145d762800c4ffa25081de3551e2834ccb8065b10b1f5c221a50a8049e,Merge_failed,e57a4df834d13e9e259d74bdf1c13ca4a674cd2dd46f3209af73d658ef3ed5e0,Merge_failed,0c8a26722d28bcebe685b6f0d08241524ad8c46d3e663b0dc8b2c54c690815b5,Merge_failed,0c8a26722d28bcebe685b6f0d08241524ad8c46d3e663b0dc8b2c54c690815b5,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,33d866029c769678c78bdccae388d87203c447ed2351d25c937d29d64df13474,Merge_failed,c8da6b370a1d00d54da443bb6c35e0a4532994cc63a7c0f65f5390480978eaf2,0.04920697212219238,0.04857969284057617,0.015218496322631836,0.0266110897064209,0.020058631896972656,0.042943477630615234,0.038201332092285156,0.4205927848815918,0.12290024757385254,0.22550320625305176,0.221754789352417,0.4021458625793457,2.563270330429077,0.2278451919555664 diff --git a/results/combined/merges_timed/helun/ektorp.csv b/results/combined/merges_timed/helun/ektorp.csv index 059572dfa0..7c6c4e7f43 100644 --- a/results/combined/merges_timed/helun/ektorp.csv +++ b/results/combined/merges_timed/helun/ektorp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -144,refs/remotes/origin/pull/271,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,147a38fd89a5f2cf0d6bc54fc538f1cb95031ee5,66abcdc152ce8f4d61d882958e42c88b59ade06b,,True,True,442a9475b54cf8061d09c0d8ccce1cabbcc7709f559ebe3245b88194b34dde0d,Tests_passed,a55529ee7282f95d271c336ef0f35cd28cdaa358af48b5db6c5f664e9cac166f,Tests_passed,True,True,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2bd91ebab9d163dc9aa1146aa65e5e3ff9a5e1030880d4fc9be5abb1f7a3b8c2,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,bed19c3d97b2a25ae8e90d14b25fd5b97227d02d1e884e76c4221a1a892282d1,Merge_failed,e5a66a2d365954acfc6791d6a8c124b6470db8f83e543d2eeee76cf46ce6fa91,0.050550222396850586,0.02741837501525879,0.048993825912475586,0.04868769645690918,0.04401516914367676,0.03695392608642578,0.0450894832611084,0.23557376861572266,0.08465719223022461,0.24474573135375977,0.23825573921203613,0.17823314666748047,2.308220386505127,0.2299971580505371 +144,refs/remotes/origin/pull/271,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,147a38fd89a5f2cf0d6bc54fc538f1cb95031ee5,66abcdc152ce8f4d61d882958e42c88b59ade06b,,True,True,442a9475b54cf8061d09c0d8ccce1cabbcc7709f559ebe3245b88194b34dde0d,Tests_passed,a55529ee7282f95d271c336ef0f35cd28cdaa358af48b5db6c5f664e9cac166f,Tests_passed,True,True,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2bd91ebab9d163dc9aa1146aa65e5e3ff9a5e1030880d4fc9be5abb1f7a3b8c2,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,bed19c3d97b2a25ae8e90d14b25fd5b97227d02d1e884e76c4221a1a892282d1,Merge_failed,e5a66a2d365954acfc6791d6a8c124b6470db8f83e543d2eeee76cf46ce6fa91,0.050550222396850586,0.02741837501525879,0.048993825912475586,0.04868769645690918,0.04401516914367676,0.03695392608642578,0.0450894832611084,0.23557376861572266,0.08465719223022461,0.24260401725769043,0.24234461784362793,0.17823314666748047,2.308220386505127,0.2299971580505371 diff --git a/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv b/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv index 054f55e93f..a1ed84cc4e 100644 --- a/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv +++ b/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/remotes/origin/pull/7,c69377866c8614d5a1ef047d3061fcfed5203232,4f181be7c4b60cade09afd674ea02da5f593bade,5077d499c5c7be0952e9a191be47757df1096102,,aadb84a0424e3b658e3c90e517ae410accdf02cf55d7e5fe1eccce7f58794ce4,Tests_passed,9b199fb6874ae2a58f6b7b2c55cd50157e2fab2047434ac13c7bb5d7e614f5a2,Tests_passed,True,True,True,True,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,0.009239435195922852,0.009822845458984375,0.009459972381591797,0.00951075553894043,0.00939798355102539,0.009392499923706055,0.009443044662475586,0.03319907188415527,0.009488582611083984,0.15431499481201172,0.15572500228881836,0.06439757347106934,0.5781552791595459,0.16560006141662598 +6,refs/remotes/origin/pull/7,c69377866c8614d5a1ef047d3061fcfed5203232,4f181be7c4b60cade09afd674ea02da5f593bade,5077d499c5c7be0952e9a191be47757df1096102,,aadb84a0424e3b658e3c90e517ae410accdf02cf55d7e5fe1eccce7f58794ce4,Tests_passed,9b199fb6874ae2a58f6b7b2c55cd50157e2fab2047434ac13c7bb5d7e614f5a2,Tests_passed,True,True,True,True,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,0.009239435195922852,0.009822845458984375,0.009459972381591797,0.00951075553894043,0.00939798355102539,0.009392499923706055,0.009443044662475586,0.03319907188415527,0.009488582611083984,0.15268898010253906,0.15634584426879883,0.06439757347106934,0.5781552791595459,0.16560006141662598 diff --git a/results/combined/merges_timed/heroku/heroku-maven-plugin.csv b/results/combined/merges_timed/heroku/heroku-maven-plugin.csv index 95116f6f2a..3ed41b9b8d 100644 --- a/results/combined/merges_timed/heroku/heroku-maven-plugin.csv +++ b/results/combined/merges_timed/heroku/heroku-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -40,refs/heads/main,a935a91977e0132509028b7d13eb8c2f4e4a0f0e,0009fe317d0c15efa8520595eb84f566edfee509,09bd48fe1a79a07a35bae8f6b7d37e523f13c7a4,,True,True,41e34e7e8fee4a46c65e09f28f464b64a1c76bf830b8374d72dafca32279ad1a,Tests_passed,f87d7b4a0f82994172506cc91bc4a890c62f4e65a0f7d8a4492069e063066f33,Tests_passed,True,True,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,6f12e991325e753dfa8a5aad351c039e9f25468ec26458bb9c4ad4c9b6390cb6,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,aa39cb1760ddf5eada06d38f473495e3419cec4a22837568c9f8ce9a46ca6a40,Merge_failed,aa39cb1760ddf5eada06d38f473495e3419cec4a22837568c9f8ce9a46ca6a40,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Merge_failed,1f56797591aa78cb5c0f436fa32dc587121d8ded297e2238d1359af691c1e83d,0.040528297424316406,0.04721426963806152,0.04238295555114746,0.037507057189941406,0.03429555892944336,0.04007554054260254,0.03531503677368164,0.13519573211669922,0.06696224212646484,0.0633385181427002,0.06288981437683105,0.11083531379699707,0.4876837730407715,0.22179627418518066 +40,refs/heads/main,a935a91977e0132509028b7d13eb8c2f4e4a0f0e,0009fe317d0c15efa8520595eb84f566edfee509,09bd48fe1a79a07a35bae8f6b7d37e523f13c7a4,,True,True,41e34e7e8fee4a46c65e09f28f464b64a1c76bf830b8374d72dafca32279ad1a,Tests_passed,f87d7b4a0f82994172506cc91bc4a890c62f4e65a0f7d8a4492069e063066f33,Tests_passed,True,True,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,6f12e991325e753dfa8a5aad351c039e9f25468ec26458bb9c4ad4c9b6390cb6,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,aa39cb1760ddf5eada06d38f473495e3419cec4a22837568c9f8ce9a46ca6a40,Merge_failed,aa39cb1760ddf5eada06d38f473495e3419cec4a22837568c9f8ce9a46ca6a40,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Merge_failed,1f56797591aa78cb5c0f436fa32dc587121d8ded297e2238d1359af691c1e83d,0.040528297424316406,0.04721426963806152,0.04238295555114746,0.037507057189941406,0.03429555892944336,0.04007554054260254,0.03531503677368164,0.13519573211669922,0.06696224212646484,0.06297183036804199,0.06257891654968262,0.11083531379699707,0.4876837730407715,0.22179627418518066 diff --git a/results/combined/merges_timed/heroku/java-getting-started.csv b/results/combined/merges_timed/heroku/java-getting-started.csv index 789c619084..127b88ef3e 100644 --- a/results/combined/merges_timed/heroku/java-getting-started.csv +++ b/results/combined/merges_timed/heroku/java-getting-started.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -52,refs/remotes/origin/pull/61,ada8e6776a47c7ddc9bf33aca353d2b895416c4f,c25acd5f8ed8ac7675266798fe99fcfee8912dcf,194c69c5fc86c19188504524cb1045ef8c57b1b5,,True,True,b4e9fcbbce415f112c292035a9ba83b97842fa926d400f43ea1db91db5986ce1,Tests_passed,ded4a4908e9d74279b7347f449839a1f7f498dba88afa2ffbd1d79e720c7eb6d,Tests_passed,True,True,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,a304e68f6600907f64e0cf4b4600d86468e9d88f1e39e3f133547876a8e1df19,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,0.04074239730834961,0.0419766902923584,0.0431210994720459,0.04227590560913086,0.04185891151428223,0.04547476768493652,0.037100791931152344,0.22896122932434082,0.04273509979248047,0.14249324798583984,0.14203929901123047,0.1752490997314453,0.6425867080688477,0.1904909610748291 +52,refs/remotes/origin/pull/61,ada8e6776a47c7ddc9bf33aca353d2b895416c4f,c25acd5f8ed8ac7675266798fe99fcfee8912dcf,194c69c5fc86c19188504524cb1045ef8c57b1b5,,True,True,b4e9fcbbce415f112c292035a9ba83b97842fa926d400f43ea1db91db5986ce1,Tests_passed,ded4a4908e9d74279b7347f449839a1f7f498dba88afa2ffbd1d79e720c7eb6d,Tests_passed,True,True,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,a304e68f6600907f64e0cf4b4600d86468e9d88f1e39e3f133547876a8e1df19,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,0.04074239730834961,0.0419766902923584,0.0431210994720459,0.04227590560913086,0.04185891151428223,0.04547476768493652,0.037100791931152344,0.22896122932434082,0.04273509979248047,0.1432631015777588,0.142991304397583,0.1752490997314453,0.6425867080688477,0.1904909610748291 diff --git a/results/combined/merges_timed/heronarts/lx.csv b/results/combined/merges_timed/heronarts/lx.csv index 182fb23f63..3f7ac0f695 100644 --- a/results/combined/merges_timed/heronarts/lx.csv +++ b/results/combined/merges_timed/heronarts/lx.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,198881dec136d9149da48e998f9c96ff27ef87b5,4fa8fcff072d18fe7c1b3449d3654c0788f3b881,09c8e07784d7a8f456737672eab034f162e7d45d,,True,True,5c15c4056d6004c740f059cf48fcf5ea144337527d0c2a6c6bc33ef2045ea7d3,Tests_passed,b947f69fa325ac688a4bd4a196bf7860985ed39b04694f9e144a4125c473dd0d,Tests_passed,True,True,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,0.059096574783325195,0.04705357551574707,0.05054640769958496,0.029697418212890625,0.02400493621826172,0.06952977180480957,0.05446457862854004,0.24164867401123047,0.054888010025024414,0.3506312370300293,0.3508329391479492,0.1755070686340332,2.5707600116729736,0.26868104934692383 +9,refs/heads/master,198881dec136d9149da48e998f9c96ff27ef87b5,4fa8fcff072d18fe7c1b3449d3654c0788f3b881,09c8e07784d7a8f456737672eab034f162e7d45d,,True,True,5c15c4056d6004c740f059cf48fcf5ea144337527d0c2a6c6bc33ef2045ea7d3,Tests_passed,b947f69fa325ac688a4bd4a196bf7860985ed39b04694f9e144a4125c473dd0d,Tests_passed,True,True,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,0.059096574783325195,0.04705357551574707,0.05054640769958496,0.029697418212890625,0.02400493621826172,0.06952977180480957,0.05446457862854004,0.24164867401123047,0.054888010025024414,0.35712766647338867,0.34119200706481934,0.1755070686340332,2.5707600116729736,0.26868104934692383 diff --git a/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv b/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv index 2c057c6216..e1cee9e622 100644 --- a/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv +++ b/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,756905cd9e592caaaa963739029bca5d46d20b77,4d30b5a9670b04b1b661eaaba70c10360f5514be,db445a4528d0f6b316777bc641344f1b97cfa8fd,,True,True,2314ad7e11181c347e73430cf592faa500fecf58c475c744817ec356c172b6f0,Tests_passed,2afe07950097068c71b595917ee694ea81d121b400c610c828b923b5144d8ea3,Tests_passed,True,True,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,a4e1737ab651e5625cac97358d772babb8c1573fa968738f1526a5ae7bf06180,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,1b43ae82e14d448dae86d34cf708b433efe90a34094e67d81363e7e8d97bbd27,Merge_failed,1b43ae82e14d448dae86d34cf708b433efe90a34094e67d81363e7e8d97bbd27,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,6df25d02d1136d58f63e25e456f39ac81b2bfd03e84f212ad6958ffe37dc9140,0.04495739936828613,0.04348397254943848,0.03450179100036621,0.039864540100097656,0.03551650047302246,0.03693079948425293,0.03876900672912598,0.16919445991516113,0.06366086006164551,0.0639042854309082,0.0641486644744873,0.11597585678100586,0.7277114391326904,0.18687796592712402 +24,refs/heads/master,756905cd9e592caaaa963739029bca5d46d20b77,4d30b5a9670b04b1b661eaaba70c10360f5514be,db445a4528d0f6b316777bc641344f1b97cfa8fd,,True,True,2314ad7e11181c347e73430cf592faa500fecf58c475c744817ec356c172b6f0,Tests_passed,2afe07950097068c71b595917ee694ea81d121b400c610c828b923b5144d8ea3,Tests_passed,True,True,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,a4e1737ab651e5625cac97358d772babb8c1573fa968738f1526a5ae7bf06180,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,1b43ae82e14d448dae86d34cf708b433efe90a34094e67d81363e7e8d97bbd27,Merge_failed,1b43ae82e14d448dae86d34cf708b433efe90a34094e67d81363e7e8d97bbd27,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,6df25d02d1136d58f63e25e456f39ac81b2bfd03e84f212ad6958ffe37dc9140,0.04495739936828613,0.04348397254943848,0.03450179100036621,0.039864540100097656,0.03551650047302246,0.03693079948425293,0.03876900672912598,0.16919445991516113,0.06366086006164551,0.06347823143005371,0.06381845474243164,0.11597585678100586,0.7277114391326904,0.18687796592712402 diff --git a/results/combined/merges_timed/hoijui/javaosc.csv b/results/combined/merges_timed/hoijui/javaosc.csv index ba7bc10ba0..229f8168d6 100644 --- a/results/combined/merges_timed/hoijui/javaosc.csv +++ b/results/combined/merges_timed/hoijui/javaosc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,f806396898fdfbf9533f2ff881b05ff5b6df5f6e,922809cde5aeaaa89a94a8aa7b4b3e03b3f993e5,129ad0d5979f9de902186c1ff9914307a9291e73,,True,True,d8a86f358399c05baefd8d244aece38be8c933fec24279dc6e76a2038371ad1c,Tests_passed,387fff3decdee2b6585d3d66363e05cb129d661e43fe06a7823ccd47cc684ff5,Tests_passed,True,True,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,d8e2d38026b7501ecd5d8d7e27e01107c212742aade63f38165f778b72eea220,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,b8eb4b640d457bf15441a6c2e4c04d5482b1041d20cce5c00f13aab2f08db13c,Merge_failed,b8eb4b640d457bf15441a6c2e4c04d5482b1041d20cce5c00f13aab2f08db13c,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Merge_failed,b4fe5226e73e8b0e683bf52e51245581b458621d9002f68c0f4d974e6db1fdc2,0.04349470138549805,0.046640872955322266,0.04426383972167969,0.04634904861450195,0.04656791687011719,0.0401616096496582,0.04564023017883301,0.18687915802001953,0.07895326614379883,0.5648372173309326,0.5664377212524414,0.33893537521362305,2.9797465801239014,0.20119690895080566 +12,refs/heads/master,f806396898fdfbf9533f2ff881b05ff5b6df5f6e,922809cde5aeaaa89a94a8aa7b4b3e03b3f993e5,129ad0d5979f9de902186c1ff9914307a9291e73,,True,True,d8a86f358399c05baefd8d244aece38be8c933fec24279dc6e76a2038371ad1c,Tests_passed,387fff3decdee2b6585d3d66363e05cb129d661e43fe06a7823ccd47cc684ff5,Tests_passed,True,True,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,d8e2d38026b7501ecd5d8d7e27e01107c212742aade63f38165f778b72eea220,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,b8eb4b640d457bf15441a6c2e4c04d5482b1041d20cce5c00f13aab2f08db13c,Merge_failed,b8eb4b640d457bf15441a6c2e4c04d5482b1041d20cce5c00f13aab2f08db13c,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Merge_failed,b4fe5226e73e8b0e683bf52e51245581b458621d9002f68c0f4d974e6db1fdc2,0.04349470138549805,0.046640872955322266,0.04426383972167969,0.04634904861450195,0.04656791687011719,0.0401616096496582,0.04564023017883301,0.18687915802001953,0.07895326614379883,0.5513489246368408,0.5511898994445801,0.33893537521362305,2.9797465801239014,0.20119690895080566 diff --git a/results/combined/merges_timed/hoijui/jawk.csv b/results/combined/merges_timed/hoijui/jawk.csv index 4e6720daab..e06a3c722b 100644 --- a/results/combined/merges_timed/hoijui/jawk.csv +++ b/results/combined/merges_timed/hoijui/jawk.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/12,b60fdfaa97a9a12c8eda22d7707295bbd1ea90dd,a1523a0d3dad5590e8b75bd6252a788512406bf2,e5c8f2601b4e7af1b587c3677e464cc6c226d36c,,True,True,8e6904b4360bf56eb3fad4272171b1fc4cdd37376620f4b0af8f2a1dc6a3b960,Tests_passed,dbf04cd3d1cfe48fabcd285561e49aadbae7e1a829fc2bf6b7cbe9ba3f4bb133,Tests_passed,True,True,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,00d2969aadf941ddc5a1e52421ca5ae99b6ae39c1609c9134ae36743327ce7c5,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,00d2969aadf941ddc5a1e52421ca5ae99b6ae39c1609c9134ae36743327ce7c5,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,41175d4370d693faff70a4e6bbdd5e7d2632f37a2bf182ee8d0e06b8bfb13523,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,94cb810415a8810429c37c1dc70a015e0472829d1dad2c5e8defde89ef81f2b3,Merge_failed,94cb810415a8810429c37c1dc70a015e0472829d1dad2c5e8defde89ef81f2b3,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,1812123933c7a87fb59d171934a0c260f2a0c69ee758777921ebaa11ed7df63d,0.04949831962585449,0.056296348571777344,0.053998470306396484,0.04153752326965332,0.04707217216491699,0.054868221282958984,0.06153273582458496,0.045694828033447266,0.07575201988220215,0.09187555313110352,0.0905601978302002,0.13567352294921875,3.631941795349121,0.22421479225158691 +3,refs/remotes/origin/pull/12,b60fdfaa97a9a12c8eda22d7707295bbd1ea90dd,a1523a0d3dad5590e8b75bd6252a788512406bf2,e5c8f2601b4e7af1b587c3677e464cc6c226d36c,,True,True,8e6904b4360bf56eb3fad4272171b1fc4cdd37376620f4b0af8f2a1dc6a3b960,Tests_passed,dbf04cd3d1cfe48fabcd285561e49aadbae7e1a829fc2bf6b7cbe9ba3f4bb133,Tests_passed,True,True,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,00d2969aadf941ddc5a1e52421ca5ae99b6ae39c1609c9134ae36743327ce7c5,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,00d2969aadf941ddc5a1e52421ca5ae99b6ae39c1609c9134ae36743327ce7c5,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,41175d4370d693faff70a4e6bbdd5e7d2632f37a2bf182ee8d0e06b8bfb13523,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,94cb810415a8810429c37c1dc70a015e0472829d1dad2c5e8defde89ef81f2b3,Merge_failed,94cb810415a8810429c37c1dc70a015e0472829d1dad2c5e8defde89ef81f2b3,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,1812123933c7a87fb59d171934a0c260f2a0c69ee758777921ebaa11ed7df63d,0.04949831962585449,0.056296348571777344,0.053998470306396484,0.04153752326965332,0.04707217216491699,0.054868221282958984,0.06153273582458496,0.045694828033447266,0.07575201988220215,0.08860087394714355,0.08926892280578613,0.13567352294921875,3.631941795349121,0.22421479225158691 diff --git a/results/combined/merges_timed/hoten/java-delaunay.csv b/results/combined/merges_timed/hoten/java-delaunay.csv index ba9a1849f1..18e6f8da2c 100644 --- a/results/combined/merges_timed/hoten/java-delaunay.csv +++ b/results/combined/merges_timed/hoten/java-delaunay.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,bfbc8c5bb6efc4a6044df3c60d5e2fe8eeaaef60,a5dbe4c4472bb3da4ccdc9113bdf6c7681d68d60,5ed77e94f95e191e769255471ff01967cf606b96,,True,True,666b875fd2076ef05b2e6ad421a39d36a9f0912601eba9de68effd13f3c2f5d1,Tests_passed,f9cf342dbc758e852e5fd8227393ceaaab341f7d8faedd0cb4f63a12e1a5a392,Tests_passed,True,True,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,0.05173039436340332,0.05110502243041992,0.033560991287231445,0.04244494438171387,0.0540928840637207,0.04746675491333008,0.04892134666442871,0.15790843963623047,0.0471951961517334,0.16269993782043457,0.16527009010314941,0.11661577224731445,0.038373708724975586,0.18499398231506348 +1,refs/heads/master,bfbc8c5bb6efc4a6044df3c60d5e2fe8eeaaef60,a5dbe4c4472bb3da4ccdc9113bdf6c7681d68d60,5ed77e94f95e191e769255471ff01967cf606b96,,True,True,666b875fd2076ef05b2e6ad421a39d36a9f0912601eba9de68effd13f3c2f5d1,Tests_passed,f9cf342dbc758e852e5fd8227393ceaaab341f7d8faedd0cb4f63a12e1a5a392,Tests_passed,True,True,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,0.05173039436340332,0.05110502243041992,0.033560991287231445,0.04244494438171387,0.0540928840637207,0.04746675491333008,0.04892134666442871,0.15790843963623047,0.0471951961517334,0.16024112701416016,0.16056275367736816,0.11661577224731445,0.038373708724975586,0.18499398231506348 diff --git a/results/combined/merges_timed/hoverruan/weiboclient4j.csv b/results/combined/merges_timed/hoverruan/weiboclient4j.csv index b31066dfb5..57b431e00e 100644 --- a/results/combined/merges_timed/hoverruan/weiboclient4j.csv +++ b/results/combined/merges_timed/hoverruan/weiboclient4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,62fb9296e8a8a0c3569630db86f72c4431a59af9,1d5f41e216cbd256148e0b617d4f9497ac1cbe81,cbb8c34c2182cd3c290acedb85cbd79a18da2f71,,True,True,3779289beac5d75a05e316c1f6bac5e4372eb5050efb56df8055012dd6cea8e4,Tests_passed,5a4668df1a151e1ec4ba95aa17d7c47ea86111da6c8d5793bf62e9cc8ddc6ad0,Tests_passed,True,True,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,f29c7e7600d3cfd21c4feaa944e8e1b2018db220085b9f42f792896467f77d9a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,3e56acd5d12ebe865796c4479671c70462656cb6b06e310133c4179b9bfd1a63,Merge_failed,3e56acd5d12ebe865796c4479671c70462656cb6b06e310133c4179b9bfd1a63,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,9141cfea402f7c8e2213dec22aca0018467769b671f67230ec086103ed0e0644,Merge_failed,df28c98f5d44597d38b47c70001bfe6ea1c0124c4ce2b73d832a0aa5d845aaa6,0.05129241943359375,0.013734817504882812,0.052590370178222656,0.056215763092041016,0.048041343688964844,0.05308055877685547,0.05303001403808594,0.23639893531799316,0.07837367057800293,0.07618832588195801,0.0856931209564209,0.23688006401062012,1.5864169597625732,0.20710206031799316 +9,refs/heads/master,62fb9296e8a8a0c3569630db86f72c4431a59af9,1d5f41e216cbd256148e0b617d4f9497ac1cbe81,cbb8c34c2182cd3c290acedb85cbd79a18da2f71,,True,True,3779289beac5d75a05e316c1f6bac5e4372eb5050efb56df8055012dd6cea8e4,Tests_passed,5a4668df1a151e1ec4ba95aa17d7c47ea86111da6c8d5793bf62e9cc8ddc6ad0,Tests_passed,True,True,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,f29c7e7600d3cfd21c4feaa944e8e1b2018db220085b9f42f792896467f77d9a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,3e56acd5d12ebe865796c4479671c70462656cb6b06e310133c4179b9bfd1a63,Merge_failed,3e56acd5d12ebe865796c4479671c70462656cb6b06e310133c4179b9bfd1a63,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,9141cfea402f7c8e2213dec22aca0018467769b671f67230ec086103ed0e0644,Merge_failed,df28c98f5d44597d38b47c70001bfe6ea1c0124c4ce2b73d832a0aa5d845aaa6,0.05129241943359375,0.013734817504882812,0.052590370178222656,0.056215763092041016,0.048041343688964844,0.05308055877685547,0.05303001403808594,0.23639893531799316,0.07837367057800293,0.08439278602600098,0.07555532455444336,0.23688006401062012,1.5864169597625732,0.20710206031799316 diff --git a/results/combined/merges_timed/httpcache4j/httpcache4j.csv b/results/combined/merges_timed/httpcache4j/httpcache4j.csv index 0aa7ff19ba..6375154d97 100644 --- a/results/combined/merges_timed/httpcache4j/httpcache4j.csv +++ b/results/combined/merges_timed/httpcache4j/httpcache4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -34,refs/heads/master,ccdc581f7f9d3b683b03af7c474160d3a3d1594f,b7a15c040c8b08b14e1f6434a73633c44381118e,24fa341f4fe3d819067b80de67bdf98e8861a8de,,5ae13776c25399f7834d05f4603ad0221a6761b3e66e78b048c64550a3f7500a,Tests_passed,69cd33ab0d1b4602132d7d32d182fa177e41dfcc5940703ab8e76430173aa9ec,Tests_passed,True,True,True,True,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Merge_failed,04fe0fcb669e141c38ee9817a03487f1f04b36411b15496fd371b42e17642cbb,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Merge_failed,ca378df4fa3e7edd8ae13ab563bce3998838600d2f6a8f4e03db5598a8e8f2ba,Merge_failed,ca378df4fa3e7edd8ae13ab563bce3998838600d2f6a8f4e03db5598a8e8f2ba,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,68540763f9004a8f0b82269558d941b609166375f1a1277b97f309e34aec992f,0.01340484619140625,0.014481067657470703,0.015108346939086914,0.01779031753540039,0.014899969100952148,0.014937639236450195,0.015304327011108398,0.043613433837890625,0.020149707794189453,0.08839106559753418,0.08844876289367676,0.07039451599121094,0.8398621082305908,0.20320987701416016 +34,refs/heads/master,ccdc581f7f9d3b683b03af7c474160d3a3d1594f,b7a15c040c8b08b14e1f6434a73633c44381118e,24fa341f4fe3d819067b80de67bdf98e8861a8de,,5ae13776c25399f7834d05f4603ad0221a6761b3e66e78b048c64550a3f7500a,Tests_passed,69cd33ab0d1b4602132d7d32d182fa177e41dfcc5940703ab8e76430173aa9ec,Tests_passed,True,True,True,True,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Merge_failed,04fe0fcb669e141c38ee9817a03487f1f04b36411b15496fd371b42e17642cbb,Merge_failed,9e9ff8f6027e025d1e5318b0ff691013aef28107217662ecd3db0d5ef069063e,Merge_failed,ca378df4fa3e7edd8ae13ab563bce3998838600d2f6a8f4e03db5598a8e8f2ba,Merge_failed,ca378df4fa3e7edd8ae13ab563bce3998838600d2f6a8f4e03db5598a8e8f2ba,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,68540763f9004a8f0b82269558d941b609166375f1a1277b97f309e34aec992f,0.01340484619140625,0.014481067657470703,0.015108346939086914,0.01779031753540039,0.014899969100952148,0.014937639236450195,0.015304327011108398,0.043613433837890625,0.020149707794189453,0.08789992332458496,0.08769488334655762,0.07039451599121094,0.8398621082305908,0.20320987701416016 diff --git a/results/combined/merges_timed/huaban/jieba-analysis.csv b/results/combined/merges_timed/huaban/jieba-analysis.csv index ed20686116..371b63dc3a 100644 --- a/results/combined/merges_timed/huaban/jieba-analysis.csv +++ b/results/combined/merges_timed/huaban/jieba-analysis.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -28,refs/remotes/origin/pull/50,8eeea21716d2ea2563b92c0e3fd901ae715b1ea6,e657cd03e1bccbbd7b71981997e756699fe161b7,092dbedb1fbe0cf2172f8e10707f8b52764bda31,,True,True,168cf6b3515e4d6b88fac756675ea2b6db9ec3b9776ca33ce1a7d9801a6995a6,Tests_passed,0121015a37af6416d93feedc57de2c258686a7b824c850e17b1b5635339dc372,Tests_passed,True,True,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Merge_failed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,0.14224481582641602,0.1409595012664795,0.16299104690551758,0.16120457649230957,0.16520333290100098,0.16181135177612305,0.16455721855163574,0.22496676445007324,0.13991332054138184,0.28481030464172363,0.25211048126220703,0.1977524757385254,0.9871673583984375,0.36475706100463867 +28,refs/remotes/origin/pull/50,8eeea21716d2ea2563b92c0e3fd901ae715b1ea6,e657cd03e1bccbbd7b71981997e756699fe161b7,092dbedb1fbe0cf2172f8e10707f8b52764bda31,,True,True,168cf6b3515e4d6b88fac756675ea2b6db9ec3b9776ca33ce1a7d9801a6995a6,Tests_passed,0121015a37af6416d93feedc57de2c258686a7b824c850e17b1b5635339dc372,Tests_passed,True,True,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Merge_failed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,0.14224481582641602,0.1409595012664795,0.16299104690551758,0.16120457649230957,0.16520333290100098,0.16181135177612305,0.16455721855163574,0.22496676445007324,0.13991332054138184,0.27753210067749023,0.2808265686035156,0.1977524757385254,0.9871673583984375,0.36475706100463867 diff --git a/results/combined/merges_timed/hudec/sql-processor.csv b/results/combined/merges_timed/hudec/sql-processor.csv index 6d0821cdd7..c7ac5b36e1 100644 --- a/results/combined/merges_timed/hudec/sql-processor.csv +++ b/results/combined/merges_timed/hudec/sql-processor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -41,refs/heads/master,e959d1d883ca62621d769bc918107d45c7d62edc,6e987e6a938bebf11be2ef9d5cd80a0b5f1584cc,82513015773e95f8a3345526c8aef447572d34f0,,True,True,6eff6a41305cb9bcd1a5d4ba5d2c7fc7b560c7b17209cd69d6fc3c2ef6a7e77f,Tests_passed,fb129caab03aefb955f65ca7b753eab985204ba65b4077f39b7334c6757b8713,Tests_passed,True,True,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,217661a0536b03c6d6c92df46208ee5b677a04acc261385c06542935217d8db2,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,0ede06e75f8f3b2ede615a126849d75c16c1dd0fdf30df5ce959fd9d4019514c,Merge_failed,0ede06e75f8f3b2ede615a126849d75c16c1dd0fdf30df5ce959fd9d4019514c,Merge_failed,3ce89f8e1b657fb96da654a2e4d476c9ca89caa7eb5e3b1f97d0a510ab162eab,Merge_failed,d9f9018ee2e21bf7755e93bb80467c464bdecbfa1d666aadc5e39b5f3b9b6d29,Merge_failed,64e01dd46198d1d6a7d3a358d6aa29e7605f849dac6badec7ae7171405942340,0.08392119407653809,0.06131577491760254,0.07291841506958008,0.06399846076965332,0.07282400131225586,0.0626986026763916,0.08128499984741211,0.6850197315216064,0.1129922866821289,0.5231301784515381,0.5231461524963379,0.5448276996612549,3.1803741455078125,0.6720530986785889 +41,refs/heads/master,e959d1d883ca62621d769bc918107d45c7d62edc,6e987e6a938bebf11be2ef9d5cd80a0b5f1584cc,82513015773e95f8a3345526c8aef447572d34f0,,True,True,6eff6a41305cb9bcd1a5d4ba5d2c7fc7b560c7b17209cd69d6fc3c2ef6a7e77f,Tests_passed,fb129caab03aefb955f65ca7b753eab985204ba65b4077f39b7334c6757b8713,Tests_passed,True,True,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,217661a0536b03c6d6c92df46208ee5b677a04acc261385c06542935217d8db2,Merge_failed,c6d486a699ffc2f393020d8ea106a0b1ce66959fa072de94cb46517d2ea51bfb,Merge_failed,0ede06e75f8f3b2ede615a126849d75c16c1dd0fdf30df5ce959fd9d4019514c,Merge_failed,0ede06e75f8f3b2ede615a126849d75c16c1dd0fdf30df5ce959fd9d4019514c,Merge_failed,3ce89f8e1b657fb96da654a2e4d476c9ca89caa7eb5e3b1f97d0a510ab162eab,Merge_failed,d9f9018ee2e21bf7755e93bb80467c464bdecbfa1d666aadc5e39b5f3b9b6d29,Merge_failed,64e01dd46198d1d6a7d3a358d6aa29e7605f849dac6badec7ae7171405942340,0.08392119407653809,0.06131577491760254,0.07291841506958008,0.06399846076965332,0.07282400131225586,0.0626986026763916,0.08128499984741211,0.6850197315216064,0.1129922866821289,0.5217635631561279,0.5170323848724365,0.5448276996612549,3.1803741455078125,0.6720530986785889 diff --git a/results/combined/merges_timed/hyphen-ated/djbot.csv b/results/combined/merges_timed/hyphen-ated/djbot.csv index 2f1811894e..a491c12721 100644 --- a/results/combined/merges_timed/hyphen-ated/djbot.csv +++ b/results/combined/merges_timed/hyphen-ated/djbot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,74d4ec8c8eaf131d157dfac6a8e0a84c99720126,6299377a3edaf452b914d61a70d4fdd8afbe3be8,4bb2d7d65ad5f1dfe1e417e0febff7f9e60aa382,,True,True,1eae806f6a437b529d62117e99611b9fb474c2920559ea56600358cc4c3e0c6d,Tests_passed,eab0b398b76132ae4e23ed8864d7abca07f9878addbae12bf779f479796e3aec,Tests_passed,True,True,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,0.04813790321350098,0.0472414493560791,0.043335676193237305,0.03684496879577637,0.04809141159057617,0.048982858657836914,0.04153156280517578,0.1705930233001709,0.04609060287475586,0.17510461807250977,0.1741783618927002,0.11888480186462402,1.7263095378875732,0.17823219299316406 +3,refs/heads/master,74d4ec8c8eaf131d157dfac6a8e0a84c99720126,6299377a3edaf452b914d61a70d4fdd8afbe3be8,4bb2d7d65ad5f1dfe1e417e0febff7f9e60aa382,,True,True,1eae806f6a437b529d62117e99611b9fb474c2920559ea56600358cc4c3e0c6d,Tests_passed,eab0b398b76132ae4e23ed8864d7abca07f9878addbae12bf779f479796e3aec,Tests_passed,True,True,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,0.04813790321350098,0.0472414493560791,0.043335676193237305,0.03684496879577637,0.04809141159057617,0.048982858657836914,0.04153156280517578,0.1705930233001709,0.04609060287475586,0.17316222190856934,0.17358088493347168,0.11888480186462402,1.7263095378875732,0.17823219299316406 diff --git a/results/combined/merges_timed/icoloma/tldgen.csv b/results/combined/merges_timed/icoloma/tldgen.csv index 7b6c94d4cf..686ffbf077 100644 --- a/results/combined/merges_timed/icoloma/tldgen.csv +++ b/results/combined/merges_timed/icoloma/tldgen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,a124b6e2241bd4840a91df9a382fb8f702e76464,26e62ee81320302d85a92e2c112f3826fc25d604,001adfadb665abf8ae379febb1e494121b1d8827,,59430136df62d87fddcdc0cd26200995a0f66e6b465fe03dca0461a5943ff288,Tests_passed,8d35eb54f2445ef698bc6fdd7955b9da2a9cdde8e6777c8faf59a49f54499079,Tests_passed,True,True,True,True,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,4bc1272e39de57b0eae6eb60eac005386985f84603b9eadd30e9d90c794bc00b,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,9d96deefb8d10245643bc4836955f696e504416024e36608bea22e95c41dd25f,Merge_failed,9d96deefb8d10245643bc4836955f696e504416024e36608bea22e95c41dd25f,Merge_failed,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,70a63b5747472c1cef0816425fe81dd6ab2caeb04cd3d24dd185d80bff1080cd,0.03592252731323242,0.04003334045410156,0.045203447341918945,0.03929448127746582,0.0391545295715332,0.04344630241394043,0.04012918472290039,0.2759730815887451,0.07584428787231445,0.21379590034484863,0.21320557594299316,0.2071821689605713,1.329519271850586,0.21909403800964355 +3,refs/heads/master,a124b6e2241bd4840a91df9a382fb8f702e76464,26e62ee81320302d85a92e2c112f3826fc25d604,001adfadb665abf8ae379febb1e494121b1d8827,,59430136df62d87fddcdc0cd26200995a0f66e6b465fe03dca0461a5943ff288,Tests_passed,8d35eb54f2445ef698bc6fdd7955b9da2a9cdde8e6777c8faf59a49f54499079,Tests_passed,True,True,True,True,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,4bc1272e39de57b0eae6eb60eac005386985f84603b9eadd30e9d90c794bc00b,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,9d96deefb8d10245643bc4836955f696e504416024e36608bea22e95c41dd25f,Merge_failed,9d96deefb8d10245643bc4836955f696e504416024e36608bea22e95c41dd25f,Merge_failed,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,70a63b5747472c1cef0816425fe81dd6ab2caeb04cd3d24dd185d80bff1080cd,0.03592252731323242,0.04003334045410156,0.045203447341918945,0.03929448127746582,0.0391545295715332,0.04344630241394043,0.04012918472290039,0.2759730815887451,0.07584428787231445,0.2034597396850586,0.20366406440734863,0.2071821689605713,1.329519271850586,0.21909403800964355 diff --git a/results/combined/merges_timed/idpf/epubcheck.csv b/results/combined/merges_timed/idpf/epubcheck.csv index 70880beed6..d1f51760b0 100644 --- a/results/combined/merges_timed/idpf/epubcheck.csv +++ b/results/combined/merges_timed/idpf/epubcheck.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/main,23cee7b1b22510f633b006d5540c3a4198a3ccd7,c133d33a71a6e5aee8bcf8684deedc5655459fc5,d1cba214aba957b44052af0f509a98e3e0761ff8,,True,True,ae183d6ed5e5871e2441380a2991000c10fd195c5184eca890b83262d3448d5f,Tests_passed,4c9c65fa36d11b98e66e3b4eb8c471e4723310f787eae4e3877cec4ca4371c60,Tests_passed,True,True,Merge_failed,2945bc317d1779b35209e6d44d731c2bc6467c8b23ad702ba9a86d4788247dc6,Merge_failed,fee8718c04fd84967bf884b02dae8444d67a41bcde8ffad93cfef3168fe1a123,Merge_failed,a861ee16df0480f5833118589ae43660c55209a08bf1731d06c392631b3672fa,Merge_failed,2b15ecfc59e077718e74d2e7d4253a454753b1b1c0265f1c191905d2a1b92e4e,Merge_failed,389568bd65113bab7949a51c81a66dae4abf2dbb2022aa41b549e4f434942e48,Merge_failed,389568bd65113bab7949a51c81a66dae4abf2dbb2022aa41b549e4f434942e48,Merge_failed,f9b8951af59bc25e4db1ce28640e43c85ecba07481c8b9b470485b37b4eaf310,Merge_failed,32c751d0ab7a767fd00ee3fef9a3e20e4d754d9a464b25a06abf855448fb982e,Merge_failed,2945bc317d1779b35209e6d44d731c2bc6467c8b23ad702ba9a86d4788247dc6,Merge_failed,6e8493e9a2f2f998d1be99fbac6cb4295cd7373da69dbab264982e79cc31f1ab,Merge_failed,6e8493e9a2f2f998d1be99fbac6cb4295cd7373da69dbab264982e79cc31f1ab,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,0.10576915740966797,0.10564422607421875,0.1366748809814453,0.13975286483764648,0.13801240921020508,0.13880634307861328,0.1388232707977295,0.8246855735778809,0.17361783981323242,0.9103546142578125,0.9090831279754639,0.9045107364654541,0.12281370162963867,1.0538280010223389 +3,refs/heads/main,23cee7b1b22510f633b006d5540c3a4198a3ccd7,c133d33a71a6e5aee8bcf8684deedc5655459fc5,d1cba214aba957b44052af0f509a98e3e0761ff8,,True,True,ae183d6ed5e5871e2441380a2991000c10fd195c5184eca890b83262d3448d5f,Tests_passed,4c9c65fa36d11b98e66e3b4eb8c471e4723310f787eae4e3877cec4ca4371c60,Tests_passed,True,True,Merge_failed,2945bc317d1779b35209e6d44d731c2bc6467c8b23ad702ba9a86d4788247dc6,Merge_failed,fee8718c04fd84967bf884b02dae8444d67a41bcde8ffad93cfef3168fe1a123,Merge_failed,a861ee16df0480f5833118589ae43660c55209a08bf1731d06c392631b3672fa,Merge_failed,2b15ecfc59e077718e74d2e7d4253a454753b1b1c0265f1c191905d2a1b92e4e,Merge_failed,389568bd65113bab7949a51c81a66dae4abf2dbb2022aa41b549e4f434942e48,Merge_failed,389568bd65113bab7949a51c81a66dae4abf2dbb2022aa41b549e4f434942e48,Merge_failed,f9b8951af59bc25e4db1ce28640e43c85ecba07481c8b9b470485b37b4eaf310,Merge_failed,32c751d0ab7a767fd00ee3fef9a3e20e4d754d9a464b25a06abf855448fb982e,Merge_failed,2945bc317d1779b35209e6d44d731c2bc6467c8b23ad702ba9a86d4788247dc6,Merge_failed,6e8493e9a2f2f998d1be99fbac6cb4295cd7373da69dbab264982e79cc31f1ab,Merge_failed,6e8493e9a2f2f998d1be99fbac6cb4295cd7373da69dbab264982e79cc31f1ab,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,0.10576915740966797,0.10564422607421875,0.1366748809814453,0.13975286483764648,0.13801240921020508,0.13880634307861328,0.1388232707977295,0.8246855735778809,0.17361783981323242,0.9068553447723389,0.9027156829833984,0.9045107364654541,0.12281370162963867,1.0538280010223389 diff --git a/results/combined/merges_timed/idris-hackers/idris-java-rts.csv b/results/combined/merges_timed/idris-hackers/idris-java-rts.csv index c12a429d7f..c99629a6dd 100644 --- a/results/combined/merges_timed/idris-hackers/idris-java-rts.csv +++ b/results/combined/merges_timed/idris-hackers/idris-java-rts.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,c35f926f298bc670fa197ec7aee03aa74a1a3e13,b500f781a3204060f80fbc613b7e6669e3bca1c0,c4a734fa57af809cf249b389bbadbeeac2c32246,,e0333570c8cd9ed805a94d3ecf0e08e411091df9c86e06fbaecb0d5f3e5637d2,Tests_passed,5aa12b1d82b44e7b43fc31a74c4f9d9628a26c650173972caaff8f7700a8437e,Tests_passed,True,True,True,True,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,11fe17777e47a20eb429f5bb24f6ca92115afc94b84e605520d666dc18353dc8,Merge_failed,9d45e51eb47d71f11afc9a8dcddddcb4717bea558f60ad59c86e5727284a74db,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,24b9a83b7208d1156fa44df86b6165c6f3ae74ebe5d7311dc3c682cdc02a0cd0,Merge_failed,24b9a83b7208d1156fa44df86b6165c6f3ae74ebe5d7311dc3c682cdc02a0cd0,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Merge_failed,1f5b651630d97b039ee050c77f89da0b1016fa161dac7d847effff03c2816f83,0.04097628593444824,0.042078256607055664,0.010428190231323242,0.03914690017700195,0.03910565376281738,0.04004240036010742,0.03969454765319824,0.15774011611938477,0.06262993812561035,0.08079719543457031,0.07999348640441895,0.18218755722045898,1.9066519737243652,0.1751086711883545 +3,refs/heads/master,c35f926f298bc670fa197ec7aee03aa74a1a3e13,b500f781a3204060f80fbc613b7e6669e3bca1c0,c4a734fa57af809cf249b389bbadbeeac2c32246,,e0333570c8cd9ed805a94d3ecf0e08e411091df9c86e06fbaecb0d5f3e5637d2,Tests_passed,5aa12b1d82b44e7b43fc31a74c4f9d9628a26c650173972caaff8f7700a8437e,Tests_passed,True,True,True,True,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,11fe17777e47a20eb429f5bb24f6ca92115afc94b84e605520d666dc18353dc8,Merge_failed,9d45e51eb47d71f11afc9a8dcddddcb4717bea558f60ad59c86e5727284a74db,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,24b9a83b7208d1156fa44df86b6165c6f3ae74ebe5d7311dc3c682cdc02a0cd0,Merge_failed,24b9a83b7208d1156fa44df86b6165c6f3ae74ebe5d7311dc3c682cdc02a0cd0,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Merge_failed,1f5b651630d97b039ee050c77f89da0b1016fa161dac7d847effff03c2816f83,0.04097628593444824,0.042078256607055664,0.010428190231323242,0.03914690017700195,0.03910565376281738,0.04004240036010742,0.03969454765319824,0.15774011611938477,0.06262993812561035,0.07954525947570801,0.08056163787841797,0.18218755722045898,1.9066519737243652,0.1751086711883545 diff --git a/results/combined/merges_timed/igniterealtime/tinder.csv b/results/combined/merges_timed/igniterealtime/tinder.csv index 6761764fe7..c828d6675f 100644 --- a/results/combined/merges_timed/igniterealtime/tinder.csv +++ b/results/combined/merges_timed/igniterealtime/tinder.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,c99be3f06ec9c816c3416f2c1963d6b19cc412c9,d43b195d7ac6ed93cfc73635732a3fa3f26d42e8,4462390ee85eea8ea93c15a95d0c8c45b2f49dd1,,True,True,ae53a361c29ad082499147f51e47428fec3f4a5955a80e14d90876e705dcbdb1,Tests_passed,8d30990c278e62e26bf457b5b92c672a770a76a427b395340783f5140c47b04e,Tests_passed,True,True,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,66eb5309c880cbd5bd9b2868574e863b50880617d854c893d193faa1877b086b,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,66eb5309c880cbd5bd9b2868574e863b50880617d854c893d193faa1877b086b,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,2819a2e403f2f5b3495b3b867e64f34c1743a4b6853ec0ccb0e4fa6274fb3af5,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,821bd99913add932888c1fb46047aa4572833564e61480828e8d60fddb233649,Merge_failed,821bd99913add932888c1fb46047aa4572833564e61480828e8d60fddb233649,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,b1c783e3d8f6a0f39e78b4d25b75b87532740760689cbdf1dac26248f2162458,0.043617963790893555,0.04713320732116699,0.03661394119262695,0.04151272773742676,0.04891824722290039,0.01510763168334961,0.04787945747375488,0.1809542179107666,0.0743875503540039,0.4186978340148926,0.4106593132019043,0.12101268768310547,1.1847667694091797,0.2333357334136963 +5,refs/heads/master,c99be3f06ec9c816c3416f2c1963d6b19cc412c9,d43b195d7ac6ed93cfc73635732a3fa3f26d42e8,4462390ee85eea8ea93c15a95d0c8c45b2f49dd1,,True,True,ae53a361c29ad082499147f51e47428fec3f4a5955a80e14d90876e705dcbdb1,Tests_passed,8d30990c278e62e26bf457b5b92c672a770a76a427b395340783f5140c47b04e,Tests_passed,True,True,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,66eb5309c880cbd5bd9b2868574e863b50880617d854c893d193faa1877b086b,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,66eb5309c880cbd5bd9b2868574e863b50880617d854c893d193faa1877b086b,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,2819a2e403f2f5b3495b3b867e64f34c1743a4b6853ec0ccb0e4fa6274fb3af5,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,821bd99913add932888c1fb46047aa4572833564e61480828e8d60fddb233649,Merge_failed,821bd99913add932888c1fb46047aa4572833564e61480828e8d60fddb233649,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,b1c783e3d8f6a0f39e78b4d25b75b87532740760689cbdf1dac26248f2162458,0.043617963790893555,0.04713320732116699,0.03661394119262695,0.04151272773742676,0.04891824722290039,0.01510763168334961,0.04787945747375488,0.1809542179107666,0.0743875503540039,0.3946080207824707,0.41791367530822754,0.12101268768310547,1.1847667694091797,0.2333357334136963 diff --git a/results/combined/merges_timed/ignorance77/transformiceapi.csv b/results/combined/merges_timed/ignorance77/transformiceapi.csv index 9a7999775e..d83362db02 100644 --- a/results/combined/merges_timed/ignorance77/transformiceapi.csv +++ b/results/combined/merges_timed/ignorance77/transformiceapi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,07df219c63851a01a3ee6040ca0811d109544375,cd82b7006cc9fd7e7a1d1444575abf56683ac3c5,93d4346a4e4e0421081c5649f6d49f5fe1648464,,True,True,f63d55ea93748022f84067fd5a65dc9e8119ffc876cdb5fb179eb4da9b834356,Tests_passed,467209e6fb7fb6c7eda2ed67d93054bdf6226a61d70ca41657752d8ca2ab77a2,Tests_passed,True,True,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,0.04630923271179199,0.03925466537475586,0.042794227600097656,0.04417896270751953,0.03906536102294922,0.041838645935058594,0.03956198692321777,0.17013835906982422,0.045671701431274414,0.15917181968688965,0.15877008438110352,0.11568880081176758,0.656104326248169,0.1923372745513916 +13,refs/heads/master,07df219c63851a01a3ee6040ca0811d109544375,cd82b7006cc9fd7e7a1d1444575abf56683ac3c5,93d4346a4e4e0421081c5649f6d49f5fe1648464,,True,True,f63d55ea93748022f84067fd5a65dc9e8119ffc876cdb5fb179eb4da9b834356,Tests_passed,467209e6fb7fb6c7eda2ed67d93054bdf6226a61d70ca41657752d8ca2ab77a2,Tests_passed,True,True,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,0.04630923271179199,0.03925466537475586,0.042794227600097656,0.04417896270751953,0.03906536102294922,0.041838645935058594,0.03956198692321777,0.17013835906982422,0.045671701431274414,0.1563246250152588,0.15625452995300293,0.11568880081176758,0.656104326248169,0.1923372745513916 diff --git a/results/combined/merges_timed/iipc/webarchive-commons.csv b/results/combined/merges_timed/iipc/webarchive-commons.csv index 718e050bdb..f91bd38591 100644 --- a/results/combined/merges_timed/iipc/webarchive-commons.csv +++ b/results/combined/merges_timed/iipc/webarchive-commons.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -70,refs/remotes/origin/2.0.0-DEV,6b33f9b79f1d3a913ca5e1952149a72ab1104a43,3ba7b47bd90a81ce0b0d4c5ba638c8a3d1d7d4f4,604f05959596128785028863dc72ffc7ccde6536,,True,True,a5d15cb5190e6d3a49e6646185430fad8df619fff0fe535099725c4b939c4ff8,Tests_passed,55a24d0e9afdc5e68707f30e56d5a5602a7a32085ad6785988f836071e8c74c4,Tests_passed,True,True,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,0.059456586837768555,0.04550886154174805,0.07052230834960938,0.062201738357543945,0.047484397888183594,0.058524370193481445,0.04426097869873047,0.2897777557373047,0.05588531494140625,0.45905041694641113,0.4697742462158203,0.23236751556396484,2.0303752422332764,0.2874312400817871 +70,refs/remotes/origin/2.0.0-DEV,6b33f9b79f1d3a913ca5e1952149a72ab1104a43,3ba7b47bd90a81ce0b0d4c5ba638c8a3d1d7d4f4,604f05959596128785028863dc72ffc7ccde6536,,True,True,a5d15cb5190e6d3a49e6646185430fad8df619fff0fe535099725c4b939c4ff8,Tests_passed,55a24d0e9afdc5e68707f30e56d5a5602a7a32085ad6785988f836071e8c74c4,Tests_passed,True,True,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,0.059456586837768555,0.04550886154174805,0.07052230834960938,0.062201738357543945,0.047484397888183594,0.058524370193481445,0.04426097869873047,0.2897777557373047,0.05588531494140625,0.4636247158050537,0.460979700088501,0.23236751556396484,2.0303752422332764,0.2874312400817871 diff --git a/results/combined/merges_timed/imagej/imagej-ops.csv b/results/combined/merges_timed/imagej/imagej-ops.csv index c948da6384..43414b59fa 100644 --- a/results/combined/merges_timed/imagej/imagej-ops.csv +++ b/results/combined/merges_timed/imagej/imagej-ops.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,4a3b273c23ad343d026a0e4770cb755b81032f9d,eccaa9a1b5b85e931114872a1a0d47e81da9fbba,a2b49e2a77f37952520ea214fa21efa7838461b5,,True,True,14cd3527a14f07111d833f4af1ac2192e2fe687280208f351b6e5497a6d01250,Tests_passed,bcca8620da4b5b3caba604ee11f285b3ea9cfe6e936111410168f268da1d2b1a,Tests_passed,True,True,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,0.05912613868713379,0.06000947952270508,0.08201742172241211,0.08396387100219727,0.08181929588317871,0.08155989646911621,0.08225727081298828,0.14520978927612305,0.05890226364135742,0.2429955005645752,0.24419522285461426,0.1675703525543213,1.5364396572113037,1.9552993774414062 +3,refs/heads/master,4a3b273c23ad343d026a0e4770cb755b81032f9d,eccaa9a1b5b85e931114872a1a0d47e81da9fbba,a2b49e2a77f37952520ea214fa21efa7838461b5,,True,True,14cd3527a14f07111d833f4af1ac2192e2fe687280208f351b6e5497a6d01250,Tests_passed,bcca8620da4b5b3caba604ee11f285b3ea9cfe6e936111410168f268da1d2b1a,Tests_passed,True,True,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,0.05912613868713379,0.06000947952270508,0.08201742172241211,0.08396387100219727,0.08181929588317871,0.08155989646911621,0.08225727081298828,0.14520978927612305,0.05890226364135742,0.24206972122192383,0.24037909507751465,0.1675703525543213,1.5364396572113037,1.9552993774414062 diff --git a/results/combined/merges_timed/imglib/imglib2.csv b/results/combined/merges_timed/imglib/imglib2.csv index f851b43a52..69ebbf98a7 100644 --- a/results/combined/merges_timed/imglib/imglib2.csv +++ b/results/combined/merges_timed/imglib/imglib2.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -96,refs/heads/master,e9d10e6d0675c448d1b13f0af39f92bf384fb455,4d25ecee827a42416821dd3e3e14159ba2de4653,b78e84541f5efaee6c249670f15f4c4cb819a7ba,,def684d8490fff814658fe44d22a0f557383fd9ea3de7a4c00757e7566d54214,Tests_passed,621b8effb3dbb1340c9bd9a023aa4e979b272b16c4e52335914fe0118744544a,Tests_passed,True,True,True,True,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,da9ce9bce8e3d0c41d6d56bcecc87336d29aa4d9964fcaba7301f6d426c6fd64,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,0.04379534721374512,0.038384199142456055,0.059427738189697266,0.06285762786865234,0.05996251106262207,0.06057858467102051,0.05639338493347168,0.21898436546325684,0.058103322982788086,0.34027576446533203,0.3445467948913574,0.15988683700561523,1.2166314125061035,0.881188154220581 +96,refs/heads/master,e9d10e6d0675c448d1b13f0af39f92bf384fb455,4d25ecee827a42416821dd3e3e14159ba2de4653,b78e84541f5efaee6c249670f15f4c4cb819a7ba,,def684d8490fff814658fe44d22a0f557383fd9ea3de7a4c00757e7566d54214,Tests_passed,621b8effb3dbb1340c9bd9a023aa4e979b272b16c4e52335914fe0118744544a,Tests_passed,True,True,True,True,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,da9ce9bce8e3d0c41d6d56bcecc87336d29aa4d9964fcaba7301f6d426c6fd64,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,0.04379534721374512,0.038384199142456055,0.059427738189697266,0.06285762786865234,0.05996251106262207,0.06057858467102051,0.05639338493347168,0.21898436546325684,0.058103322982788086,0.34717440605163574,0.33869123458862305,0.15988683700561523,1.2166314125061035,0.881188154220581 diff --git a/results/combined/merges_timed/imixs/imixs-workflow.csv b/results/combined/merges_timed/imixs/imixs-workflow.csv index 8fb2caaefd..9664629dd4 100644 --- a/results/combined/merges_timed/imixs/imixs-workflow.csv +++ b/results/combined/merges_timed/imixs/imixs-workflow.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/master,f14cc658356312ecdf6111e1745d7d29957f7194,9e4f88bb06fb937ffd51c8875bbaaf364d404ec4,b8df0eb1ac52af8caaa7d7f66d41dcf8b4177842,,f114f281f48c0e044aaa244913c577eb07adf43cec9af32afe25da9428d6a67b,Tests_passed,4a8d02e85a4996768d0dfd70046d40ad7f95401580585cbab221525697b202ad,Tests_passed,True,True,True,True,Merge_failed,930062749019fced417819bc2110b33b24c954baa7bc974fb5f83a3316c360ba,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,930062749019fced417819bc2110b33b24c954baa7bc974fb5f83a3316c360ba,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,1c7907b7b3c3316242afff758ef37c1a1fe2d18a1008feda8be71100987f5445,Merge_failed,1c7907b7b3c3316242afff758ef37c1a1fe2d18a1008feda8be71100987f5445,Merge_failed,930062749019fced417819bc2110b33b24c954baa7bc974fb5f83a3316c360ba,Merge_failed,64402a4fe79de2e917cd42f1a52a4ef8c7c7756bc258e5bf75efe54c962bd584,Merge_failed,930062749019fced417819bc2110b33b24c954baa7bc974fb5f83a3316c360ba,Merge_failed,eb85081462e6f5ccb44ff6da4ab75338cbce2fdc660879bafb1afdba60e67e04,Merge_failed,eb85081462e6f5ccb44ff6da4ab75338cbce2fdc660879bafb1afdba60e67e04,Merge_failed,d6f0d082add4f40b38d44b7a928085a734291cc14ffd8d13ddd136b85fc10c65,Merge_failed,67aa636600a8f92a74746a8f7d94400f65ac450a3a1c39305631604db47a9306,Merge_failed,711d17e31bd3da7672457ed7af58a010d19a927862a238068ddddcae67e76bd6,0.07269597053527832,0.05832242965698242,0.056973934173583984,0.06624484062194824,0.06996822357177734,0.056822776794433594,0.07461667060852051,1.0158157348632812,0.127349853515625,0.9714202880859375,0.9707064628601074,0.8047230243682861,5.574890851974487,0.699028491973877 +26,refs/heads/master,f14cc658356312ecdf6111e1745d7d29957f7194,9e4f88bb06fb937ffd51c8875bbaaf364d404ec4,b8df0eb1ac52af8caaa7d7f66d41dcf8b4177842,,f114f281f48c0e044aaa244913c577eb07adf43cec9af32afe25da9428d6a67b,Tests_passed,4a8d02e85a4996768d0dfd70046d40ad7f95401580585cbab221525697b202ad,Tests_passed,True,True,True,True,Merge_failed,930062749019fced417819bc2110b33b24c954baa7bc974fb5f83a3316c360ba,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,930062749019fced417819bc2110b33b24c954baa7bc974fb5f83a3316c360ba,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,1c7907b7b3c3316242afff758ef37c1a1fe2d18a1008feda8be71100987f5445,Merge_failed,1c7907b7b3c3316242afff758ef37c1a1fe2d18a1008feda8be71100987f5445,Merge_failed,930062749019fced417819bc2110b33b24c954baa7bc974fb5f83a3316c360ba,Merge_failed,64402a4fe79de2e917cd42f1a52a4ef8c7c7756bc258e5bf75efe54c962bd584,Merge_failed,930062749019fced417819bc2110b33b24c954baa7bc974fb5f83a3316c360ba,Merge_failed,eb85081462e6f5ccb44ff6da4ab75338cbce2fdc660879bafb1afdba60e67e04,Merge_failed,eb85081462e6f5ccb44ff6da4ab75338cbce2fdc660879bafb1afdba60e67e04,Merge_failed,d6f0d082add4f40b38d44b7a928085a734291cc14ffd8d13ddd136b85fc10c65,Merge_failed,67aa636600a8f92a74746a8f7d94400f65ac450a3a1c39305631604db47a9306,Merge_failed,711d17e31bd3da7672457ed7af58a010d19a927862a238068ddddcae67e76bd6,0.07269597053527832,0.05832242965698242,0.056973934173583984,0.06624484062194824,0.06996822357177734,0.056822776794433594,0.07461667060852051,1.0158157348632812,0.127349853515625,0.9644069671630859,1.0108513832092285,0.8047230243682861,5.574890851974487,0.699028491973877 diff --git a/results/combined/merges_timed/immobilienscout24/deadcode4j.csv b/results/combined/merges_timed/immobilienscout24/deadcode4j.csv index 0c1c1159ad..b5bf263035 100644 --- a/results/combined/merges_timed/immobilienscout24/deadcode4j.csv +++ b/results/combined/merges_timed/immobilienscout24/deadcode4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -42,refs/heads/master,69518ebbfef40f661ff6ab30ea9ab758a81509c7,89708cc1c36090ba0d00f3f073d2cdf5f6704802,78d4b2bcfb7031e780bb8c612fa46916a19f02f3,,True,True,3422aa2dce2dc2dd452361fac258e530461f98c09c7a85d1a75c9206c224c04e,Tests_passed,201d90b62862cfbbd85d5a9d194e0348ff2680348c36013e6306c91763511d29,Tests_passed,True,True,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,465a5fd2c5d575e6467326bc2ad95b349a203237a3c3e9bdb51e31e97aa869d0,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,96f9152585277aeef4f30ab7b8d91eb0a3fcf3c91d470209c18a94b52507037e,Merge_failed,96f9152585277aeef4f30ab7b8d91eb0a3fcf3c91d470209c18a94b52507037e,Merge_failed,4473d1ae40d09079002cc923fa2a5f51b933186807aadb3dfb471bbb4c64e4e8,Merge_failed,12321cc8f950d9e0c5290a2b552293f2dc4a82627abdea249c9fa5c68f38d90c,Merge_failed,a4afb5dceea3293aae7a90d0a3cc2d96568b0c1c46ad99f572cf77c26e1f9b2c,0.04839801788330078,0.042359352111816406,0.04795646667480469,0.05125737190246582,0.046495914459228516,0.046027183532714844,0.0283968448638916,0.37354063987731934,0.12831497192382812,0.3563542366027832,0.3569600582122803,0.3595693111419678,2.8075954914093018,0.24478602409362793 +42,refs/heads/master,69518ebbfef40f661ff6ab30ea9ab758a81509c7,89708cc1c36090ba0d00f3f073d2cdf5f6704802,78d4b2bcfb7031e780bb8c612fa46916a19f02f3,,True,True,3422aa2dce2dc2dd452361fac258e530461f98c09c7a85d1a75c9206c224c04e,Tests_passed,201d90b62862cfbbd85d5a9d194e0348ff2680348c36013e6306c91763511d29,Tests_passed,True,True,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,465a5fd2c5d575e6467326bc2ad95b349a203237a3c3e9bdb51e31e97aa869d0,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,96f9152585277aeef4f30ab7b8d91eb0a3fcf3c91d470209c18a94b52507037e,Merge_failed,96f9152585277aeef4f30ab7b8d91eb0a3fcf3c91d470209c18a94b52507037e,Merge_failed,4473d1ae40d09079002cc923fa2a5f51b933186807aadb3dfb471bbb4c64e4e8,Merge_failed,12321cc8f950d9e0c5290a2b552293f2dc4a82627abdea249c9fa5c68f38d90c,Merge_failed,a4afb5dceea3293aae7a90d0a3cc2d96568b0c1c46ad99f572cf77c26e1f9b2c,0.04839801788330078,0.042359352111816406,0.04795646667480469,0.05125737190246582,0.046495914459228516,0.046027183532714844,0.0283968448638916,0.37354063987731934,0.12831497192382812,0.3659675121307373,0.3657233715057373,0.3595693111419678,2.8075954914093018,0.24478602409362793 diff --git a/results/combined/merges_timed/in-the-keyhole/khs-spring-batch-report-writer.csv b/results/combined/merges_timed/in-the-keyhole/khs-spring-batch-report-writer.csv index 7acd73db07..6b5e9abd48 100644 --- a/results/combined/merges_timed/in-the-keyhole/khs-spring-batch-report-writer.csv +++ b/results/combined/merges_timed/in-the-keyhole/khs-spring-batch-report-writer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,93520a37d008510ab7d8b0c2f7c904c526c02296,6097377d96d0bbe4d8bcadf767d366c50c641ee3,bf21478ae52b4c81eca759aeadd89324986aa1a6,,b6909260bf934db2d5aef36578b0fe3a78a6be02c57952f8a942d48c4f8a1f63,Tests_passed,35406290825cfe22742a72e9487d1fd4a4a52d1c4a037864df6b6ecbfedaa9fb,Tests_passed,True,True,True,True,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,5aeb885ec033f26f1c5d862555309034aa6220d9c727608315a04a85ccec11c7,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,af497aa97c2b1cd445b488f8fbce2c7cea0c562750dccbf0ef248a19e175e80b,Merge_failed,af497aa97c2b1cd445b488f8fbce2c7cea0c562750dccbf0ef248a19e175e80b,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,c48b9fa611a372870dcc944d5f50b9278c395fa5c4a2c9f0850c30b4ef0fd382,0.008878231048583984,0.009877204895019531,0.008891105651855469,0.010205984115600586,0.008838415145874023,0.009113311767578125,0.009033918380737305,0.03432512283325195,0.014039278030395508,0.07024002075195312,0.07163262367248535,0.06674766540527344,0.43909597396850586,0.1641697883605957 +3,refs/heads/master,93520a37d008510ab7d8b0c2f7c904c526c02296,6097377d96d0bbe4d8bcadf767d366c50c641ee3,bf21478ae52b4c81eca759aeadd89324986aa1a6,,b6909260bf934db2d5aef36578b0fe3a78a6be02c57952f8a942d48c4f8a1f63,Tests_passed,35406290825cfe22742a72e9487d1fd4a4a52d1c4a037864df6b6ecbfedaa9fb,Tests_passed,True,True,True,True,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,5aeb885ec033f26f1c5d862555309034aa6220d9c727608315a04a85ccec11c7,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,af497aa97c2b1cd445b488f8fbce2c7cea0c562750dccbf0ef248a19e175e80b,Merge_failed,af497aa97c2b1cd445b488f8fbce2c7cea0c562750dccbf0ef248a19e175e80b,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,c48b9fa611a372870dcc944d5f50b9278c395fa5c4a2c9f0850c30b4ef0fd382,0.008878231048583984,0.009877204895019531,0.008891105651855469,0.010205984115600586,0.008838415145874023,0.009113311767578125,0.009033918380737305,0.03432512283325195,0.014039278030395508,0.06718730926513672,0.06862950325012207,0.06674766540527344,0.43909597396850586,0.1641697883605957 diff --git a/results/combined/merges_timed/inaiat/jqplot4java.csv b/results/combined/merges_timed/inaiat/jqplot4java.csv index 942668db7d..040dc9e355 100644 --- a/results/combined/merges_timed/inaiat/jqplot4java.csv +++ b/results/combined/merges_timed/inaiat/jqplot4java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,6239c0dc07dc0d45ccf92b81ad4ba91d70137136,acee7209f0ba8e8ff196132182a77c7b620d8bb1,b7033b00afeca37605535cc7495bf9f6b112e5cc,,3338119461b87ef064f62bd8e152002ba2a6f4093b8628973c67ad671e23bd58,Tests_passed,4889f248db533de82d6259abffd91a3da155dd7e5b7c2886f2c7812a6a83de69,Tests_passed,True,True,True,True,Merge_failed,2ebdf5f81bc0225789bb79e23f210a3b8addadc7f7b19b74365902dc5fe69121,Merge_failed,34690ec3ae5a70c86974f9c07dc42d9a0199f8ed07fab25ae8ffdb8795fbf451,Merge_failed,2ebdf5f81bc0225789bb79e23f210a3b8addadc7f7b19b74365902dc5fe69121,Merge_failed,34690ec3ae5a70c86974f9c07dc42d9a0199f8ed07fab25ae8ffdb8795fbf451,Merge_failed,188003703ecc92c74791d02c79537631fe746bc3710979fc23de7b00265f0f2c,Merge_failed,188003703ecc92c74791d02c79537631fe746bc3710979fc23de7b00265f0f2c,Merge_failed,40932ba3f5ba72667bb9d861322e1bc2c8f7dd83c8ff93ca9444fc1fef93c7a7,Merge_failed,4550d1b97ef04ae9ed5e1eb00382418e8b86d2b9fb410397e254e26a22286b1f,Merge_failed,2ebdf5f81bc0225789bb79e23f210a3b8addadc7f7b19b74365902dc5fe69121,Merge_failed,2401671634d509c9db082e59d2b1866967fce7b586e975f8a5b1d7146929b7dc,Merge_failed,2401671634d509c9db082e59d2b1866967fce7b586e975f8a5b1d7146929b7dc,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,d1e0dc2ec2ff6666897819f35f8b941bd961e4fdad58a578b0104c234c3b9ae4,0.010399818420410156,0.010516643524169922,0.011085748672485352,0.010303020477294922,0.010526418685913086,0.010440826416015625,0.010524988174438477,0.0598602294921875,0.01962876319885254,0.30706214904785156,0.30391573905944824,0.20551323890686035,1.68141508102417,0.18848419189453125 +13,refs/heads/master,6239c0dc07dc0d45ccf92b81ad4ba91d70137136,acee7209f0ba8e8ff196132182a77c7b620d8bb1,b7033b00afeca37605535cc7495bf9f6b112e5cc,,3338119461b87ef064f62bd8e152002ba2a6f4093b8628973c67ad671e23bd58,Tests_passed,4889f248db533de82d6259abffd91a3da155dd7e5b7c2886f2c7812a6a83de69,Tests_passed,True,True,True,True,Merge_failed,2ebdf5f81bc0225789bb79e23f210a3b8addadc7f7b19b74365902dc5fe69121,Merge_failed,34690ec3ae5a70c86974f9c07dc42d9a0199f8ed07fab25ae8ffdb8795fbf451,Merge_failed,2ebdf5f81bc0225789bb79e23f210a3b8addadc7f7b19b74365902dc5fe69121,Merge_failed,34690ec3ae5a70c86974f9c07dc42d9a0199f8ed07fab25ae8ffdb8795fbf451,Merge_failed,188003703ecc92c74791d02c79537631fe746bc3710979fc23de7b00265f0f2c,Merge_failed,188003703ecc92c74791d02c79537631fe746bc3710979fc23de7b00265f0f2c,Merge_failed,40932ba3f5ba72667bb9d861322e1bc2c8f7dd83c8ff93ca9444fc1fef93c7a7,Merge_failed,4550d1b97ef04ae9ed5e1eb00382418e8b86d2b9fb410397e254e26a22286b1f,Merge_failed,2ebdf5f81bc0225789bb79e23f210a3b8addadc7f7b19b74365902dc5fe69121,Merge_failed,2401671634d509c9db082e59d2b1866967fce7b586e975f8a5b1d7146929b7dc,Merge_failed,2401671634d509c9db082e59d2b1866967fce7b586e975f8a5b1d7146929b7dc,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,d1e0dc2ec2ff6666897819f35f8b941bd961e4fdad58a578b0104c234c3b9ae4,0.010399818420410156,0.010516643524169922,0.011085748672485352,0.010303020477294922,0.010526418685913086,0.010440826416015625,0.010524988174438477,0.0598602294921875,0.01962876319885254,0.27826595306396484,0.2961161136627197,0.20551323890686035,1.68141508102417,0.18848419189453125 diff --git a/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv b/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv index 8bb9007ed0..66d5b1df52 100644 --- a/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv +++ b/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,527e238ddf7b25402927371510f22e9a01ac8750,3d8ed54a7eb32de45b50b57cfe2975f58212f9ed,688514ce6ee363c40f3f7afd8946e6b84eb3ff5b,,True,True,797e25d8ac159c1996acae92a69eb46b6f0ead3fe804f691d6b3b305e3b6ddad,Tests_passed,02b38fd2fadecdeee51c74fab5982924939ecddd2815a44d1e8331e9638832b0,Tests_passed,True,True,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,0.03470563888549805,0.045995473861694336,0.04021763801574707,0.043306589126586914,0.03767204284667969,0.043337345123291016,0.039282798767089844,0.17431092262268066,0.011033058166503906,0.15845417976379395,0.15895867347717285,0.11005592346191406,0.7468447685241699,0.1781454086303711 +1,refs/heads/master,527e238ddf7b25402927371510f22e9a01ac8750,3d8ed54a7eb32de45b50b57cfe2975f58212f9ed,688514ce6ee363c40f3f7afd8946e6b84eb3ff5b,,True,True,797e25d8ac159c1996acae92a69eb46b6f0ead3fe804f691d6b3b305e3b6ddad,Tests_passed,02b38fd2fadecdeee51c74fab5982924939ecddd2815a44d1e8331e9638832b0,Tests_passed,True,True,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,0.03470563888549805,0.045995473861694336,0.04021763801574707,0.043306589126586914,0.03767204284667969,0.043337345123291016,0.039282798767089844,0.17431092262268066,0.011033058166503906,0.15679049491882324,0.15668749809265137,0.11005592346191406,0.7468447685241699,0.1781454086303711 diff --git a/results/combined/merges_timed/intcode/sweetie.csv b/results/combined/merges_timed/intcode/sweetie.csv index 31727cf216..92ee8731fa 100644 --- a/results/combined/merges_timed/intcode/sweetie.csv +++ b/results/combined/merges_timed/intcode/sweetie.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,a9dd1a794eb1d4b3e7c9e26d4dd716df84189d88,3f18be686982e9c85e421ec672acc397e8296a97,001aeae00779c70a403f427ed33adf50ef85bfaf,,True,True,3dfaa9858762e1761a24f8fb6fb4fd11434d99dbf23df754d12276c1e26bfae5,Tests_passed,fe3fa22e6b0de4a57bd80e280fd82439ad791216e18b73c2a605a17c2d1f72ed,Tests_passed,True,True,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,0849fb832b134a4036520f0777bdd77451d08481777788b0db5d513e77752d85,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Merge_failed,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,7f36d9b680f23d1bea1ddd04129076ebb2c50755471b3afc588ae5c6aad008de,Merge_failed,7f36d9b680f23d1bea1ddd04129076ebb2c50755471b3afc588ae5c6aad008de,0.039609670639038086,0.04143881797790527,0.04576563835144043,0.03831815719604492,0.052899837493896484,0.033179521560668945,0.03999495506286621,0.24328184127807617,0.07967972755432129,0.28818845748901367,0.2876889705657959,0.16951251029968262,0.04039454460144043,0.22243332862854004 +4,refs/heads/master,a9dd1a794eb1d4b3e7c9e26d4dd716df84189d88,3f18be686982e9c85e421ec672acc397e8296a97,001aeae00779c70a403f427ed33adf50ef85bfaf,,True,True,3dfaa9858762e1761a24f8fb6fb4fd11434d99dbf23df754d12276c1e26bfae5,Tests_passed,fe3fa22e6b0de4a57bd80e280fd82439ad791216e18b73c2a605a17c2d1f72ed,Tests_passed,True,True,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,0849fb832b134a4036520f0777bdd77451d08481777788b0db5d513e77752d85,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Merge_failed,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,7f36d9b680f23d1bea1ddd04129076ebb2c50755471b3afc588ae5c6aad008de,Merge_failed,7f36d9b680f23d1bea1ddd04129076ebb2c50755471b3afc588ae5c6aad008de,0.039609670639038086,0.04143881797790527,0.04576563835144043,0.03831815719604492,0.052899837493896484,0.033179521560668945,0.03999495506286621,0.24328184127807617,0.07967972755432129,0.289992094039917,0.2903270721435547,0.16951251029968262,0.04039454460144043,0.22243332862854004 diff --git a/results/combined/merges_timed/ipeirotis/get-another-label.csv b/results/combined/merges_timed/ipeirotis/get-another-label.csv index fc5803c4fa..95b38bf2d8 100644 --- a/results/combined/merges_timed/ipeirotis/get-another-label.csv +++ b/results/combined/merges_timed/ipeirotis/get-another-label.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,ac8fd271f85a8adee28bffb01bf892ddacbb66d3,0989f5097729cdfcfe91010095351bd233596880,e132f19c89ad735a3a75b173fb833acfdb6fbeb6,,True,True,2909cf287f63c0e1df62669d37d30422c96b6574758b32e9c9a96bbad1b04a4f,Tests_passed,9e873c54ac25d1e2ba614103167e71cdc676332aba6e100b028805bef8921e64,Tests_passed,True,True,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,0.014805793762207031,0.014671802520751953,0.01672530174255371,0.016510009765625,0.01696467399597168,0.01643991470336914,0.016450166702270508,0.04605889320373535,0.014698505401611328,0.16424965858459473,0.16434216499328613,0.07242536544799805,1.2843737602233887,0.18900132179260254 +10,refs/heads/master,ac8fd271f85a8adee28bffb01bf892ddacbb66d3,0989f5097729cdfcfe91010095351bd233596880,e132f19c89ad735a3a75b173fb833acfdb6fbeb6,,True,True,2909cf287f63c0e1df62669d37d30422c96b6574758b32e9c9a96bbad1b04a4f,Tests_passed,9e873c54ac25d1e2ba614103167e71cdc676332aba6e100b028805bef8921e64,Tests_passed,True,True,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,0.014805793762207031,0.014671802520751953,0.01672530174255371,0.016510009765625,0.01696467399597168,0.01643991470336914,0.016450166702270508,0.04605889320373535,0.014698505401611328,0.1608121395111084,0.16094970703125,0.07242536544799805,1.2843737602233887,0.18900132179260254 diff --git a/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv b/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv index 02446d74a8..eab54740ea 100644 --- a/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv +++ b/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,7afb7f707acec7dedb8da5a37d80ce8b28a2ad5d,9945edc9998ecffa0b9796887a6b0309dcc3c0a9,36cba17aa2e95effcea8f835318559301e0471d6,,0f39920997c185c204ab490e7745e00959f5a795f53feafcdd893faab75ac33e,Tests_passed,443572ca1c16e6e1e832edd1fb2f0cbee50fa3e91b720da5a45f583e636d6c28,Tests_passed,True,True,True,True,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,0.0382235050201416,0.041285037994384766,0.04309582710266113,0.04320955276489258,0.039926767349243164,0.04139566421508789,0.0397188663482666,0.1606442928314209,0.042153358459472656,0.16730356216430664,0.1700437068939209,0.10721945762634277,0.8631172180175781,0.18996095657348633 +2,refs/heads/master,7afb7f707acec7dedb8da5a37d80ce8b28a2ad5d,9945edc9998ecffa0b9796887a6b0309dcc3c0a9,36cba17aa2e95effcea8f835318559301e0471d6,,0f39920997c185c204ab490e7745e00959f5a795f53feafcdd893faab75ac33e,Tests_passed,443572ca1c16e6e1e832edd1fb2f0cbee50fa3e91b720da5a45f583e636d6c28,Tests_passed,True,True,True,True,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,0.0382235050201416,0.041285037994384766,0.04309582710266113,0.04320955276489258,0.039926767349243164,0.04139566421508789,0.0397188663482666,0.1606442928314209,0.042153358459472656,0.15937471389770508,0.15688085556030273,0.10721945762634277,0.8631172180175781,0.18996095657348633 diff --git a/results/combined/merges_timed/irstv/cts.csv b/results/combined/merges_timed/irstv/cts.csv index aab7c3321c..2ec09bb8ea 100644 --- a/results/combined/merges_timed/irstv/cts.csv +++ b/results/combined/merges_timed/irstv/cts.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -91,refs/heads/master,990cb24e63345f9ff473362e308283a626e72e17,698fc384861d109ed05aef930922fb80dfa124c1,4e207705ef95c228d5755933efb06bd7195a35c3,,206fec35ec358f81b818dae2f7d9fd260b5ea47263dd9cc746ac6a47d68a932e,Tests_passed,cd06b045e376b9d1b7d401da659105725d83c420ba2cacf90dbf2a0951619fd6,Tests_passed,True,True,True,True,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,c8d6e13e779e8faf9ba5a814c1e697fa2d6952f3c2ea1a5ca132aebda370513f,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,0.03200817108154297,0.05356478691101074,0.021581411361694336,0.04999256134033203,0.04062962532043457,0.040743350982666016,0.06790971755981445,0.17893743515014648,0.037790536880493164,0.1715857982635498,0.18055510520935059,0.09584689140319824,1.1030759811401367,0.2501363754272461 +91,refs/heads/master,990cb24e63345f9ff473362e308283a626e72e17,698fc384861d109ed05aef930922fb80dfa124c1,4e207705ef95c228d5755933efb06bd7195a35c3,,206fec35ec358f81b818dae2f7d9fd260b5ea47263dd9cc746ac6a47d68a932e,Tests_passed,cd06b045e376b9d1b7d401da659105725d83c420ba2cacf90dbf2a0951619fd6,Tests_passed,True,True,True,True,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,c8d6e13e779e8faf9ba5a814c1e697fa2d6952f3c2ea1a5ca132aebda370513f,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,0.03200817108154297,0.05356478691101074,0.021581411361694336,0.04999256134033203,0.04062962532043457,0.040743350982666016,0.06790971755981445,0.17893743515014648,0.037790536880493164,0.1791057586669922,0.17853283882141113,0.09584689140319824,1.1030759811401367,0.2501363754272461 diff --git a/results/combined/merges_timed/iryndin/jdbf.csv b/results/combined/merges_timed/iryndin/jdbf.csv index 66d8fd80f6..2d0ba0b07e 100644 --- a/results/combined/merges_timed/iryndin/jdbf.csv +++ b/results/combined/merges_timed/iryndin/jdbf.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,9853124d737de64723a5fbdc879aed3b3d907656,6873736fe4071a4ab6e1cf0790f2c3eb252146ee,7855c84d1ca249ed60c5f43634036c6c34c334bc,,decc28d7f0fc97bf55ee9c3becde0b585c246a4ad569ab3ef73e21162a80191f,Tests_passed,e6156306513b246fd88141be270e51fed49622d50b84271889eb80cc14b811d1,Tests_passed,True,True,True,True,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,0.04611325263977051,0.03927135467529297,0.04302048683166504,0.040058135986328125,0.04095005989074707,0.037192344665527344,0.041379451751708984,0.16588687896728516,0.044561147689819336,0.16540789604187012,0.16438698768615723,0.10371971130371094,0.7254738807678223,0.1960592269897461 +7,refs/heads/master,9853124d737de64723a5fbdc879aed3b3d907656,6873736fe4071a4ab6e1cf0790f2c3eb252146ee,7855c84d1ca249ed60c5f43634036c6c34c334bc,,decc28d7f0fc97bf55ee9c3becde0b585c246a4ad569ab3ef73e21162a80191f,Tests_passed,e6156306513b246fd88141be270e51fed49622d50b84271889eb80cc14b811d1,Tests_passed,True,True,True,True,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,0.04611325263977051,0.03927135467529297,0.04302048683166504,0.040058135986328125,0.04095005989074707,0.037192344665527344,0.041379451751708984,0.16588687896728516,0.044561147689819336,0.1574997901916504,0.15834546089172363,0.10371971130371094,0.7254738807678223,0.1960592269897461 diff --git a/results/combined/merges_timed/iterate-ch/java-openstack-swift.csv b/results/combined/merges_timed/iterate-ch/java-openstack-swift.csv index 3753a68466..44f590d6f6 100644 --- a/results/combined/merges_timed/iterate-ch/java-openstack-swift.csv +++ b/results/combined/merges_timed/iterate-ch/java-openstack-swift.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,8a6b85283157ee0e827e9f4b99848372bb20e770,45818c6defaaaf55e9973c210d069877ac708643,8d3f1c990fd8de009a13a9b67769c8c80ae5f7c8,,True,True,492d0fb3ffa41989fa930aae319f5fb19bcd2c00a5fad6c03781efd0dd99c10d,Tests_passed,dcee5e5189caee7da235f3f57dcfd19e9c012a3bbd7dd5bb693ade1d60c49eb2,Tests_passed,True,True,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,15ab040df872fb06c1ff4c90669754f28e3c9d2a5713b7bf94196a846dd208c6,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,ec56199b593477a2a7b0a1d1d355a2064570fe68489e21450bef782b5535ef06,Merge_failed,ec56199b593477a2a7b0a1d1d355a2064570fe68489e21450bef782b5535ef06,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,aa768e2365a03b752ac98dcf3226a0889f47fb0618a48a5f94794b19a51d264e,0.027547597885131836,0.04075980186462402,0.020996570587158203,0.05262613296508789,0.044681549072265625,0.04189252853393555,0.04377317428588867,0.17786026000976562,0.0763547420501709,0.07886338233947754,0.07892274856567383,0.11283636093139648,1.569786787033081,0.2007768154144287 +15,refs/heads/master,8a6b85283157ee0e827e9f4b99848372bb20e770,45818c6defaaaf55e9973c210d069877ac708643,8d3f1c990fd8de009a13a9b67769c8c80ae5f7c8,,True,True,492d0fb3ffa41989fa930aae319f5fb19bcd2c00a5fad6c03781efd0dd99c10d,Tests_passed,dcee5e5189caee7da235f3f57dcfd19e9c012a3bbd7dd5bb693ade1d60c49eb2,Tests_passed,True,True,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,15ab040df872fb06c1ff4c90669754f28e3c9d2a5713b7bf94196a846dd208c6,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,ec56199b593477a2a7b0a1d1d355a2064570fe68489e21450bef782b5535ef06,Merge_failed,ec56199b593477a2a7b0a1d1d355a2064570fe68489e21450bef782b5535ef06,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,aa768e2365a03b752ac98dcf3226a0889f47fb0618a48a5f94794b19a51d264e,0.027547597885131836,0.04075980186462402,0.020996570587158203,0.05262613296508789,0.044681549072265625,0.04189252853393555,0.04377317428588867,0.17786026000976562,0.0763547420501709,0.06915760040283203,0.07862043380737305,0.11283636093139648,1.569786787033081,0.2007768154144287 diff --git a/results/combined/merges_timed/j-easy/easy-rules.csv b/results/combined/merges_timed/j-easy/easy-rules.csv index 9a9cbc8dea..88f7ad159a 100644 --- a/results/combined/merges_timed/j-easy/easy-rules.csv +++ b/results/combined/merges_timed/j-easy/easy-rules.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/master,7f8d311fd6f8fabcc4e6b54a9e3cdcda47bdbb8c,3bb001c6fcc8f95feb87b41de52e464d27dd693e,1bff470adc5760132d3dc4ea3b37e54157eb2f7e,,True,True,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,3a596a60caacba76a1ed8e3ecc71ba49a39194bc5a380cd6ce129dd218753922,Tests_passed,True,True,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,6a31947704b16db5de5496d1eb68abfc5059c42bce6e59909d244fb328eb8258,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Tests_failed,b267da1e32313d5826ecf2a88b8be21e909e3a0eec2cd9773bce90edc29058ab,Tests_failed,b267da1e32313d5826ecf2a88b8be21e909e3a0eec2cd9773bce90edc29058ab,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,1379ab73a0d8e0a852faf7b545a8547a9c08b1efe48e474da7436213b2acf09c,0.034018754959106445,0.03992199897766113,0.04615473747253418,0.013575553894042969,0.04868292808532715,0.03273153305053711,0.040290117263793945,0.3376729488372803,0.0665435791015625,0.2927114963531494,0.2925701141357422,0.28250789642333984,0.9429569244384766,0.21246576309204102 +21,refs/heads/master,7f8d311fd6f8fabcc4e6b54a9e3cdcda47bdbb8c,3bb001c6fcc8f95feb87b41de52e464d27dd693e,1bff470adc5760132d3dc4ea3b37e54157eb2f7e,,True,True,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,3a596a60caacba76a1ed8e3ecc71ba49a39194bc5a380cd6ce129dd218753922,Tests_passed,True,True,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,6a31947704b16db5de5496d1eb68abfc5059c42bce6e59909d244fb328eb8258,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Tests_failed,b267da1e32313d5826ecf2a88b8be21e909e3a0eec2cd9773bce90edc29058ab,Tests_failed,b267da1e32313d5826ecf2a88b8be21e909e3a0eec2cd9773bce90edc29058ab,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,1379ab73a0d8e0a852faf7b545a8547a9c08b1efe48e474da7436213b2acf09c,0.034018754959106445,0.03992199897766113,0.04615473747253418,0.013575553894042969,0.04868292808532715,0.03273153305053711,0.040290117263793945,0.3376729488372803,0.0665435791015625,0.2883744239807129,0.2889385223388672,0.28250789642333984,0.9429569244384766,0.21246576309204102 diff --git a/results/combined/merges_timed/j256/ormlite-core.csv b/results/combined/merges_timed/j256/ormlite-core.csv index 10bdf61214..420b2f5fd2 100644 --- a/results/combined/merges_timed/j256/ormlite-core.csv +++ b/results/combined/merges_timed/j256/ormlite-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,606986f118bb8c4de534c102f93dcbdc1241abd7,f46f05f128a1bde083a51b6f6e9f8f4a0981d7e5,1b78b22f5834adc7b9c1d0d6f93bc818594bb4a0,,True,True,a972f400f6fcc6d9ee2ff909c932ddc26fe443160251f3c095bc5840d3501966,Tests_passed,12083c250dbd413849a212a432fe7c60ae3cfe4c4c126e7bb6021d51bb54aed1,Tests_passed,True,True,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,0.026480913162231445,0.05844736099243164,0.04557323455810547,0.0631110668182373,0.06304144859313965,0.04533743858337402,0.05710482597351074,0.12383866310119629,0.05412626266479492,0.19581294059753418,0.20859551429748535,0.08004236221313477,1.6314959526062012,0.3421487808227539 +10,refs/heads/master,606986f118bb8c4de534c102f93dcbdc1241abd7,f46f05f128a1bde083a51b6f6e9f8f4a0981d7e5,1b78b22f5834adc7b9c1d0d6f93bc818594bb4a0,,True,True,a972f400f6fcc6d9ee2ff909c932ddc26fe443160251f3c095bc5840d3501966,Tests_passed,12083c250dbd413849a212a432fe7c60ae3cfe4c4c126e7bb6021d51bb54aed1,Tests_passed,True,True,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,0.026480913162231445,0.05844736099243164,0.04557323455810547,0.0631110668182373,0.06304144859313965,0.04533743858337402,0.05710482597351074,0.12383866310119629,0.05412626266479492,0.20619559288024902,0.20653152465820312,0.08004236221313477,1.6314959526062012,0.3421487808227539 diff --git a/results/combined/merges_timed/j256/simplemagic.csv b/results/combined/merges_timed/j256/simplemagic.csv index d8b4e28899..d7b28b181a 100644 --- a/results/combined/merges_timed/j256/simplemagic.csv +++ b/results/combined/merges_timed/j256/simplemagic.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/remotes/origin/pull/62,a2fee571fbe304efa8981457403471a2504062b4,be23be93333aeb434b823ec988702e9a782e0091,360362b52be76e31d01182abffe73f25e170221d,,True,True,d03640f23aeba27e1e1897251a2c6aec7d0c8675284b845a9b3eb9a413eed29d,Tests_passed,0b1abe883085eb51e4bf3615986acb3cb28d1a78a5ad220644e3e714f293c907,Tests_passed,True,True,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,bbf689443b2c45bb6447a04fabbe0b5cdc1f5bd959aa1fdb9c4ae59a4894df40,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,94dedb0232ff17195acef01b0dda73cdd69d01d66a5e8f09cfff99a39232104d,Merge_failed,94dedb0232ff17195acef01b0dda73cdd69d01d66a5e8f09cfff99a39232104d,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Merge_failed,f9dda8001ff1f437bd95152d02a9e1fdaa430fa5c12aba18522c193f623b1476,0.05699634552001953,0.05351710319519043,0.05451250076293945,0.06304740905761719,0.03970956802368164,0.03172779083251953,0.04961133003234863,0.21127533912658691,0.06655240058898926,0.22794699668884277,0.2380695343017578,0.18195581436157227,1.95851469039917,0.23910069465637207 +24,refs/remotes/origin/pull/62,a2fee571fbe304efa8981457403471a2504062b4,be23be93333aeb434b823ec988702e9a782e0091,360362b52be76e31d01182abffe73f25e170221d,,True,True,d03640f23aeba27e1e1897251a2c6aec7d0c8675284b845a9b3eb9a413eed29d,Tests_passed,0b1abe883085eb51e4bf3615986acb3cb28d1a78a5ad220644e3e714f293c907,Tests_passed,True,True,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,bbf689443b2c45bb6447a04fabbe0b5cdc1f5bd959aa1fdb9c4ae59a4894df40,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,94dedb0232ff17195acef01b0dda73cdd69d01d66a5e8f09cfff99a39232104d,Merge_failed,94dedb0232ff17195acef01b0dda73cdd69d01d66a5e8f09cfff99a39232104d,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Merge_failed,f9dda8001ff1f437bd95152d02a9e1fdaa430fa5c12aba18522c193f623b1476,0.05699634552001953,0.05351710319519043,0.05451250076293945,0.06304740905761719,0.03970956802368164,0.03172779083251953,0.04961133003234863,0.21127533912658691,0.06655240058898926,0.2277510166168213,0.23584985733032227,0.18195581436157227,1.95851469039917,0.23910069465637207 diff --git a/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv b/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv index aa65582a44..8071424a76 100644 --- a/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv +++ b/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,ac521954c2d20f93d597a8dfbeae1e3f008befda,09ff67b95c86658c563e180e2675768b845987d9,9b33d2d1e147bd014e2bb503ca0a38657876ce47,,30b2ef34340761d99265a2fe661f6a3d29b66e4ae4883458cc38229a4aa68972,Tests_passed,c5f74055095f11a18db09272a291c7d5d9ac46a8b437ae1dc5cdeedce0173a68,Tests_passed,True,True,True,True,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,9b4a2d8f81e91d2fcbae9134c5cbc551c0a4c717a8d2967931b95ccc9d22e314,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,ade3068ae794ef1a1439a68dc1b76351b76688278fab01dc7ef0058e3c593c13,Merge_failed,ade3068ae794ef1a1439a68dc1b76351b76688278fab01dc7ef0058e3c593c13,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,817aabdc1c7c260b2b6640f8612a0c838ae9c30bb2d62a225fbdee9c58fbc6e2,0.037369728088378906,0.03659868240356445,0.03562474250793457,0.03430461883544922,0.03455686569213867,0.035147666931152344,0.032985687255859375,0.14992022514343262,0.06082892417907715,0.06301546096801758,0.06401729583740234,0.11929845809936523,0.5494441986083984,0.17751359939575195 +2,refs/heads/master,ac521954c2d20f93d597a8dfbeae1e3f008befda,09ff67b95c86658c563e180e2675768b845987d9,9b33d2d1e147bd014e2bb503ca0a38657876ce47,,30b2ef34340761d99265a2fe661f6a3d29b66e4ae4883458cc38229a4aa68972,Tests_passed,c5f74055095f11a18db09272a291c7d5d9ac46a8b437ae1dc5cdeedce0173a68,Tests_passed,True,True,True,True,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,9b4a2d8f81e91d2fcbae9134c5cbc551c0a4c717a8d2967931b95ccc9d22e314,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,ade3068ae794ef1a1439a68dc1b76351b76688278fab01dc7ef0058e3c593c13,Merge_failed,ade3068ae794ef1a1439a68dc1b76351b76688278fab01dc7ef0058e3c593c13,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,817aabdc1c7c260b2b6640f8612a0c838ae9c30bb2d62a225fbdee9c58fbc6e2,0.037369728088378906,0.03659868240356445,0.03562474250793457,0.03430461883544922,0.03455686569213867,0.035147666931152344,0.032985687255859375,0.14992022514343262,0.06082892417907715,0.06207084655761719,0.0619807243347168,0.11929845809936523,0.5494441986083984,0.17751359939575195 diff --git a/results/combined/merges_timed/jadler-mocking/jadler.csv b/results/combined/merges_timed/jadler-mocking/jadler.csv index 41a802b190..ccf8063d95 100644 --- a/results/combined/merges_timed/jadler-mocking/jadler.csv +++ b/results/combined/merges_timed/jadler-mocking/jadler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -117,refs/heads/master,c022c949608a874cfc3c2a47cc18b3cf6ef0f161,3b24b879c4bde13d48c40c9afd91250aa5b18368,a29d0b7c2f1e21f1cbcf088c3bdf13640b569749,,True,True,6c7ce2d9a83c0e602b91d8c1448f5d6bc2d59f42ceaa2495a9c8fe1c9e9f2fc2,Tests_passed,91390ac5fdfd0bf29cbc1e6bf3dba5332c215e20f2dd20fc7d0185d510e908a8,Tests_passed,True,True,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,0.04296088218688965,0.048613786697387695,0.041870832443237305,0.042366981506347656,0.051183223724365234,0.05663657188415527,0.03187394142150879,0.23544764518737793,0.05156993865966797,0.34710144996643066,0.32732343673706055,0.17304658889770508,2.0450124740600586,0.22258496284484863 +117,refs/heads/master,c022c949608a874cfc3c2a47cc18b3cf6ef0f161,3b24b879c4bde13d48c40c9afd91250aa5b18368,a29d0b7c2f1e21f1cbcf088c3bdf13640b569749,,True,True,6c7ce2d9a83c0e602b91d8c1448f5d6bc2d59f42ceaa2495a9c8fe1c9e9f2fc2,Tests_passed,91390ac5fdfd0bf29cbc1e6bf3dba5332c215e20f2dd20fc7d0185d510e908a8,Tests_passed,True,True,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,0.04296088218688965,0.048613786697387695,0.041870832443237305,0.042366981506347656,0.051183223724365234,0.05663657188415527,0.03187394142150879,0.23544764518737793,0.05156993865966797,0.3207542896270752,0.32131266593933105,0.17304658889770508,2.0450124740600586,0.22258496284484863 diff --git a/results/combined/merges_timed/jahia/jahiapp-newsletter.csv b/results/combined/merges_timed/jahia/jahiapp-newsletter.csv index fcbc3528c7..bab7b9344c 100644 --- a/results/combined/merges_timed/jahia/jahiapp-newsletter.csv +++ b/results/combined/merges_timed/jahia/jahiapp-newsletter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/remotes/origin/pull/1,1d8a06e1d3bf5116c4d900bc808170310aed675e,ad6e58fc6b376e34a9b05748a456db9a7a2b35e4,51a1b0ec89c37330997c4af05f0e85c02d0f0312,,True,True,f7e61f2816286bc68da15c29011967ae5a420ea75589589d219ce2d85c4b7114,Tests_passed,2c71690a52ac6d921d3ed2af69eba36ffe6d2840c064b694b5e1576e16e47c53,Tests_passed,True,True,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,f1edc6884f942d8fb4d69036a63e43683f09722f9c7c191b4d99daf73ea07d60,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,4282500780cc824d6024f7d95f4ca615b063ad04633a8ae739d9fc15ec84413c,Merge_failed,4282500780cc824d6024f7d95f4ca615b063ad04633a8ae739d9fc15ec84413c,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,8c6f56fa334e7e6393f4e5e184c96037f25e09d434d710946e9a48a0090b973d,Tests_failed,d2cd9824dbd0da6e15afe313768b1ed925c4326d116d48ffd3a97650fd38fa84,0.054849863052368164,0.059256553649902344,0.053967952728271484,0.051915645599365234,0.04831361770629883,0.044969797134399414,0.05103492736816406,0.38352465629577637,0.07334589958190918,0.4980766773223877,0.4848201274871826,0.2885274887084961,2.4682652950286865,0.210174560546875 +7,refs/remotes/origin/pull/1,1d8a06e1d3bf5116c4d900bc808170310aed675e,ad6e58fc6b376e34a9b05748a456db9a7a2b35e4,51a1b0ec89c37330997c4af05f0e85c02d0f0312,,True,True,f7e61f2816286bc68da15c29011967ae5a420ea75589589d219ce2d85c4b7114,Tests_passed,2c71690a52ac6d921d3ed2af69eba36ffe6d2840c064b694b5e1576e16e47c53,Tests_passed,True,True,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,f1edc6884f942d8fb4d69036a63e43683f09722f9c7c191b4d99daf73ea07d60,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,4282500780cc824d6024f7d95f4ca615b063ad04633a8ae739d9fc15ec84413c,Merge_failed,4282500780cc824d6024f7d95f4ca615b063ad04633a8ae739d9fc15ec84413c,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,8c6f56fa334e7e6393f4e5e184c96037f25e09d434d710946e9a48a0090b973d,Tests_failed,d2cd9824dbd0da6e15afe313768b1ed925c4326d116d48ffd3a97650fd38fa84,0.054849863052368164,0.059256553649902344,0.053967952728271484,0.051915645599365234,0.04831361770629883,0.044969797134399414,0.05103492736816406,0.38352465629577637,0.07334589958190918,0.46980857849121094,0.47443246841430664,0.2885274887084961,2.4682652950286865,0.210174560546875 diff --git a/results/combined/merges_timed/jahia/ldap-provider.csv b/results/combined/merges_timed/jahia/ldap-provider.csv index 88993b3c32..29b5e9817e 100644 --- a/results/combined/merges_timed/jahia/ldap-provider.csv +++ b/results/combined/merges_timed/jahia/ldap-provider.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,6d1c8ec4b6fd4b940368f7290fd5ab315efd3240,fc5ec6dad13d304cdfd981ea9a300b005fac4bb6,9f02fba71d5f3bad70d553709d718db715276f48,,True,True,165a535fcc358261b96ed31f503ec7c5e0699da0eb44a4dee7acf1a09832015a,Tests_passed,900b71294fa88c05a9c4354beeb2645da4428586bf5aa04085cea58e231e3e3c,Tests_passed,True,True,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,83d7e09fe40c4ccb32b125cb70a2a17fea9051b4e2f4f047a5f776120bdf8833,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,0.05159449577331543,0.05508852005004883,0.052304983139038086,0.035942792892456055,0.05254006385803223,0.054680824279785156,0.03461956977844238,0.5817611217498779,0.045273542404174805,0.9194371700286865,0.921379804611206,0.44027137756347656,5.28517746925354,0.20717072486877441 +6,refs/heads/master,6d1c8ec4b6fd4b940368f7290fd5ab315efd3240,fc5ec6dad13d304cdfd981ea9a300b005fac4bb6,9f02fba71d5f3bad70d553709d718db715276f48,,True,True,165a535fcc358261b96ed31f503ec7c5e0699da0eb44a4dee7acf1a09832015a,Tests_passed,900b71294fa88c05a9c4354beeb2645da4428586bf5aa04085cea58e231e3e3c,Tests_passed,True,True,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,83d7e09fe40c4ccb32b125cb70a2a17fea9051b4e2f4f047a5f776120bdf8833,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,0.05159449577331543,0.05508852005004883,0.052304983139038086,0.035942792892456055,0.05254006385803223,0.054680824279785156,0.03461956977844238,0.5817611217498779,0.045273542404174805,0.9104552268981934,0.9091928005218506,0.44027137756347656,5.28517746925354,0.20717072486877441 diff --git a/results/combined/merges_timed/jai-imageio/jai-imageio-jpeg2000.csv b/results/combined/merges_timed/jai-imageio/jai-imageio-jpeg2000.csv index cbc1034109..4aab9daf7f 100644 --- a/results/combined/merges_timed/jai-imageio/jai-imageio-jpeg2000.csv +++ b/results/combined/merges_timed/jai-imageio/jai-imageio-jpeg2000.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,3db9087392f4de4fd2ac154c811678fa6d29465c,0bfd01b19961a6511f71d083a6bb45d76502f196,1ce5e4a41c1b229d07643e0746fdeb91841e7414,,2ae40e4ccee6b5f7205b4bd5dcbb255df235604bb28e8df519d41e495299271b,Tests_passed,fed1d63258b2c38fb9a467c6182291bda1a3ad5cab91d063ba311ba09f434b1a,Tests_passed,True,True,True,True,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,0.014681816101074219,0.01370096206665039,0.0455479621887207,0.029508590698242188,0.05440044403076172,0.0403902530670166,0.04516720771789551,0.17305588722229004,0.01176905632019043,0.1925673484802246,0.1958475112915039,0.11059308052062988,1.6621532440185547,0.2467334270477295 +11,refs/heads/master,3db9087392f4de4fd2ac154c811678fa6d29465c,0bfd01b19961a6511f71d083a6bb45d76502f196,1ce5e4a41c1b229d07643e0746fdeb91841e7414,,2ae40e4ccee6b5f7205b4bd5dcbb255df235604bb28e8df519d41e495299271b,Tests_passed,fed1d63258b2c38fb9a467c6182291bda1a3ad5cab91d063ba311ba09f434b1a,Tests_passed,True,True,True,True,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,0.014681816101074219,0.01370096206665039,0.0455479621887207,0.029508590698242188,0.05440044403076172,0.0403902530670166,0.04516720771789551,0.17305588722229004,0.01176905632019043,0.18100476264953613,0.1933300495147705,0.11059308052062988,1.6621532440185547,0.2467334270477295 diff --git a/results/combined/merges_timed/jakewharton/disklrucache.csv b/results/combined/merges_timed/jakewharton/disklrucache.csv index a761fae242..9c0166919e 100644 --- a/results/combined/merges_timed/jakewharton/disklrucache.csv +++ b/results/combined/merges_timed/jakewharton/disklrucache.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,Tests_passed,True,True,True,True,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,0.008766889572143555,0.009540319442749023,0.009119033813476562,0.009754657745361328,0.00928354263305664,0.009067296981811523,0.009298324584960938,0.03270697593688965,0.009126901626586914,0.17034196853637695,0.17006802558898926,0.06444120407104492,1.2582242488861084,0.16182875633239746 +16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,Tests_passed,True,True,True,True,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,0.008766889572143555,0.009540319442749023,0.009119033813476562,0.009754657745361328,0.00928354263305664,0.009067296981811523,0.009298324584960938,0.03270697593688965,0.009126901626586914,0.16715097427368164,0.16822552680969238,0.06444120407104492,1.2582242488861084,0.16182875633239746 diff --git a/results/combined/merges_timed/jalkanen/speed4j.csv b/results/combined/merges_timed/jalkanen/speed4j.csv index 7c479aa4b0..40c9a84c8e 100644 --- a/results/combined/merges_timed/jalkanen/speed4j.csv +++ b/results/combined/merges_timed/jalkanen/speed4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,18370b95449b0062c7f3286734bb393cf47e02a1,1f224d4a60b62e76f9cdc0893e477e85295c3f13,1164f50c09c8ea4be8d59bc8cb8f01e11180e3ad,,True,True,2f02793aa0403b6d25b6dd70488e1d1c286d04a41899d5d93551163078660fba,Tests_passed,fda8748049efa14bd2fb5c8c12aaa8e4d9b692cccc4f9f19182769752afb977d,Tests_passed,True,True,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,c272904828ffc3e580731c4a59cc1f3ed95e41ebff642aa566bcc4c1caf717a9,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,0.04560399055480957,0.03528952598571777,0.046416282653808594,0.0393526554107666,0.044886112213134766,0.0415501594543457,0.041994571685791016,0.15654754638671875,0.04604697227478027,0.1738121509552002,0.17430520057678223,0.10333728790283203,0.9643926620483398,0.18863606452941895 +6,refs/heads/master,18370b95449b0062c7f3286734bb393cf47e02a1,1f224d4a60b62e76f9cdc0893e477e85295c3f13,1164f50c09c8ea4be8d59bc8cb8f01e11180e3ad,,True,True,2f02793aa0403b6d25b6dd70488e1d1c286d04a41899d5d93551163078660fba,Tests_passed,fda8748049efa14bd2fb5c8c12aaa8e4d9b692cccc4f9f19182769752afb977d,Tests_passed,True,True,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,c272904828ffc3e580731c4a59cc1f3ed95e41ebff642aa566bcc4c1caf717a9,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,0.04560399055480957,0.03528952598571777,0.046416282653808594,0.0393526554107666,0.044886112213134766,0.0415501594543457,0.041994571685791016,0.15654754638671875,0.04604697227478027,0.16834330558776855,0.16697454452514648,0.10333728790283203,0.9643926620483398,0.18863606452941895 diff --git a/results/combined/merges_timed/japgolly/svg-android.csv b/results/combined/merges_timed/japgolly/svg-android.csv index eac593b1ad..48fcd5338d 100644 --- a/results/combined/merges_timed/japgolly/svg-android.csv +++ b/results/combined/merges_timed/japgolly/svg-android.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,c92bb808ebdd240679593f352cb0ef139b43ec27,f62966b068bf8bb8e96d4592ad12275549a4f2ae,93c4a06d20ad8c29305cd5604a387bf37d5abcd4,,c64d70b547edb86cf23ef9683c1c8ad0feef84b572951ed57de742b9bfef6a16,Tests_passed,46d4d1b2217297aee78e7f99cebcdf7e4c913a1f8db3e7e77d2656272008369d,Tests_passed,True,True,True,True,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,0.038013458251953125,0.039113521575927734,0.04605889320373535,0.035288095474243164,0.04726696014404297,0.045317888259887695,0.048024892807006836,0.17112231254577637,0.03779721260070801,0.18641448020935059,0.18649744987487793,0.11464619636535645,2.1485700607299805,0.1922130584716797 +2,refs/heads/master,c92bb808ebdd240679593f352cb0ef139b43ec27,f62966b068bf8bb8e96d4592ad12275549a4f2ae,93c4a06d20ad8c29305cd5604a387bf37d5abcd4,,c64d70b547edb86cf23ef9683c1c8ad0feef84b572951ed57de742b9bfef6a16,Tests_passed,46d4d1b2217297aee78e7f99cebcdf7e4c913a1f8db3e7e77d2656272008369d,Tests_passed,True,True,True,True,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,0.038013458251953125,0.039113521575927734,0.04605889320373535,0.035288095474243164,0.04726696014404297,0.045317888259887695,0.048024892807006836,0.17112231254577637,0.03779721260070801,0.1823430061340332,0.18326115608215332,0.11464619636535645,2.1485700607299805,0.1922130584716797 diff --git a/results/combined/merges_timed/jasig/java-cas-client.csv b/results/combined/merges_timed/jasig/java-cas-client.csv index 8c0294bc25..ae0ada93bd 100644 --- a/results/combined/merges_timed/jasig/java-cas-client.csv +++ b/results/combined/merges_timed/jasig/java-cas-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -625,refs/remotes/origin/pull/65,f9dba228c432bb86dec5f92f7ae748d86c69b380,632377865559774569a2b0360cf5049146484bdf,affe0d30f1ce16e15399f30f1e5faa6ea878094c,,True,True,7448b189c00609ac5e1320f51ac9a7479f2ac5a6b67f6040598fe79ae4217039,Tests_passed,27abde5006d5f40fd0a3771a9de7f04f888cb1a3af8444917e79eee115092aa2,Tests_passed,True,True,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2a00602dfe3aa21a03f00c8103611c77c58799e4e2c5d98d527218ea43af5cdd,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2a00602dfe3aa21a03f00c8103611c77c58799e4e2c5d98d527218ea43af5cdd,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,78845707c97e4bcc8c69be7182376d4b809c83f0c86caabb0ddd299e64c9a3ae,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,ecc66d0d650c06be17751b756e12dcdefdc82fcfec3f409eb8d7187c97cfa6e6,Merge_failed,ecc66d0d650c06be17751b756e12dcdefdc82fcfec3f409eb8d7187c97cfa6e6,Merge_failed,8371ae21cb527eae531d56a769a3ce664d266b6a11f703ccdaa06bf28298e16a,Tests_passed,53578ed8b63ce69f167fac7496e9556bbc973ed08e9ad4f767a086f8d52f9a5c,Merge_failed,17ac687484ea4941fc304aa82586e9a471758be1f7087f6e5abcb51b9bd367c8,0.03224921226501465,0.033394575119018555,0.02044200897216797,0.018996715545654297,0.013330936431884766,0.01345372200012207,0.017484664916992188,0.09514045715332031,0.05206942558288574,0.0730898380279541,0.07373189926147461,0.09670042991638184,0.7725253105163574,0.19127273559570312 +625,refs/remotes/origin/pull/65,f9dba228c432bb86dec5f92f7ae748d86c69b380,632377865559774569a2b0360cf5049146484bdf,affe0d30f1ce16e15399f30f1e5faa6ea878094c,,True,True,7448b189c00609ac5e1320f51ac9a7479f2ac5a6b67f6040598fe79ae4217039,Tests_passed,27abde5006d5f40fd0a3771a9de7f04f888cb1a3af8444917e79eee115092aa2,Tests_passed,True,True,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2a00602dfe3aa21a03f00c8103611c77c58799e4e2c5d98d527218ea43af5cdd,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2a00602dfe3aa21a03f00c8103611c77c58799e4e2c5d98d527218ea43af5cdd,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,78845707c97e4bcc8c69be7182376d4b809c83f0c86caabb0ddd299e64c9a3ae,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,ecc66d0d650c06be17751b756e12dcdefdc82fcfec3f409eb8d7187c97cfa6e6,Merge_failed,ecc66d0d650c06be17751b756e12dcdefdc82fcfec3f409eb8d7187c97cfa6e6,Merge_failed,8371ae21cb527eae531d56a769a3ce664d266b6a11f703ccdaa06bf28298e16a,Tests_passed,53578ed8b63ce69f167fac7496e9556bbc973ed08e9ad4f767a086f8d52f9a5c,Merge_failed,17ac687484ea4941fc304aa82586e9a471758be1f7087f6e5abcb51b9bd367c8,0.03224921226501465,0.033394575119018555,0.02044200897216797,0.018996715545654297,0.013330936431884766,0.01345372200012207,0.017484664916992188,0.09514045715332031,0.05206942558288574,0.0729060173034668,0.07334637641906738,0.09670042991638184,0.7725253105163574,0.19127273559570312 diff --git a/results/combined/merges_timed/jasig/jspc-maven-plugin.csv b/results/combined/merges_timed/jasig/jspc-maven-plugin.csv index 9372172ca9..0570835057 100644 --- a/results/combined/merges_timed/jasig/jspc-maven-plugin.csv +++ b/results/combined/merges_timed/jasig/jspc-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,1ea62650f81dfb722f95c0878b8d49ed45e1149e,96e5b1d72738896df1e0a7c3d0c19e50e9d2026f,448cddfb8a0fdfa129f96247a4863d60ae70b648,,a2cd8a1fbb8723186b1a57c1eff2346cf635be462eb45f53b90f49fe704e4ab3,Tests_passed,3c5cbcfdbda7dc0b5ffb709df3aed6315a34510bacf21844794227e72b075014,Tests_passed,True,True,True,True,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,0.04670357704162598,0.0517728328704834,0.04662728309631348,0.045806884765625,0.05329418182373047,0.04506230354309082,0.04481649398803711,0.17440128326416016,0.045105934143066406,0.1600642204284668,0.16318678855895996,0.1082310676574707,1.1401293277740479,0.18277835845947266 +8,refs/heads/master,1ea62650f81dfb722f95c0878b8d49ed45e1149e,96e5b1d72738896df1e0a7c3d0c19e50e9d2026f,448cddfb8a0fdfa129f96247a4863d60ae70b648,,a2cd8a1fbb8723186b1a57c1eff2346cf635be462eb45f53b90f49fe704e4ab3,Tests_passed,3c5cbcfdbda7dc0b5ffb709df3aed6315a34510bacf21844794227e72b075014,Tests_passed,True,True,True,True,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,0.04670357704162598,0.0517728328704834,0.04662728309631348,0.045806884765625,0.05329418182373047,0.04506230354309082,0.04481649398803711,0.17440128326416016,0.045105934143066406,0.15682673454284668,0.15833234786987305,0.1082310676574707,1.1401293277740479,0.18277835845947266 diff --git a/results/combined/merges_timed/jasig/webproxyportlet.csv b/results/combined/merges_timed/jasig/webproxyportlet.csv index 01cc9fb282..46b1846e11 100644 --- a/results/combined/merges_timed/jasig/webproxyportlet.csv +++ b/results/combined/merges_timed/jasig/webproxyportlet.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -141,refs/heads/master,aa92c74f5e24668cc8312270702585e14c649b11,b008613b5a9adf71e75776098ea5110b794170ef,11306f962cabe54ce892c328b432041dacbb83dc,,True,True,694ad467e24df3ddcf2ff62e9be3d67bc584561f8aa89172c6075b7cce0b545f,Tests_passed,8f9bf557172eca435165112d4c29e1c511b6b503650a14e1e6f8a5bceb07116e,Tests_passed,True,True,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,0.01503133773803711,0.015896320343017578,0.01881098747253418,0.018705129623413086,0.018970966339111328,0.01872706413269043,0.01799798011779785,0.05901050567626953,0.015908002853393555,0.16768670082092285,0.16901731491088867,0.12258338928222656,0.7425084114074707,0.19699478149414062 +141,refs/heads/master,aa92c74f5e24668cc8312270702585e14c649b11,b008613b5a9adf71e75776098ea5110b794170ef,11306f962cabe54ce892c328b432041dacbb83dc,,True,True,694ad467e24df3ddcf2ff62e9be3d67bc584561f8aa89172c6075b7cce0b545f,Tests_passed,8f9bf557172eca435165112d4c29e1c511b6b503650a14e1e6f8a5bceb07116e,Tests_passed,True,True,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,0.01503133773803711,0.015896320343017578,0.01881098747253418,0.018705129623413086,0.018970966339111328,0.01872706413269043,0.01799798011779785,0.05901050567626953,0.015908002853393555,0.16118144989013672,0.1612861156463623,0.12258338928222656,0.7425084114074707,0.19699478149414062 diff --git a/results/combined/merges_timed/javamoney/jsr354-api.csv b/results/combined/merges_timed/javamoney/jsr354-api.csv index 6a621840d2..28edb80543 100644 --- a/results/combined/merges_timed/javamoney/jsr354-api.csv +++ b/results/combined/merges_timed/javamoney/jsr354-api.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -142,refs/heads/master,7422197487f7fb1c43111c98d9859e9c05052566,668d6eb9dd831ffaa0a5f20dd9f34f6e54eb8a08,73a0bfe83fe56f264293476ce262a774c7b7fc1f,,True,True,6ab3a9b711d74ef199aa3f1233e5fe391abd67eb68b492cb73f83c29a476a9cb,Tests_passed,4630f11d26138b665e413ef8871fafadc2b6ecc7179c43278a1de0a05d709754,Tests_passed,True,True,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,3167acaf3d30d2a9388d4699309d12285770150788ec3900f78b01314671642c,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,3167acaf3d30d2a9388d4699309d12285770150788ec3900f78b01314671642c,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,c8e2ea6aea0bcc16814521f4362c82585c78226dbcad18ae74ddb25a913f7e67,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,bff0eddafa0d43911e80110f2c2f5d95c0fca44879e34a0ff85dfc9af77feea5,Merge_failed,bff0eddafa0d43911e80110f2c2f5d95c0fca44879e34a0ff85dfc9af77feea5,Merge_failed,49366f8dfc1003417374236aad4dd132efaa73607d10615784e74cb0666e56c6,Tests_passed,b7f6c1f9fda12ddda1a89301abcc72cbb98684187daf5e76a5cdb77a631be000,Merge_failed,f349d2be4e2e7c61cfe9a842b02987df7a52cdf522a785fdb9de301bb617bca6,0.05078554153442383,0.03864741325378418,0.03853631019592285,0.04743671417236328,0.047943115234375,0.04834246635437012,0.04894566535949707,0.2437889575958252,0.08775973320007324,0.14058780670166016,0.14063572883605957,0.16870665550231934,1.0454826354980469,0.27206969261169434 +142,refs/heads/master,7422197487f7fb1c43111c98d9859e9c05052566,668d6eb9dd831ffaa0a5f20dd9f34f6e54eb8a08,73a0bfe83fe56f264293476ce262a774c7b7fc1f,,True,True,6ab3a9b711d74ef199aa3f1233e5fe391abd67eb68b492cb73f83c29a476a9cb,Tests_passed,4630f11d26138b665e413ef8871fafadc2b6ecc7179c43278a1de0a05d709754,Tests_passed,True,True,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,3167acaf3d30d2a9388d4699309d12285770150788ec3900f78b01314671642c,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,3167acaf3d30d2a9388d4699309d12285770150788ec3900f78b01314671642c,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,c8e2ea6aea0bcc16814521f4362c82585c78226dbcad18ae74ddb25a913f7e67,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,bff0eddafa0d43911e80110f2c2f5d95c0fca44879e34a0ff85dfc9af77feea5,Merge_failed,bff0eddafa0d43911e80110f2c2f5d95c0fca44879e34a0ff85dfc9af77feea5,Merge_failed,49366f8dfc1003417374236aad4dd132efaa73607d10615784e74cb0666e56c6,Tests_passed,b7f6c1f9fda12ddda1a89301abcc72cbb98684187daf5e76a5cdb77a631be000,Merge_failed,f349d2be4e2e7c61cfe9a842b02987df7a52cdf522a785fdb9de301bb617bca6,0.05078554153442383,0.03864741325378418,0.03853631019592285,0.04743671417236328,0.047943115234375,0.04834246635437012,0.04894566535949707,0.2437889575958252,0.08775973320007324,0.14116644859313965,0.1413731575012207,0.16870665550231934,1.0454826354980469,0.27206969261169434 diff --git a/results/combined/merges_timed/javamoney/jsr354-ri.csv b/results/combined/merges_timed/javamoney/jsr354-ri.csv index 7cd6562161..6efca9546c 100644 --- a/results/combined/merges_timed/javamoney/jsr354-ri.csv +++ b/results/combined/merges_timed/javamoney/jsr354-ri.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -124,refs/heads/master,bf07022ccddab3171412db1170d03ec24c77c41f,73024585e9348d07013a2cb4f10907f272638324,6ecd20662ad4ca485ca6f2b847c96be408866aeb,,2cabcbda40f4b38bd5f07ff71e46daf13a82c59c7492a5dc47ff5a49b3038115,Tests_passed,17b3f856026a0b53aa106d36233b3ff01c7eb3c421c8d90b4fe5cbfbb26f2e4a,Tests_passed,True,True,True,True,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,c54875644236b618258e3a223b4f9aff6e546c8143b5f7257a3ac0c944fdef6e,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,802f90b11e892e4188e2a89f726372c73555156b9da7b14f9755286bb1ad0f9f,Merge_failed,802f90b11e892e4188e2a89f726372c73555156b9da7b14f9755286bb1ad0f9f,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,844eda3244d6700bc3d32655b3ff68b28efee1ce1e89438fd4549f95ce8c5c8e,0.010616779327392578,0.030515193939208984,0.009700775146484375,0.03679060935974121,0.04014849662780762,0.009653806686401367,0.010231733322143555,0.10180521011352539,0.03409695625305176,0.06458187103271484,0.09945511817932129,0.12202334403991699,0.7209763526916504,0.2010180950164795 +124,refs/heads/master,bf07022ccddab3171412db1170d03ec24c77c41f,73024585e9348d07013a2cb4f10907f272638324,6ecd20662ad4ca485ca6f2b847c96be408866aeb,,2cabcbda40f4b38bd5f07ff71e46daf13a82c59c7492a5dc47ff5a49b3038115,Tests_passed,17b3f856026a0b53aa106d36233b3ff01c7eb3c421c8d90b4fe5cbfbb26f2e4a,Tests_passed,True,True,True,True,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,c54875644236b618258e3a223b4f9aff6e546c8143b5f7257a3ac0c944fdef6e,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,802f90b11e892e4188e2a89f726372c73555156b9da7b14f9755286bb1ad0f9f,Merge_failed,802f90b11e892e4188e2a89f726372c73555156b9da7b14f9755286bb1ad0f9f,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,844eda3244d6700bc3d32655b3ff68b28efee1ce1e89438fd4549f95ce8c5c8e,0.010616779327392578,0.030515193939208984,0.009700775146484375,0.03679060935974121,0.04014849662780762,0.009653806686401367,0.010231733322143555,0.10180521011352539,0.03409695625305176,0.09772968292236328,0.09827184677124023,0.12202334403991699,0.7209763526916504,0.2010180950164795 diff --git a/results/combined/merges_timed/javaparser/javaparser.csv b/results/combined/merges_timed/javaparser/javaparser.csv index a0dbd7b1ef..e8e099ddcb 100644 --- a/results/combined/merges_timed/javaparser/javaparser.csv +++ b/results/combined/merges_timed/javaparser/javaparser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3206,refs/remotes/origin/pull/3114,9037e57c930136b82fb779e21beaabfaf0a9f124,d2894b00357c4cf196c4868a71ee76ac74e08569,008452082678aa5e21593eb4c2fccd745f610efb,,129e930cc5d38fe894a1482585e8ba0b8de2b09dd08541cc4d08e767fe3b2525,Tests_passed,d2f8ead59255eb4042cf87c3cb8b172e0f195f3663e92d194d2f4ca53cc3ad1c,Tests_passed,True,True,True,True,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,041231272b5215e3fc9ce62c7be072d77218dae718b46e45890c9e4da4381bf8,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,2648e11ad0ea1d139e732686a09f189e581503452508b612eb10fdca0c201035,Merge_failed,2648e11ad0ea1d139e732686a09f189e581503452508b612eb10fdca0c201035,Merge_failed,a1b45e333d9ad5de16539956e3035fa704a1cad26d0f82bd5600028a92ff5670,Tests_passed,0648e6bdae51b980a44c431c6f2585e75d133aaa7fb58f3696eabdb4506bd78c,Merge_failed,1dd80cdba78b67b5b8f08bc1bd9e7f608a2e18ea2884401542fe62ec8ce235e8,0.059625864028930664,0.05851316452026367,0.06464624404907227,0.06537628173828125,0.06514167785644531,0.06690311431884766,0.0647580623626709,0.15731453895568848,0.1068732738494873,0.2748398780822754,0.27492833137512207,0.1680011749267578,1.9098291397094727,2.444018840789795 +3206,refs/remotes/origin/pull/3114,9037e57c930136b82fb779e21beaabfaf0a9f124,d2894b00357c4cf196c4868a71ee76ac74e08569,008452082678aa5e21593eb4c2fccd745f610efb,,129e930cc5d38fe894a1482585e8ba0b8de2b09dd08541cc4d08e767fe3b2525,Tests_passed,d2f8ead59255eb4042cf87c3cb8b172e0f195f3663e92d194d2f4ca53cc3ad1c,Tests_passed,True,True,True,True,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,041231272b5215e3fc9ce62c7be072d77218dae718b46e45890c9e4da4381bf8,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,2648e11ad0ea1d139e732686a09f189e581503452508b612eb10fdca0c201035,Merge_failed,2648e11ad0ea1d139e732686a09f189e581503452508b612eb10fdca0c201035,Merge_failed,a1b45e333d9ad5de16539956e3035fa704a1cad26d0f82bd5600028a92ff5670,Tests_passed,0648e6bdae51b980a44c431c6f2585e75d133aaa7fb58f3696eabdb4506bd78c,Merge_failed,1dd80cdba78b67b5b8f08bc1bd9e7f608a2e18ea2884401542fe62ec8ce235e8,0.059625864028930664,0.05851316452026367,0.06464624404907227,0.06537628173828125,0.06514167785644531,0.06690311431884766,0.0647580623626709,0.15731453895568848,0.1068732738494873,0.27483177185058594,0.2767040729522705,0.1680011749267578,1.9098291397094727,2.444018840789795 diff --git a/results/combined/merges_timed/javasoze/clue.csv b/results/combined/merges_timed/javasoze/clue.csv index afd834c371..1ad010caad 100644 --- a/results/combined/merges_timed/javasoze/clue.csv +++ b/results/combined/merges_timed/javasoze/clue.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,a0e4c4affb26558cd60574073c39681defdcf954,7a7a348040753f9ea915cb5a8f06e66fba1b9adc,d8ac1e2274071f67eb86643b71bc7704772a045e,,16221b2b7a88556270dea2d1ce13961f7ac08814fc04e2774206107367c9ead8,Tests_passed,bd0e1cdfe3c8392f6b2b533b04ea4fae823450491407739a0be829c63d6d5b21,Tests_passed,True,True,True,True,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,1da738049ded578cb340f5baa7e87fa9869bd29661c3906dd2997f646be79ad5,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,991e89574a7666ed331a0e9e93d90c2b4e54bb468cffe1f0b4e9df28a29eb9cb,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,237ab2beb534d42a88ffb8435069e6272ce8bac21bee88457800f6685f2d927a,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,69ee3c3513aa44f3ac4fc0c19a15aaffd8bc848cff81bc92ba69d696d6a8f140,Merge_failed,69ee3c3513aa44f3ac4fc0c19a15aaffd8bc848cff81bc92ba69d696d6a8f140,Merge_failed,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,974e587e953802e68e0723eac5d8fa155ee3176ec3e7bcf8c976ad14867f941b,0.04320573806762695,0.05829572677612305,0.04492664337158203,0.055115461349487305,0.03960061073303223,0.05060720443725586,0.06011557579040527,0.2890639305114746,0.07018733024597168,0.35025954246520996,0.3783252239227295,0.2709975242614746,1.9891140460968018,0.21024012565612793 +5,refs/heads/master,a0e4c4affb26558cd60574073c39681defdcf954,7a7a348040753f9ea915cb5a8f06e66fba1b9adc,d8ac1e2274071f67eb86643b71bc7704772a045e,,16221b2b7a88556270dea2d1ce13961f7ac08814fc04e2774206107367c9ead8,Tests_passed,bd0e1cdfe3c8392f6b2b533b04ea4fae823450491407739a0be829c63d6d5b21,Tests_passed,True,True,True,True,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,1da738049ded578cb340f5baa7e87fa9869bd29661c3906dd2997f646be79ad5,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,991e89574a7666ed331a0e9e93d90c2b4e54bb468cffe1f0b4e9df28a29eb9cb,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,237ab2beb534d42a88ffb8435069e6272ce8bac21bee88457800f6685f2d927a,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,69ee3c3513aa44f3ac4fc0c19a15aaffd8bc848cff81bc92ba69d696d6a8f140,Merge_failed,69ee3c3513aa44f3ac4fc0c19a15aaffd8bc848cff81bc92ba69d696d6a8f140,Merge_failed,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,974e587e953802e68e0723eac5d8fa155ee3176ec3e7bcf8c976ad14867f941b,0.04320573806762695,0.05829572677612305,0.04492664337158203,0.055115461349487305,0.03960061073303223,0.05060720443725586,0.06011557579040527,0.2890639305114746,0.07018733024597168,0.3723299503326416,0.3735530376434326,0.2709975242614746,1.9891140460968018,0.21024012565612793 diff --git a/results/combined/merges_timed/javen205/ijpay.csv b/results/combined/merges_timed/javen205/ijpay.csv index 1068766c71..2329091bba 100644 --- a/results/combined/merges_timed/javen205/ijpay.csv +++ b/results/combined/merges_timed/javen205/ijpay.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/dev,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,4d3acc222dce6df268df4e99930030e8a0031437,d051efa031ab0d5280925e575b430ee627086c32,,True,True,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,223b1bed8874c3797177407e6f82537ecfc5c3ddd73679957f9e0618fa446ae7,Tests_passed,True,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,0.06819415092468262,0.0421595573425293,0.05865836143493652,0.06672334671020508,0.07776737213134766,0.05490732192993164,0.07175993919372559,0.19119572639465332,0.04072237014770508,0.17919921875,0.20560193061828613,0.0994865894317627,0.9691572189331055,0.35503101348876953 +2,refs/heads/dev,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,4d3acc222dce6df268df4e99930030e8a0031437,d051efa031ab0d5280925e575b430ee627086c32,,True,True,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,223b1bed8874c3797177407e6f82537ecfc5c3ddd73679957f9e0618fa446ae7,Tests_passed,True,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,0.06819415092468262,0.0421595573425293,0.05865836143493652,0.06672334671020508,0.07776737213134766,0.05490732192993164,0.07175993919372559,0.19119572639465332,0.04072237014770508,0.17694377899169922,0.1761152744293213,0.0994865894317627,0.9691572189331055,0.35503101348876953 diff --git a/results/combined/merges_timed/jayway/awaitility.csv b/results/combined/merges_timed/jayway/awaitility.csv index 451980d0e8..91c271b00b 100644 --- a/results/combined/merges_timed/jayway/awaitility.csv +++ b/results/combined/merges_timed/jayway/awaitility.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,Tests_passed,True,True,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,5da5841c61b69626dca41611c5683ff7b3dea7a55d846b93a4171f681ef24d0c,Merge_failed,033d23b19ffce5b7c38e57ed620929bf493b677fbcaeb4d285f6fdc19defe797,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,0.013469696044921875,0.012835502624511719,0.013617277145385742,0.013886451721191406,0.013714790344238281,0.013603687286376953,0.013615131378173828,0.05480360984802246,0.01927328109741211,0.24210572242736816,0.24114131927490234,0.12537741661071777,1.1494598388671875,0.17308330535888672 +45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,Tests_passed,True,True,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,5da5841c61b69626dca41611c5683ff7b3dea7a55d846b93a4171f681ef24d0c,Merge_failed,033d23b19ffce5b7c38e57ed620929bf493b677fbcaeb4d285f6fdc19defe797,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,0.013469696044921875,0.012835502624511719,0.013617277145385742,0.013886451721191406,0.013714790344238281,0.013603687286376953,0.013615131378173828,0.05480360984802246,0.01927328109741211,0.23815250396728516,0.23962736129760742,0.12537741661071777,1.1494598388671875,0.17308330535888672 diff --git a/results/combined/merges_timed/jboss-logging/jboss-logging-tools.csv b/results/combined/merges_timed/jboss-logging/jboss-logging-tools.csv index f37eddc669..46d0ccd691 100644 --- a/results/combined/merges_timed/jboss-logging/jboss-logging-tools.csv +++ b/results/combined/merges_timed/jboss-logging/jboss-logging-tools.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -54,refs/heads/main,83df5d49064f76824cf23bad4e7fcb8776af855e,818acf752e1230fa945be7a2ccab3ee88665a32c,f7c761bb675a4ef7a0b7b5e245ce030f478546d1,,True,True,0fe51dc2c490d0382682c06a1b2bc93bf005e557d0f09443bdc71e4ec920637b,Tests_passed,d27cfeddb1cd3c49098d3b4a3b126fdd1c48d522cb2a19814f769842d1f8fa1c,Tests_passed,True,True,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,0.04142045974731445,0.04161572456359863,0.0398862361907959,0.043140411376953125,0.05437111854553223,0.04684734344482422,0.05645585060119629,0.1683802604675293,0.045902252197265625,0.16389846801757812,0.16216349601745605,0.10407209396362305,1.1373326778411865,0.20253896713256836 +54,refs/heads/main,83df5d49064f76824cf23bad4e7fcb8776af855e,818acf752e1230fa945be7a2ccab3ee88665a32c,f7c761bb675a4ef7a0b7b5e245ce030f478546d1,,True,True,0fe51dc2c490d0382682c06a1b2bc93bf005e557d0f09443bdc71e4ec920637b,Tests_passed,d27cfeddb1cd3c49098d3b4a3b126fdd1c48d522cb2a19814f769842d1f8fa1c,Tests_passed,True,True,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,0.04142045974731445,0.04161572456359863,0.0398862361907959,0.043140411376953125,0.05437111854553223,0.04684734344482422,0.05645585060119629,0.1683802604675293,0.045902252197265625,0.1600208282470703,0.1617269515991211,0.10407209396362305,1.1373326778411865,0.20253896713256836 diff --git a/results/combined/merges_timed/jboss-modules/jboss-modules.csv b/results/combined/merges_timed/jboss-modules/jboss-modules.csv index ff9379ba1e..b98d5d2747 100644 --- a/results/combined/merges_timed/jboss-modules/jboss-modules.csv +++ b/results/combined/merges_timed/jboss-modules/jboss-modules.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -156,refs/heads/2.x,5e3d058d3c58015f9f6c5801c52285761a76f01c,2772d3e079099f08b4bd32d81f26549bb3d6a88c,32ffe5d4942aea74307f6146613c19d7a086b7b3,,True,True,fccd9de43811ced4c6b325316a39ade676de7b313ab3c9b8207426133f40c103,Tests_passed,677fa2a3b5ba4290f87612f943557e529f86d253eba5a712b1d8362d0a699c79,Tests_passed,True,True,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,0.04726243019104004,0.04599499702453613,0.05318498611450195,0.05481362342834473,0.05169391632080078,0.05576968193054199,0.04208040237426758,0.1630992889404297,0.05123543739318848,0.15832924842834473,0.159806489944458,0.11684799194335938,0.7817223072052002,0.23943114280700684 +156,refs/heads/2.x,5e3d058d3c58015f9f6c5801c52285761a76f01c,2772d3e079099f08b4bd32d81f26549bb3d6a88c,32ffe5d4942aea74307f6146613c19d7a086b7b3,,True,True,fccd9de43811ced4c6b325316a39ade676de7b313ab3c9b8207426133f40c103,Tests_passed,677fa2a3b5ba4290f87612f943557e529f86d253eba5a712b1d8362d0a699c79,Tests_passed,True,True,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,0.04726243019104004,0.04599499702453613,0.05318498611450195,0.05481362342834473,0.05169391632080078,0.05576968193054199,0.04208040237426758,0.1630992889404297,0.05123543739318848,0.15483498573303223,0.1554412841796875,0.11684799194335938,0.7817223072052002,0.23943114280700684 diff --git a/results/combined/merges_timed/jboss-msc/jboss-msc.csv b/results/combined/merges_timed/jboss-msc/jboss-msc.csv index 144e58094c..d5a4980c6d 100644 --- a/results/combined/merges_timed/jboss-msc/jboss-msc.csv +++ b/results/combined/merges_timed/jboss-msc/jboss-msc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -44,refs/heads/main,2109ea6f82b5ab20a1a6b918654f7f0e990a5c06,98ab9419c2e91f16c31e50f5acf9b5f55a7da7ee,1a17f7befaa22cd08fe07c21033bc450bd09f5f7,,13114c37ee83516642ac08e9fd85c70840d9ca7eafada24af9db523a7969475f,Tests_passed,35d503dbd81d2adeb3a10bd4c33c1c2d41556ade7ecf209397a6c4fbaa995e89,Tests_passed,True,True,True,True,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,7846f6f0411e6dce3c20697a249505db79c8b66242344d4291e5f794e08feebb,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,c1ced20923eda4ade9a51d3cfee10aa04118efb0bd926d99cfa5d753ee7eb99e,Merge_failed,c1ced20923eda4ade9a51d3cfee10aa04118efb0bd926d99cfa5d753ee7eb99e,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Merge_failed,8b70cd230a219f921b4e91165bf9b01bd9903109db01eaa513d45c7bd246fb66,0.020793437957763672,0.021051883697509766,0.022742509841918945,0.022945165634155273,0.023035287857055664,0.02282261848449707,0.02260279655456543,0.06737852096557617,0.0278933048248291,0.30739569664001465,0.3070847988128662,0.13423871994018555,4.043978691101074,0.18629813194274902 +44,refs/heads/main,2109ea6f82b5ab20a1a6b918654f7f0e990a5c06,98ab9419c2e91f16c31e50f5acf9b5f55a7da7ee,1a17f7befaa22cd08fe07c21033bc450bd09f5f7,,13114c37ee83516642ac08e9fd85c70840d9ca7eafada24af9db523a7969475f,Tests_passed,35d503dbd81d2adeb3a10bd4c33c1c2d41556ade7ecf209397a6c4fbaa995e89,Tests_passed,True,True,True,True,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,7846f6f0411e6dce3c20697a249505db79c8b66242344d4291e5f794e08feebb,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,c1ced20923eda4ade9a51d3cfee10aa04118efb0bd926d99cfa5d753ee7eb99e,Merge_failed,c1ced20923eda4ade9a51d3cfee10aa04118efb0bd926d99cfa5d753ee7eb99e,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Merge_failed,8b70cd230a219f921b4e91165bf9b01bd9903109db01eaa513d45c7bd246fb66,0.020793437957763672,0.021051883697509766,0.022742509841918945,0.022945165634155273,0.023035287857055664,0.02282261848449707,0.02260279655456543,0.06737852096557617,0.0278933048248291,0.29641032218933105,0.29608750343322754,0.13423871994018555,4.043978691101074,0.18629813194274902 diff --git a/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv b/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv index 3ddd46c31d..55a70fd66d 100644 --- a/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv +++ b/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -204,refs/remotes/origin/5.0,050c1fa2551eea88f7caf1f051ffea5b6fdfebf2,db1be1ce0c8c47cfc1fb32e1f9cefd47b4c96661,7ac33ddc3585b9685a6d7866c6b596389bb55110,,True,True,37b6db33953d2a0ddde294da73adfa49e2d6335f8a14e3b06404fef1ec24b54d,Tests_passed,52a2db13cbf3c6cdb6916d09a47ffbb7907f2507da601405d68b4aa8306fe5ac,Tests_passed,True,True,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,18d889f9229a8c1fd9709f4378e188a0e8c9240fdd88cb949a0143821a06a5fe,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,0.014517545700073242,0.015254974365234375,0.018163681030273438,0.017380952835083008,0.01770186424255371,0.017651081085205078,0.01753997802734375,0.04570174217224121,0.015183687210083008,0.1689600944519043,0.16906523704528809,0.0704038143157959,1.0225939750671387,0.19474554061889648 +204,refs/remotes/origin/5.0,050c1fa2551eea88f7caf1f051ffea5b6fdfebf2,db1be1ce0c8c47cfc1fb32e1f9cefd47b4c96661,7ac33ddc3585b9685a6d7866c6b596389bb55110,,True,True,37b6db33953d2a0ddde294da73adfa49e2d6335f8a14e3b06404fef1ec24b54d,Tests_passed,52a2db13cbf3c6cdb6916d09a47ffbb7907f2507da601405d68b4aa8306fe5ac,Tests_passed,True,True,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,18d889f9229a8c1fd9709f4378e188a0e8c9240fdd88cb949a0143821a06a5fe,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,0.014517545700073242,0.015254974365234375,0.018163681030273438,0.017380952835083008,0.01770186424255371,0.017651081085205078,0.01753997802734375,0.04570174217224121,0.015183687210083008,0.16536188125610352,0.16708755493164062,0.0704038143157959,1.0225939750671387,0.19474554061889648 diff --git a/results/combined/merges_timed/jboss/jboss-jacc-api_spec.csv b/results/combined/merges_timed/jboss/jboss-jacc-api_spec.csv index e1502b823c..2b7d2dff69 100644 --- a/results/combined/merges_timed/jboss/jboss-jacc-api_spec.csv +++ b/results/combined/merges_timed/jboss/jboss-jacc-api_spec.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,c462f40aa4634e8f135b9c5231d3de797d3290b1,8a114ee6daebc64bf9fbd46e097d197f46946220,e534feedc32806baf77693c27558b17bb9023eaf,,d7d73dff718cc5e2355b31660c858940ca925af56b2e841338ad742ac3fddb22,Tests_passed,566fce4c7484fd2b63f24635cd5dbfbf9216c1f7d7b449ebdc07f10b11121c82,Tests_passed,True,True,True,True,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,0.041670799255371094,0.04214191436767578,0.04556107521057129,0.0452730655670166,0.03881359100341797,0.04252314567565918,0.04600977897644043,0.1659862995147705,0.03918123245239258,0.17299723625183105,0.17463016510009766,0.09315776824951172,0.8557000160217285,0.20578289031982422 +3,refs/heads/master,c462f40aa4634e8f135b9c5231d3de797d3290b1,8a114ee6daebc64bf9fbd46e097d197f46946220,e534feedc32806baf77693c27558b17bb9023eaf,,d7d73dff718cc5e2355b31660c858940ca925af56b2e841338ad742ac3fddb22,Tests_passed,566fce4c7484fd2b63f24635cd5dbfbf9216c1f7d7b449ebdc07f10b11121c82,Tests_passed,True,True,True,True,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,0.041670799255371094,0.04214191436767578,0.04556107521057129,0.0452730655670166,0.03881359100341797,0.04252314567565918,0.04600977897644043,0.1659862995147705,0.03918123245239258,0.1645219326019287,0.16542339324951172,0.09315776824951172,0.8557000160217285,0.20578289031982422 diff --git a/results/combined/merges_timed/jbossas/jboss-dmr.csv b/results/combined/merges_timed/jbossas/jboss-dmr.csv index 56f1d4e072..864c1b823d 100644 --- a/results/combined/merges_timed/jbossas/jboss-dmr.csv +++ b/results/combined/merges_timed/jbossas/jboss-dmr.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/main,2a31e46d096142fa30d5ddcf584cd0c971ada12a,c0430fb6272c5beb96eeff49c0c7677f84be9665,1696eff49c95b72f32a68cfe701f67d4771e8592,,True,True,0d8a983b2b6d09b2503f6192889ddadf7000165d821ef1e7f6548298a2f6df34,Tests_passed,f3cf155211d0182fcb9d3ee80f11a8a50ef0a8dc05cca58ee304a011be0e0343,Tests_passed,True,True,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,0.0456387996673584,0.029156208038330078,0.04403281211853027,0.018634796142578125,0.0423736572265625,0.025338411331176758,0.0523381233215332,0.15220236778259277,0.03428387641906738,0.20720696449279785,0.20404839515686035,0.09449577331542969,0.02856302261352539,0.32622694969177246 +16,refs/heads/main,2a31e46d096142fa30d5ddcf584cd0c971ada12a,c0430fb6272c5beb96eeff49c0c7677f84be9665,1696eff49c95b72f32a68cfe701f67d4771e8592,,True,True,0d8a983b2b6d09b2503f6192889ddadf7000165d821ef1e7f6548298a2f6df34,Tests_passed,f3cf155211d0182fcb9d3ee80f11a8a50ef0a8dc05cca58ee304a011be0e0343,Tests_passed,True,True,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,0.0456387996673584,0.029156208038330078,0.04403281211853027,0.018634796142578125,0.0423736572265625,0.025338411331176758,0.0523381233215332,0.15220236778259277,0.03428387641906738,0.19767165184020996,0.2019641399383545,0.09449577331542969,0.02856302261352539,0.32622694969177246 diff --git a/results/combined/merges_timed/jbossas/remoting-jmx.csv b/results/combined/merges_timed/jbossas/remoting-jmx.csv index 3e8c692791..16bb0ab585 100644 --- a/results/combined/merges_timed/jbossas/remoting-jmx.csv +++ b/results/combined/merges_timed/jbossas/remoting-jmx.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/3.1.x,b9ca42ed29dac295c11413a095c7f20a4c818ac4,da141df9a273d361c2317364add9302e66b6ceb0,9dc2bb688ee3b5be65dac1bec419c816d734ead8,,True,True,fd315bafa64a993c9ce029667b7cc6f59f162d60ac2b6e8c4f2ff640348a9c1f,Tests_passed,091b3f0829802b885280dfd2f870688e02132fbdfed6a90f0d5bda35d162492a,Tests_passed,True,True,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,0.019644498825073242,0.019719839096069336,0.021045446395874023,0.021237850189208984,0.02124190330505371,0.021291017532348633,0.020477771759033203,0.06156635284423828,0.01968860626220703,0.1693403720855713,0.1696767807006836,0.12647604942321777,0.899738073348999,0.23583221435546875 +3,refs/heads/3.1.x,b9ca42ed29dac295c11413a095c7f20a4c818ac4,da141df9a273d361c2317364add9302e66b6ceb0,9dc2bb688ee3b5be65dac1bec419c816d734ead8,,True,True,fd315bafa64a993c9ce029667b7cc6f59f162d60ac2b6e8c4f2ff640348a9c1f,Tests_passed,091b3f0829802b885280dfd2f870688e02132fbdfed6a90f0d5bda35d162492a,Tests_passed,True,True,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,0.019644498825073242,0.019719839096069336,0.021045446395874023,0.021237850189208984,0.02124190330505371,0.021291017532348633,0.020477771759033203,0.06156635284423828,0.01968860626220703,0.16797375679016113,0.1669011116027832,0.12647604942321777,0.899738073348999,0.23583221435546875 diff --git a/results/combined/merges_timed/jbossas/staxmapper.csv b/results/combined/merges_timed/jbossas/staxmapper.csv index 096470c721..7426ea1f29 100644 --- a/results/combined/merges_timed/jbossas/staxmapper.csv +++ b/results/combined/merges_timed/jbossas/staxmapper.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/main,8df8c6aad07328ccec3c4326485074342d85673b,6c21060a407fa75ffb47a90b4aa8a3f929ea08db,625397a3c0056de4fbc20ddf6cddb8f47a00b695,,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,877fbef5f9ac8b3cf678987c016f228ea215959a773fbd8c4e5d818f35e949b5,Tests_passed,True,True,True,True,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,0.043792009353637695,0.043349266052246094,0.011822700500488281,0.04303693771362305,0.04403257369995117,0.04424643516540527,0.04686713218688965,0.16006827354431152,0.044365644454956055,0.1578230857849121,0.15743350982666016,0.1146235466003418,1.0340924263000488,0.19377589225769043 +11,refs/heads/main,8df8c6aad07328ccec3c4326485074342d85673b,6c21060a407fa75ffb47a90b4aa8a3f929ea08db,625397a3c0056de4fbc20ddf6cddb8f47a00b695,,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,877fbef5f9ac8b3cf678987c016f228ea215959a773fbd8c4e5d818f35e949b5,Tests_passed,True,True,True,True,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,0.043792009353637695,0.043349266052246094,0.011822700500488281,0.04303693771362305,0.04403257369995117,0.04424643516540527,0.04686713218688965,0.16006827354431152,0.044365644454956055,0.1543433666229248,0.15459609031677246,0.1146235466003418,1.0340924263000488,0.19377589225769043 diff --git a/results/combined/merges_timed/jcabi/jcabi-aspects.csv b/results/combined/merges_timed/jcabi/jcabi-aspects.csv index ce1341bc69..4000d289c7 100644 --- a/results/combined/merges_timed/jcabi/jcabi-aspects.csv +++ b/results/combined/merges_timed/jcabi/jcabi-aspects.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/master,5780cbf85c5170db6de69ea735b8ccc73361b05f,bfd32ffe36542cfeb011e18f745c306e0cc59570,1d2552cb4cc1242e3c20432ffadb304808681d8e,,True,True,a067de3f37170fe8342e109fdc0e2f97293756f8b5bf2569246227a2fe4e69c1,Tests_passed,dd5238278ff1088ec09a93db0f3313fd4ef1ef2b71b017bef5ae7f11c4bda8c0,Tests_passed,True,True,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,858f871f3902c612d097966b566460c6be687c3ac899834f4098e89b5a932bfb,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,0.06029176712036133,0.04261970520019531,0.04115581512451172,0.04136204719543457,0.06234288215637207,0.04661226272583008,0.05308413505554199,0.18850088119506836,0.04521346092224121,0.17645835876464844,0.17718791961669922,0.11144304275512695,0.04622626304626465,0.23009061813354492 +31,refs/heads/master,5780cbf85c5170db6de69ea735b8ccc73361b05f,bfd32ffe36542cfeb011e18f745c306e0cc59570,1d2552cb4cc1242e3c20432ffadb304808681d8e,,True,True,a067de3f37170fe8342e109fdc0e2f97293756f8b5bf2569246227a2fe4e69c1,Tests_passed,dd5238278ff1088ec09a93db0f3313fd4ef1ef2b71b017bef5ae7f11c4bda8c0,Tests_passed,True,True,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,858f871f3902c612d097966b566460c6be687c3ac899834f4098e89b5a932bfb,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,0.06029176712036133,0.04261970520019531,0.04115581512451172,0.04136204719543457,0.06234288215637207,0.04661226272583008,0.05308413505554199,0.18850088119506836,0.04521346092224121,0.17490673065185547,0.17380833625793457,0.11144304275512695,0.04622626304626465,0.23009061813354492 diff --git a/results/combined/merges_timed/jcabi/jcabi-dynamo.csv b/results/combined/merges_timed/jcabi/jcabi-dynamo.csv index dc57e3ceee..2ad5899912 100644 --- a/results/combined/merges_timed/jcabi/jcabi-dynamo.csv +++ b/results/combined/merges_timed/jcabi/jcabi-dynamo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -29,refs/heads/master,06bfb00c7a266e151242c512dc82a81be6b92d76,1a80242486d7908971f3b156974f3f63c94bbda9,ea8513f79eb933f61166d8f83b52df386ff54a8c,,True,True,17dc2c7d04982a7e8869aa0848337fc500b2fc6282eefeaef59058f281822914,Tests_passed,d2aa2c8f411d33b809f1460c91f99a8239c06539a84b61aef039e6a365118e39,Tests_passed,True,True,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,6b87e97ae49cbcd3c708af47acda204ca3a6123e30140fee6f7f7ece9ffb88c2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,d12276576421abf2ec3dedfe2547992514bebfd1c680014f8f06be66f52439da,Merge_failed,d12276576421abf2ec3dedfe2547992514bebfd1c680014f8f06be66f52439da,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,0.01440882682800293,0.014430999755859375,0.014841556549072266,0.01434779167175293,0.014645814895629883,0.014591217041015625,0.014533519744873047,0.045729875564575195,0.022128820419311523,0.08831548690795898,0.08669924736022949,0.07330751419067383,0.017394542694091797,0.18024349212646484 +29,refs/heads/master,06bfb00c7a266e151242c512dc82a81be6b92d76,1a80242486d7908971f3b156974f3f63c94bbda9,ea8513f79eb933f61166d8f83b52df386ff54a8c,,True,True,17dc2c7d04982a7e8869aa0848337fc500b2fc6282eefeaef59058f281822914,Tests_passed,d2aa2c8f411d33b809f1460c91f99a8239c06539a84b61aef039e6a365118e39,Tests_passed,True,True,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,6b87e97ae49cbcd3c708af47acda204ca3a6123e30140fee6f7f7ece9ffb88c2,Merge_failed,f026a63e1184d918c2fea5cc4141fd7252704b13f36923aae2f5e2fcc0e2b3f2,Merge_failed,d12276576421abf2ec3dedfe2547992514bebfd1c680014f8f06be66f52439da,Merge_failed,d12276576421abf2ec3dedfe2547992514bebfd1c680014f8f06be66f52439da,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,0.01440882682800293,0.014430999755859375,0.014841556549072266,0.01434779167175293,0.014645814895629883,0.014591217041015625,0.014533519744873047,0.045729875564575195,0.022128820419311523,0.08720231056213379,0.08764457702636719,0.07330751419067383,0.017394542694091797,0.18024349212646484 diff --git a/results/combined/merges_timed/jcabi/jcabi-dynamodb-maven-plugin.csv b/results/combined/merges_timed/jcabi/jcabi-dynamodb-maven-plugin.csv index 50309be184..a250581ac7 100644 --- a/results/combined/merges_timed/jcabi/jcabi-dynamodb-maven-plugin.csv +++ b/results/combined/merges_timed/jcabi/jcabi-dynamodb-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -36,refs/heads/master,f338c10bd50912603f7c310831244485e9af2df3,1d7c27797979516e6ab4052e3aac3651378da823,2c1bb0dfdc2cb70fab5a08c25269727c6058f019,,True,True,57d2272071c087975e1b6966f3eca7e31271f0fa0c51cbfb1f7366f494454baf,Tests_passed,dce284cf7b0a85d53b6982716e7a003920af2477db966b8d7f266026e0ee3440,Tests_passed,True,True,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,2afb34db8ee57257375a4378de0fd8a937cb58f5cf20f2c3d9d0dcccc62c36d5,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,0.011803388595581055,0.011474370956420898,0.012703657150268555,0.012378454208374023,0.01265716552734375,0.01243281364440918,0.01274561882019043,0.03861808776855469,0.011671304702758789,0.15857672691345215,0.15840816497802734,0.06675982475280762,0.01475977897644043,0.1623063087463379 +36,refs/heads/master,f338c10bd50912603f7c310831244485e9af2df3,1d7c27797979516e6ab4052e3aac3651378da823,2c1bb0dfdc2cb70fab5a08c25269727c6058f019,,True,True,57d2272071c087975e1b6966f3eca7e31271f0fa0c51cbfb1f7366f494454baf,Tests_passed,dce284cf7b0a85d53b6982716e7a003920af2477db966b8d7f266026e0ee3440,Tests_passed,True,True,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,2afb34db8ee57257375a4378de0fd8a937cb58f5cf20f2c3d9d0dcccc62c36d5,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,0.011803388595581055,0.011474370956420898,0.012703657150268555,0.012378454208374023,0.01265716552734375,0.01243281364440918,0.01274561882019043,0.03861808776855469,0.011671304702758789,0.15596842765808105,0.15820956230163574,0.06675982475280762,0.01475977897644043,0.1623063087463379 diff --git a/results/combined/merges_timed/jcabi/jcabi-github.csv b/results/combined/merges_timed/jcabi/jcabi-github.csv index a98428acbb..b422e8ff69 100644 --- a/results/combined/merges_timed/jcabi/jcabi-github.csv +++ b/results/combined/merges_timed/jcabi/jcabi-github.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -834,refs/heads/master,3f10b3378f1939d1144bef90dfbad5e3c43071b5,880a05dd9f52b987255c6e012146fb31d69d3546,28426aeae14b3edc4fadf021501f8b4d6f98f66a,,True,True,2775dc74f5680ba237ac25aed61d18db659d7a6a7ffb284f44d37d4b189826b8,Tests_passed,7622bc13f9038a64ef459d326c811bf274dd0dea36af697dbb0d383eeed69e68,Tests_passed,True,True,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,b5201c58aa1bb3f8b2db30e9efd39c45437d52222563c2936333bf6bbe7b0131,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,9d6b935598c4e64d3801d925bac39a42c34e407323f065ad1051e6f64cb8f679,Merge_failed,9d6b935598c4e64d3801d925bac39a42c34e407323f065ad1051e6f64cb8f679,Merge_failed,03ca1784da21ac353b7b4cf5922b44645193c32d2390ab01527f6f35e8052ed4,Tests_passed,177f7bbde55cd639e68aa5e181054aa3434429dcb151b306564ad1d7bea25f8e,Merge_failed,f14be4eac84afbf6bb4138c8640a25fbf4d65113bd0c679373dbd7c443264727,0.0524444580078125,0.05043792724609375,0.05579018592834473,0.05707597732543945,0.05350208282470703,0.05733084678649902,0.0527186393737793,0.19909405708312988,0.09345436096191406,0.09044671058654785,0.090057373046875,0.11261892318725586,0.5503950119018555,0.29142069816589355 +834,refs/heads/master,3f10b3378f1939d1144bef90dfbad5e3c43071b5,880a05dd9f52b987255c6e012146fb31d69d3546,28426aeae14b3edc4fadf021501f8b4d6f98f66a,,True,True,2775dc74f5680ba237ac25aed61d18db659d7a6a7ffb284f44d37d4b189826b8,Tests_passed,7622bc13f9038a64ef459d326c811bf274dd0dea36af697dbb0d383eeed69e68,Tests_passed,True,True,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,b5201c58aa1bb3f8b2db30e9efd39c45437d52222563c2936333bf6bbe7b0131,Merge_failed,57ba56cf775152126cc9f0af37534903fe79999cd3f48386ab73b604c3248028,Merge_failed,9d6b935598c4e64d3801d925bac39a42c34e407323f065ad1051e6f64cb8f679,Merge_failed,9d6b935598c4e64d3801d925bac39a42c34e407323f065ad1051e6f64cb8f679,Merge_failed,03ca1784da21ac353b7b4cf5922b44645193c32d2390ab01527f6f35e8052ed4,Tests_passed,177f7bbde55cd639e68aa5e181054aa3434429dcb151b306564ad1d7bea25f8e,Merge_failed,f14be4eac84afbf6bb4138c8640a25fbf4d65113bd0c679373dbd7c443264727,0.0524444580078125,0.05043792724609375,0.05579018592834473,0.05707597732543945,0.05350208282470703,0.05733084678649902,0.0527186393737793,0.19909405708312988,0.09345436096191406,0.0901491641998291,0.0899345874786377,0.11261892318725586,0.5503950119018555,0.29142069816589355 diff --git a/results/combined/merges_timed/jcabi/jcabi-http.csv b/results/combined/merges_timed/jcabi/jcabi-http.csv index 4fd7bc8d93..834bed9fb0 100644 --- a/results/combined/merges_timed/jcabi/jcabi-http.csv +++ b/results/combined/merges_timed/jcabi/jcabi-http.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -81,refs/heads/master,0c63dd0c7521670361a6b8b54f23fc4efae247cb,6ce8a0910083d6f849d7802efe761cc792e0e002,e0aeb6b2fe7f76bbc7f9f1e31942882ff91ad79d,,True,True,70decc44afc9f2545fa6c82bac15dcfe7c0b78e932ee38230dcaea7b9bdb2c3a,Tests_passed,5bb4614d01983011c60658d7ca972507fb1f2da46923b165e62075768f2de1e1,Tests_passed,True,True,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,0.035778045654296875,0.016675233840942383,0.027785778045654297,0.04454994201660156,0.05981755256652832,0.032016754150390625,0.047028541564941406,0.19626998901367188,0.0206449031829834,0.16061735153198242,0.160722017288208,0.10677933692932129,0.04112839698791504,0.213667631149292 +81,refs/heads/master,0c63dd0c7521670361a6b8b54f23fc4efae247cb,6ce8a0910083d6f849d7802efe761cc792e0e002,e0aeb6b2fe7f76bbc7f9f1e31942882ff91ad79d,,True,True,70decc44afc9f2545fa6c82bac15dcfe7c0b78e932ee38230dcaea7b9bdb2c3a,Tests_passed,5bb4614d01983011c60658d7ca972507fb1f2da46923b165e62075768f2de1e1,Tests_passed,True,True,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,0.035778045654296875,0.016675233840942383,0.027785778045654297,0.04454994201660156,0.05981755256652832,0.032016754150390625,0.047028541564941406,0.19626998901367188,0.0206449031829834,0.1578664779663086,0.1576695442199707,0.10677933692932129,0.04112839698791504,0.213667631149292 diff --git a/results/combined/merges_timed/jcabi/jcabi-jdbc.csv b/results/combined/merges_timed/jcabi/jcabi-jdbc.csv index 0a6a2bd928..e59e31a3c8 100644 --- a/results/combined/merges_timed/jcabi/jcabi-jdbc.csv +++ b/results/combined/merges_timed/jcabi/jcabi-jdbc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -80,refs/heads/master,40e95d792465ff63e698273a475a8b256cf11a5b,0955e011d84b9cb0365fb3d208c1ed279679e93e,4878681804738bae9a1f3140c5e5a67eeaa17bd5,,True,True,a86414b4ca81197421bf87e8a766fd154cd787f735ba36f6e34e5b442f0b2fa4,Tests_passed,ea01f49037426a0c9c8e202564398b3ba587d7864410bbbac099e194d877419c,Tests_passed,True,True,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,4243c3a926839f861edecc7743c0d25f689f1e91981b45b8e0dd64346b0d289c,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,152cd5603e786377c157a7cfd31baed6d7d2e37761b5558306bf4c0ef8cb4f6f,Merge_failed,152cd5603e786377c157a7cfd31baed6d7d2e37761b5558306bf4c0ef8cb4f6f,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Merge_failed,9383aad8b37d8907346d2f7a56250dcd0e64ed23447724275bdbdb82c98b357e,0.041512489318847656,0.0423121452331543,0.045001983642578125,0.04242086410522461,0.04012417793273926,0.03906106948852539,0.034204721450805664,0.29531407356262207,0.10034346580505371,0.17494702339172363,0.17474579811096191,0.23877382278442383,1.9275801181793213,0.19100117683410645 +80,refs/heads/master,40e95d792465ff63e698273a475a8b256cf11a5b,0955e011d84b9cb0365fb3d208c1ed279679e93e,4878681804738bae9a1f3140c5e5a67eeaa17bd5,,True,True,a86414b4ca81197421bf87e8a766fd154cd787f735ba36f6e34e5b442f0b2fa4,Tests_passed,ea01f49037426a0c9c8e202564398b3ba587d7864410bbbac099e194d877419c,Tests_passed,True,True,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,4243c3a926839f861edecc7743c0d25f689f1e91981b45b8e0dd64346b0d289c,Merge_failed,be7e4592ee900970ea6ac3f2436e8fa1a0a4b019454fe0a45e0f0d049cad29a5,Merge_failed,152cd5603e786377c157a7cfd31baed6d7d2e37761b5558306bf4c0ef8cb4f6f,Merge_failed,152cd5603e786377c157a7cfd31baed6d7d2e37761b5558306bf4c0ef8cb4f6f,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Merge_failed,9383aad8b37d8907346d2f7a56250dcd0e64ed23447724275bdbdb82c98b357e,0.041512489318847656,0.0423121452331543,0.045001983642578125,0.04242086410522461,0.04012417793273926,0.03906106948852539,0.034204721450805664,0.29531407356262207,0.10034346580505371,0.17443442344665527,0.17395687103271484,0.23877382278442383,1.9275801181793213,0.19100117683410645 diff --git a/results/combined/merges_timed/jcabi/jcabi-manifests.csv b/results/combined/merges_timed/jcabi/jcabi-manifests.csv index 54a291d2bd..7b87e65f50 100644 --- a/results/combined/merges_timed/jcabi/jcabi-manifests.csv +++ b/results/combined/merges_timed/jcabi/jcabi-manifests.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/remotes/origin/pull/45,84bccb34de372d8914bcc9c797705a155a71c516,6fab189edce64223226719803772cd8c9e98d0f6,feccf89447be6c4e13fc814d662d5d1b11f0c1c0,,True,True,71528c2302785399766e84ca685268448f89ab87aa8e9c99ccb3fed9c096c311,Tests_passed,0e96359525af7d5c6d41b547e1248138efda706a9a658442dd57a8d1460c3e6b,Tests_passed,True,True,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,9e85fef7ba0378babf6bfa1a4b110cddb7d9b2e6ae33c4b0c73e494c9dc2443d,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,cd6c4ef43c5a8a446e15c2aea43ec1d188d89ea0af4f78266bcf82a68c234b8a,Merge_failed,cd6c4ef43c5a8a446e15c2aea43ec1d188d89ea0af4f78266bcf82a68c234b8a,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,7dd2c44b5fbe73b0bd19b47738d4d4b3984fae91b0a4e3cb646fec166055e7c8,Merge_failed,7dd2c44b5fbe73b0bd19b47738d4d4b3984fae91b0a4e3cb646fec166055e7c8,0.0432126522064209,0.05137968063354492,0.05076861381530762,0.04938364028930664,0.04836535453796387,0.05072188377380371,0.05404520034790039,0.24791812896728516,0.07177114486694336,0.22446298599243164,0.22377300262451172,0.17858219146728516,0.03897666931152344,0.20541715621948242 +11,refs/remotes/origin/pull/45,84bccb34de372d8914bcc9c797705a155a71c516,6fab189edce64223226719803772cd8c9e98d0f6,feccf89447be6c4e13fc814d662d5d1b11f0c1c0,,True,True,71528c2302785399766e84ca685268448f89ab87aa8e9c99ccb3fed9c096c311,Tests_passed,0e96359525af7d5c6d41b547e1248138efda706a9a658442dd57a8d1460c3e6b,Tests_passed,True,True,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,9e85fef7ba0378babf6bfa1a4b110cddb7d9b2e6ae33c4b0c73e494c9dc2443d,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,cd6c4ef43c5a8a446e15c2aea43ec1d188d89ea0af4f78266bcf82a68c234b8a,Merge_failed,cd6c4ef43c5a8a446e15c2aea43ec1d188d89ea0af4f78266bcf82a68c234b8a,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,7dd2c44b5fbe73b0bd19b47738d4d4b3984fae91b0a4e3cb646fec166055e7c8,Merge_failed,7dd2c44b5fbe73b0bd19b47738d4d4b3984fae91b0a4e3cb646fec166055e7c8,0.0432126522064209,0.05137968063354492,0.05076861381530762,0.04938364028930664,0.04836535453796387,0.05072188377380371,0.05404520034790039,0.24791812896728516,0.07177114486694336,0.22300982475280762,0.22274017333984375,0.17858219146728516,0.03897666931152344,0.20541715621948242 diff --git a/results/combined/merges_timed/jcabi/jcabi-w3c.csv b/results/combined/merges_timed/jcabi/jcabi-w3c.csv index 7ce9de8ee5..50e511b825 100644 --- a/results/combined/merges_timed/jcabi/jcabi-w3c.csv +++ b/results/combined/merges_timed/jcabi/jcabi-w3c.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,23fe00a21fa09bd2e74031f21bbe216fcce51734,c43bab15e5de136c1c5e2fa5e7754436ac481328,dceae84af1401fd04c808a779f322f31f7d1e543,,9dbac1a006de34bda6583b276196754eb03bedf4c3638faf2ffcb9fa742531d8,Tests_passed,1c4495d4eec1ff55e7ec34fc6667cb0203635e076f710813a16f96e8f8e97116,Tests_passed,True,True,True,True,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,4456d7797372795ef47cfb92ca0bbe94307fd733b353e69f84894fae9fa6cb03,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b9c178050510ef89f21ebc1f7d3613f423e990cd2b75cc85bb51481d09c64f70,Merge_failed,b9c178050510ef89f21ebc1f7d3613f423e990cd2b75cc85bb51481d09c64f70,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,0.05121588706970215,0.05019712448120117,0.044692277908325195,0.042111873626708984,0.0411219596862793,0.04586982727050781,0.04234743118286133,0.16963696479797363,0.07036066055297852,0.06460428237915039,0.06439208984375,0.11520838737487793,0.03979325294494629,0.17962121963500977 +11,refs/heads/master,23fe00a21fa09bd2e74031f21bbe216fcce51734,c43bab15e5de136c1c5e2fa5e7754436ac481328,dceae84af1401fd04c808a779f322f31f7d1e543,,9dbac1a006de34bda6583b276196754eb03bedf4c3638faf2ffcb9fa742531d8,Tests_passed,1c4495d4eec1ff55e7ec34fc6667cb0203635e076f710813a16f96e8f8e97116,Tests_passed,True,True,True,True,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,4456d7797372795ef47cfb92ca0bbe94307fd733b353e69f84894fae9fa6cb03,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b9c178050510ef89f21ebc1f7d3613f423e990cd2b75cc85bb51481d09c64f70,Merge_failed,b9c178050510ef89f21ebc1f7d3613f423e990cd2b75cc85bb51481d09c64f70,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,0.05121588706970215,0.05019712448120117,0.044692277908325195,0.042111873626708984,0.0411219596862793,0.04586982727050781,0.04234743118286133,0.16963696479797363,0.07036066055297852,0.06417989730834961,0.0647423267364502,0.11520838737487793,0.03979325294494629,0.17962121963500977 diff --git a/results/combined/merges_timed/jclawson/hazeltask.csv b/results/combined/merges_timed/jclawson/hazeltask.csv index 4f08ade42c..1adc28c022 100644 --- a/results/combined/merges_timed/jclawson/hazeltask.csv +++ b/results/combined/merges_timed/jclawson/hazeltask.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,9f9809f46cd73b80f333774d552565e5ca89f302,b2dd16e728a751889d4b24489c2dc3b0825b46ca,21c83e6c0520540de424bea4af4068826b6b447b,,6863884ce35b3b3fcf6efd0bf8a3a3dbe06bae6ec921152119988287e7c27566,Tests_passed,8a0b1d50a2aa45e693fd985c7df80f9938b47333a999a18f6fe5219fd71994a5,Tests_passed,True,True,True,True,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,8b59e5d387cc6e32584e4d8e4559e16c7e91889e98d0bc3243f52227180059d4,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,2cd4ba75e9a79084198bfd2f939b8f4c7d0f40d02b49d103ee9d1339deeb66ae,Merge_failed,2cd4ba75e9a79084198bfd2f939b8f4c7d0f40d02b49d103ee9d1339deeb66ae,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,36aef089a5fd613bc2a5ac5e756d57a67e8e9ccad7b762cfeeaaec4eaa82f4f5,0.010082244873046875,0.010142803192138672,0.010045289993286133,0.009909629821777344,0.010230541229248047,0.010212182998657227,0.010469675064086914,0.03547096252441406,0.014752626419067383,0.10574841499328613,0.10652685165405273,0.06695151329040527,0.9874234199523926,0.1770646572113037 +4,refs/heads/master,9f9809f46cd73b80f333774d552565e5ca89f302,b2dd16e728a751889d4b24489c2dc3b0825b46ca,21c83e6c0520540de424bea4af4068826b6b447b,,6863884ce35b3b3fcf6efd0bf8a3a3dbe06bae6ec921152119988287e7c27566,Tests_passed,8a0b1d50a2aa45e693fd985c7df80f9938b47333a999a18f6fe5219fd71994a5,Tests_passed,True,True,True,True,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,8b59e5d387cc6e32584e4d8e4559e16c7e91889e98d0bc3243f52227180059d4,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,2cd4ba75e9a79084198bfd2f939b8f4c7d0f40d02b49d103ee9d1339deeb66ae,Merge_failed,2cd4ba75e9a79084198bfd2f939b8f4c7d0f40d02b49d103ee9d1339deeb66ae,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,36aef089a5fd613bc2a5ac5e756d57a67e8e9ccad7b762cfeeaaec4eaa82f4f5,0.010082244873046875,0.010142803192138672,0.010045289993286133,0.009909629821777344,0.010230541229248047,0.010212182998657227,0.010469675064086914,0.03547096252441406,0.014752626419067383,0.10584664344787598,0.10526037216186523,0.06695151329040527,0.9874234199523926,0.1770646572113037 diff --git a/results/combined/merges_timed/jdatepicker/jdatepicker.csv b/results/combined/merges_timed/jdatepicker/jdatepicker.csv index b4af0a1728..15afea3588 100644 --- a/results/combined/merges_timed/jdatepicker/jdatepicker.csv +++ b/results/combined/merges_timed/jdatepicker/jdatepicker.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,cc74e94ac3eb76272cfa0a23481487e551c528e9,2984c3f9fe78688e6bf34b0b23f7017657a6d4cc,a36294b8dab9448757932c766c55e7fb93dfbc49,,True,True,2a37c87a0c14fed8c73bffa0dd97349b5a5240f2e70e687c70e197e4139ab482,Tests_passed,34cdf839b21828034a12732d95cc568e2098da38fec394c0cb21cb82a4bfe7d0,Tests_passed,True,True,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,0.04346179962158203,0.03763771057128906,0.042702674865722656,0.042551279067993164,0.043234825134277344,0.055725812911987305,0.045609235763549805,0.24699902534484863,0.03692030906677246,0.3178739547729492,0.3151371479034424,0.1636662483215332,2.1409525871276855,0.1923069953918457 +3,refs/heads/master,cc74e94ac3eb76272cfa0a23481487e551c528e9,2984c3f9fe78688e6bf34b0b23f7017657a6d4cc,a36294b8dab9448757932c766c55e7fb93dfbc49,,True,True,2a37c87a0c14fed8c73bffa0dd97349b5a5240f2e70e687c70e197e4139ab482,Tests_passed,34cdf839b21828034a12732d95cc568e2098da38fec394c0cb21cb82a4bfe7d0,Tests_passed,True,True,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,0.04346179962158203,0.03763771057128906,0.042702674865722656,0.042551279067993164,0.043234825134277344,0.055725812911987305,0.045609235763549805,0.24699902534484863,0.03692030906677246,0.3163881301879883,0.3174428939819336,0.1636662483215332,2.1409525871276855,0.1923069953918457 diff --git a/results/combined/merges_timed/jdeparser/jdeparser2.csv b/results/combined/merges_timed/jdeparser/jdeparser2.csv index 7121a4f0e2..918759029d 100644 --- a/results/combined/merges_timed/jdeparser/jdeparser2.csv +++ b/results/combined/merges_timed/jdeparser/jdeparser2.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/main,1da0e2349af32efeef7b5a1874bcc20c67c51fc1,3e7b519565d03b9d669338f591cb2deb0e33845d,8b187686848386bcbfc37c35c830ae50213c0120,,c926970c508bc1f6f9b6bbc74f5b4491c644db587348e97016dd882ee3b9fc84,Tests_passed,f2c40051dea0b73f98eb69bb0335c4687c8c285053386a888f534aa7c4903db1,Tests_passed,True,True,True,True,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,0.04601931571960449,0.03136038780212402,0.043140411376953125,0.05047607421875,0.05830645561218262,0.050133466720581055,0.04506707191467285,0.16785812377929688,0.05324268341064453,0.16883373260498047,0.16855144500732422,0.10609745979309082,1.3957955837249756,0.2520942687988281 +12,refs/heads/main,1da0e2349af32efeef7b5a1874bcc20c67c51fc1,3e7b519565d03b9d669338f591cb2deb0e33845d,8b187686848386bcbfc37c35c830ae50213c0120,,c926970c508bc1f6f9b6bbc74f5b4491c644db587348e97016dd882ee3b9fc84,Tests_passed,f2c40051dea0b73f98eb69bb0335c4687c8c285053386a888f534aa7c4903db1,Tests_passed,True,True,True,True,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,0.04601931571960449,0.03136038780212402,0.043140411376953125,0.05047607421875,0.05830645561218262,0.050133466720581055,0.04506707191467285,0.16785812377929688,0.05324268341064453,0.16651511192321777,0.1667184829711914,0.10609745979309082,1.3957955837249756,0.2520942687988281 diff --git a/results/combined/merges_timed/jdkcn/jabberer.csv b/results/combined/merges_timed/jdkcn/jabberer.csv index 915ceb48d6..6b96d8d958 100644 --- a/results/combined/merges_timed/jdkcn/jabberer.csv +++ b/results/combined/merges_timed/jdkcn/jabberer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,5037a3d573c3e162e8de170b15258f76ea7aaca4,bcad97e1dce084756c25cf5b4f9bfba6e600408a,6ffe4e1c62789f14cf959876672e3d77b09699cc,,73f44c203480ed18c03358e341da6cec5b87042ce96c1b72a79e9bc9de81dc0d,Tests_passed,1eaa3eaa12a543b88c9addeec39ea3e45e8c34662556ed533fa4d2565f7de5c9,Tests_passed,True,True,True,True,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,42326de104e28ec37378ff5212c6c9af3f6d1ee328ffbd0b0e9d87b1cf14d107,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,27182aaa5e50abc3701b7ed89286daaa6d587942051652cc79f29544af3f3808,Merge_failed,27182aaa5e50abc3701b7ed89286daaa6d587942051652cc79f29544af3f3808,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,1ba4589cc285be5f219cef0af049785d289cef3bf44391a32946a0f95cab29aa,0.04365372657775879,0.053040504455566406,0.06354641914367676,0.053845882415771484,0.04703783988952637,0.04058098793029785,0.03015899658203125,0.24705886840820312,0.0787506103515625,0.13814878463745117,0.14445114135742188,0.14580154418945312,0.7819328308105469,0.21639657020568848 +1,refs/heads/master,5037a3d573c3e162e8de170b15258f76ea7aaca4,bcad97e1dce084756c25cf5b4f9bfba6e600408a,6ffe4e1c62789f14cf959876672e3d77b09699cc,,73f44c203480ed18c03358e341da6cec5b87042ce96c1b72a79e9bc9de81dc0d,Tests_passed,1eaa3eaa12a543b88c9addeec39ea3e45e8c34662556ed533fa4d2565f7de5c9,Tests_passed,True,True,True,True,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,42326de104e28ec37378ff5212c6c9af3f6d1ee328ffbd0b0e9d87b1cf14d107,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,27182aaa5e50abc3701b7ed89286daaa6d587942051652cc79f29544af3f3808,Merge_failed,27182aaa5e50abc3701b7ed89286daaa6d587942051652cc79f29544af3f3808,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,1ba4589cc285be5f219cef0af049785d289cef3bf44391a32946a0f95cab29aa,0.04365372657775879,0.053040504455566406,0.06354641914367676,0.053845882415771484,0.04703783988952637,0.04058098793029785,0.03015899658203125,0.24705886840820312,0.0787506103515625,0.1527719497680664,0.15141844749450684,0.14580154418945312,0.7819328308105469,0.21639657020568848 diff --git a/results/combined/merges_timed/jdupl/lancoder.csv b/results/combined/merges_timed/jdupl/lancoder.csv index bc4c9d5b9b..88a911937c 100644 --- a/results/combined/merges_timed/jdupl/lancoder.csv +++ b/results/combined/merges_timed/jdupl/lancoder.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,407742ea19966c62f0eeb9d47dce6afadf9f672b,1355727fd68e75d9e97387b2fb92355fd3cd1a92,80ee8865f90c66b4c90c833d5beab4943da35d3a,,True,True,9a9b8b271a5a4d5bbcc627b7da9e738daf5a76dcbf483340eb27314d37063382,Tests_passed,1fd8f3ef0dd0e1591cf79eb252a18bf1e7c1cb904f9760b5e18a8e19d596b78a,Tests_passed,True,True,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,2f7017498acb1c51f498ed3d952d3c19a0038f36fd55d790ab5193fc6baa6b5b,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,e6319f7f4761bed6ed33051f2f9626f5c1828ae19f5c7e6d1bdeea93ac7a10c3,Merge_failed,e6319f7f4761bed6ed33051f2f9626f5c1828ae19f5c7e6d1bdeea93ac7a10c3,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,4bf8e2addeb1f4af1abab84ec12084c9964a30f3691cf6fcdc3b3c9565c05680,0.02175426483154297,0.031899213790893555,0.04398226737976074,0.04253530502319336,0.04331374168395996,0.04799675941467285,0.04114055633544922,0.2342205047607422,0.05637383460998535,0.22337555885314941,0.22377920150756836,0.16415643692016602,1.267211675643921,0.2113358974456787 +2,refs/heads/master,407742ea19966c62f0eeb9d47dce6afadf9f672b,1355727fd68e75d9e97387b2fb92355fd3cd1a92,80ee8865f90c66b4c90c833d5beab4943da35d3a,,True,True,9a9b8b271a5a4d5bbcc627b7da9e738daf5a76dcbf483340eb27314d37063382,Tests_passed,1fd8f3ef0dd0e1591cf79eb252a18bf1e7c1cb904f9760b5e18a8e19d596b78a,Tests_passed,True,True,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,2f7017498acb1c51f498ed3d952d3c19a0038f36fd55d790ab5193fc6baa6b5b,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,e6319f7f4761bed6ed33051f2f9626f5c1828ae19f5c7e6d1bdeea93ac7a10c3,Merge_failed,e6319f7f4761bed6ed33051f2f9626f5c1828ae19f5c7e6d1bdeea93ac7a10c3,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,4bf8e2addeb1f4af1abab84ec12084c9964a30f3691cf6fcdc3b3c9565c05680,0.02175426483154297,0.031899213790893555,0.04398226737976074,0.04253530502319336,0.04331374168395996,0.04799675941467285,0.04114055633544922,0.2342205047607422,0.05637383460998535,0.22551822662353516,0.22391653060913086,0.16415643692016602,1.267211675643921,0.2113358974456787 diff --git a/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv b/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv index e172ba9ccc..29b9184ac5 100644 --- a/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv +++ b/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -36,refs/remotes/origin/pull/99,997ce11f32044dd4702fdba7e1f4e5d60bae99f4,111275a7557b313dc7b0c1dee133b1e117b7d22c,780847a2b697201474857ecc249c40ca3251a4d7,,True,True,ba8949bac9b136e076aa60eca3f3423420efb743b6da11fb7e3bb757dacc4ef3,Tests_passed,16739c8ccc9b5d92d986094217e30d32fb54fe5c0d500d8bcdade0074201b850,Tests_passed,True,True,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,0a1933a6273f4a982e7f2c70d49a7d2734c835bd0dbf041578b18f5ac6d06805,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,f658bec7a65570893df5d16129ce4b6a400cd41a201bf165e5e3cbdf3b41f6ee,Merge_failed,f658bec7a65570893df5d16129ce4b6a400cd41a201bf165e5e3cbdf3b41f6ee,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Merge_failed,2b03ff74c9a0ce24627b6d7baa94e9773d311d1c47a3afad6c22c03201e4028c,0.0573430061340332,0.06896162033081055,0.05206155776977539,0.06782150268554688,0.05519223213195801,0.05531644821166992,0.04977297782897949,0.38999271392822266,0.07919692993164062,0.2800629138946533,0.26955723762512207,0.2972872257232666,2.072251319885254,0.2987978458404541 +36,refs/remotes/origin/pull/99,997ce11f32044dd4702fdba7e1f4e5d60bae99f4,111275a7557b313dc7b0c1dee133b1e117b7d22c,780847a2b697201474857ecc249c40ca3251a4d7,,True,True,ba8949bac9b136e076aa60eca3f3423420efb743b6da11fb7e3bb757dacc4ef3,Tests_passed,16739c8ccc9b5d92d986094217e30d32fb54fe5c0d500d8bcdade0074201b850,Tests_passed,True,True,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,0a1933a6273f4a982e7f2c70d49a7d2734c835bd0dbf041578b18f5ac6d06805,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,f658bec7a65570893df5d16129ce4b6a400cd41a201bf165e5e3cbdf3b41f6ee,Merge_failed,f658bec7a65570893df5d16129ce4b6a400cd41a201bf165e5e3cbdf3b41f6ee,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Merge_failed,2b03ff74c9a0ce24627b6d7baa94e9773d311d1c47a3afad6c22c03201e4028c,0.0573430061340332,0.06896162033081055,0.05206155776977539,0.06782150268554688,0.05519223213195801,0.05531644821166992,0.04977297782897949,0.38999271392822266,0.07919692993164062,0.2679455280303955,0.27808165550231934,0.2972872257232666,2.072251319885254,0.2987978458404541 diff --git a/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv b/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv index 121f012030..ae47ee2c66 100644 --- a/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv +++ b/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,571616267c56bdf33ea5eca14aec7f83d0355ae0,9f7e64cd7e24fb6ff8476e235d5839c553885ace,509cb7c52169df2b8c4d726d189474979b5a78d0,,True,True,f5636c00094069e71499c5290d47d8aea35d45a913dc1720ac0e93123ab533be,Tests_passed,dca15947900abb12e8629399e881d43e7bda5686d4ab0d2f6f2ff83c9b762512,Tests_passed,True,True,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,1e968b92e88920928ee826fd1b16d6f49a161c8e598072481d339c36c717d071,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,86b188848c437e0ae5556f45e4bffbd3744aecdd6d6922b78ed5749b6a18bd98,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,0.03705930709838867,0.04033517837524414,0.0329892635345459,0.031841278076171875,0.036481618881225586,0.03766989707946777,0.037752628326416016,0.2504689693450928,0.062427520751953125,0.14931321144104004,0.14915919303894043,0.17290091514587402,0.7454574108123779,0.18609237670898438 +8,refs/heads/master,571616267c56bdf33ea5eca14aec7f83d0355ae0,9f7e64cd7e24fb6ff8476e235d5839c553885ace,509cb7c52169df2b8c4d726d189474979b5a78d0,,True,True,f5636c00094069e71499c5290d47d8aea35d45a913dc1720ac0e93123ab533be,Tests_passed,dca15947900abb12e8629399e881d43e7bda5686d4ab0d2f6f2ff83c9b762512,Tests_passed,True,True,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,1e968b92e88920928ee826fd1b16d6f49a161c8e598072481d339c36c717d071,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,86b188848c437e0ae5556f45e4bffbd3744aecdd6d6922b78ed5749b6a18bd98,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,0.03705930709838867,0.04033517837524414,0.0329892635345459,0.031841278076171875,0.036481618881225586,0.03766989707946777,0.037752628326416016,0.2504689693450928,0.062427520751953125,0.14838194847106934,0.14780592918395996,0.17290091514587402,0.7454574108123779,0.18609237670898438 diff --git a/results/combined/merges_timed/jeluard/semantic-versioning.csv b/results/combined/merges_timed/jeluard/semantic-versioning.csv index 02e2111cea..1c92505743 100644 --- a/results/combined/merges_timed/jeluard/semantic-versioning.csv +++ b/results/combined/merges_timed/jeluard/semantic-versioning.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,1130c9261b179f0efdf49badba9554d1c9d63822,37639815664ce78bb1d2c1f2240d133209ba1398,69909650ee34de32eceeee0b4dc6e0ab89f2a5b3,,True,True,6e548b5daeca9c35e200cfc812d71b76fc5fbc59a34a18e2b3202fa542ba4369,Tests_passed,ca2c32fd8a7daee5a886c1ff4c8cfbda2f70e246d8bc4fb9aefa95d53ce94ef4,Tests_passed,True,True,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,0.009948968887329102,0.010591983795166016,0.010876893997192383,0.011204242706298828,0.010801553726196289,0.010731220245361328,0.01082921028137207,0.03607058525085449,0.010447502136230469,0.16881561279296875,0.17214465141296387,0.06501889228820801,0.9075784683227539,0.17898917198181152 +15,refs/heads/master,1130c9261b179f0efdf49badba9554d1c9d63822,37639815664ce78bb1d2c1f2240d133209ba1398,69909650ee34de32eceeee0b4dc6e0ab89f2a5b3,,True,True,6e548b5daeca9c35e200cfc812d71b76fc5fbc59a34a18e2b3202fa542ba4369,Tests_passed,ca2c32fd8a7daee5a886c1ff4c8cfbda2f70e246d8bc4fb9aefa95d53ce94ef4,Tests_passed,True,True,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,0.009948968887329102,0.010591983795166016,0.010876893997192383,0.011204242706298828,0.010801553726196289,0.010731220245361328,0.01082921028137207,0.03607058525085449,0.010447502136230469,0.16196751594543457,0.16258740425109863,0.06501889228820801,0.9075784683227539,0.17898917198181152 diff --git a/results/combined/merges_timed/jenkins-infra/ircbot.csv b/results/combined/merges_timed/jenkins-infra/ircbot.csv index 0900ae8839..39284b6bf0 100644 --- a/results/combined/merges_timed/jenkins-infra/ircbot.csv +++ b/results/combined/merges_timed/jenkins-infra/ircbot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/main,59396ceb76c9db8977d1ac8cd650fb1f32dc6e43,069e970815bea3760fa9dc6609c724f8635a7c10,0b27dd256a1ddf2d51e7f1a2f28ed8bfab3779f0,,True,True,19b5730003060a87c66505944f3eb408773632f05bbfd422e79e0e350d81ca40,Tests_passed,d556a6dbb753e631aaaf6fc380a44cf8add0ab3fc7614bb4eae0f046132a607c,Tests_passed,True,True,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,0.009571552276611328,0.009262323379516602,0.009617805480957031,0.010101318359375,0.01016855239868164,0.010085105895996094,0.009686470031738281,0.03406786918640137,0.009156227111816406,0.18568181991577148,0.18395495414733887,0.06403183937072754,1.616903305053711,0.15596508979797363 +9,refs/heads/main,59396ceb76c9db8977d1ac8cd650fb1f32dc6e43,069e970815bea3760fa9dc6609c724f8635a7c10,0b27dd256a1ddf2d51e7f1a2f28ed8bfab3779f0,,True,True,19b5730003060a87c66505944f3eb408773632f05bbfd422e79e0e350d81ca40,Tests_passed,d556a6dbb753e631aaaf6fc380a44cf8add0ab3fc7614bb4eae0f046132a607c,Tests_passed,True,True,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,0.009571552276611328,0.009262323379516602,0.009617805480957031,0.010101318359375,0.01016855239868164,0.010085105895996094,0.009686470031738281,0.03406786918640137,0.009156227111816406,0.1822364330291748,0.18162322044372559,0.06403183937072754,1.616903305053711,0.15596508979797363 diff --git a/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv b/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv index 68a68e71f2..b96f629939 100644 --- a/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -29,refs/heads/master,d5ca0a8db535780dae86777eb35abe4cc2b202d0,8af37b499905c64dd3df3041cee645a1a819facf,1e35c12fee1b13d7d6a11aca78a69dab801c0f67,,True,True,aafd61fe1f8f2d848c5da1a77a5b4a7ba5d58a482c6f63a2c81b8f699b7e2d3a,Tests_passed,7f6b7de2698bb1186287fa4fdf44610271e354c108d17e414247a41bb801ea08,Tests_passed,True,True,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,5b88487c18e990bef08feddade6708b402072d2293323686b326a2ecf26fb4ef,Tests_passed,5b88487c18e990bef08feddade6708b402072d2293323686b326a2ecf26fb4ef,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,5e814f600832ec832feb7b22ceedbb16ea41e2670be9e2e2fb3c177e3d8d7e3a,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,0.012235403060913086,0.012328147888183594,0.013669967651367188,0.013655424118041992,0.013623714447021484,0.013459444046020508,0.013565778732299805,0.0524754524230957,0.012262344360351562,0.18088722229003906,0.180009126663208,0.12009811401367188,1.4731404781341553,0.1951770782470703 +29,refs/heads/master,d5ca0a8db535780dae86777eb35abe4cc2b202d0,8af37b499905c64dd3df3041cee645a1a819facf,1e35c12fee1b13d7d6a11aca78a69dab801c0f67,,True,True,aafd61fe1f8f2d848c5da1a77a5b4a7ba5d58a482c6f63a2c81b8f699b7e2d3a,Tests_passed,7f6b7de2698bb1186287fa4fdf44610271e354c108d17e414247a41bb801ea08,Tests_passed,True,True,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,5b88487c18e990bef08feddade6708b402072d2293323686b326a2ecf26fb4ef,Tests_passed,5b88487c18e990bef08feddade6708b402072d2293323686b326a2ecf26fb4ef,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,5e814f600832ec832feb7b22ceedbb16ea41e2670be9e2e2fb3c177e3d8d7e3a,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,0.012235403060913086,0.012328147888183594,0.013669967651367188,0.013655424118041992,0.013623714447021484,0.013459444046020508,0.013565778732299805,0.0524754524230957,0.012262344360351562,0.17696118354797363,0.17717742919921875,0.12009811401367188,1.4731404781341553,0.1951770782470703 diff --git a/results/combined/merges_timed/jenkinsci/ant-plugin.csv b/results/combined/merges_timed/jenkinsci/ant-plugin.csv index 0d22be5b0b..d96f79f0ee 100644 --- a/results/combined/merges_timed/jenkinsci/ant-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ant-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -53,refs/heads/master,7025e65f06ee3934db303960a74846cc52440a26,d1c5e13f88ac5ed82c12de0a5c41434c1e55cf42,c57e18f6ac9c01ccce927930aed0221853d38ff6,,True,True,48ed5a84e692574544be1c42c8aa8ea51c0c3cb97216a21cd549995e1cd726c2,Tests_passed,ba7cde4d005aa3b0fd359698c19ad6cdd147849c304b5c63a20b68e866609461,Tests_passed,True,True,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,0.009960412979125977,0.010604143142700195,0.01067352294921875,0.011070728302001953,0.010929346084594727,0.010802984237670898,0.01103520393371582,0.04788064956665039,0.009957551956176758,0.3188362121582031,0.32012009620666504,0.11848020553588867,1.8841488361358643,0.1702871322631836 +53,refs/heads/master,7025e65f06ee3934db303960a74846cc52440a26,d1c5e13f88ac5ed82c12de0a5c41434c1e55cf42,c57e18f6ac9c01ccce927930aed0221853d38ff6,,True,True,48ed5a84e692574544be1c42c8aa8ea51c0c3cb97216a21cd549995e1cd726c2,Tests_passed,ba7cde4d005aa3b0fd359698c19ad6cdd147849c304b5c63a20b68e866609461,Tests_passed,True,True,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,0.009960412979125977,0.010604143142700195,0.01067352294921875,0.011070728302001953,0.010929346084594727,0.010802984237670898,0.01103520393371582,0.04788064956665039,0.009957551956176758,0.31518030166625977,0.31496477127075195,0.11848020553588867,1.8841488361358643,0.1702871322631836 diff --git a/results/combined/merges_timed/jenkinsci/backend-update-center2.csv b/results/combined/merges_timed/jenkinsci/backend-update-center2.csv index 14fc5f706c..ef72010a68 100644 --- a/results/combined/merges_timed/jenkinsci/backend-update-center2.csv +++ b/results/combined/merges_timed/jenkinsci/backend-update-center2.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -75,refs/heads/master,ffe5590d446632dfa271013e842badbbb9b47170,3a70a66f43951d8f9dea0b83af1fa00a3ca84a71,a60eb5abdc8146a5003e4f5552625b88203bc1b5,,True,True,e628f54f8738d68760abe1e703ebce7e4ce9ee5195f72a5cd2aa85069f564153,Tests_passed,95bd31aa354f9c9c32ee5e93fe625ddffe0333fe2d5a3f8b82fb3a1e39f09336,Tests_passed,True,True,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,0.012677907943725586,0.013498783111572266,0.015375614166259766,0.015181303024291992,0.014791488647460938,0.01540231704711914,0.015249252319335938,0.040874481201171875,0.012602567672729492,0.1570415496826172,0.15658092498779297,0.0667579174041748,0.8724172115325928,0.19062376022338867 +75,refs/heads/master,ffe5590d446632dfa271013e842badbbb9b47170,3a70a66f43951d8f9dea0b83af1fa00a3ca84a71,a60eb5abdc8146a5003e4f5552625b88203bc1b5,,True,True,e628f54f8738d68760abe1e703ebce7e4ce9ee5195f72a5cd2aa85069f564153,Tests_passed,95bd31aa354f9c9c32ee5e93fe625ddffe0333fe2d5a3f8b82fb3a1e39f09336,Tests_passed,True,True,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,0.012677907943725586,0.013498783111572266,0.015375614166259766,0.015181303024291992,0.014791488647460938,0.01540231704711914,0.015249252319335938,0.040874481201171875,0.012602567672729492,0.15395236015319824,0.15407085418701172,0.0667579174041748,0.8724172115325928,0.19062376022338867 diff --git a/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv b/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv index e3a17f860d..127b2416a3 100644 --- a/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,da518043f34583234ad250c82869d287b33ee483,b368656b472799b0ffb5f0617797040fa6335ad6,d29d40216fc8a16d2b79c9a4c9f3d8b5b3a37343,,True,True,cbbed6c64cabad96cf0dfed829bdad8b969a6932d2f2fe0adfa87d6fdb46b0a7,Tests_passed,603d9bb311f51fd03cd49eddc4079769304681fae442acffcf6dd24675402893,Tests_passed,True,True,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,0.056005239486694336,0.04514741897583008,0.046332597732543945,0.05890011787414551,0.054306745529174805,0.04079461097717285,0.043004751205444336,0.20070981979370117,0.05725598335266113,0.1667642593383789,0.16686582565307617,0.1091008186340332,0.8492782115936279,0.19424080848693848 +15,refs/heads/master,da518043f34583234ad250c82869d287b33ee483,b368656b472799b0ffb5f0617797040fa6335ad6,d29d40216fc8a16d2b79c9a4c9f3d8b5b3a37343,,True,True,cbbed6c64cabad96cf0dfed829bdad8b969a6932d2f2fe0adfa87d6fdb46b0a7,Tests_passed,603d9bb311f51fd03cd49eddc4079769304681fae442acffcf6dd24675402893,Tests_passed,True,True,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,0.056005239486694336,0.04514741897583008,0.046332597732543945,0.05890011787414551,0.054306745529174805,0.04079461097717285,0.043004751205444336,0.20070981979370117,0.05725598335266113,0.16330838203430176,0.164703369140625,0.1091008186340332,0.8492782115936279,0.19424080848693848 diff --git a/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv b/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv index 88a6d44461..87e42e7eab 100644 --- a/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/master,00d3a7bbff50feb5bc56db4ea1160b58dcb39af0,c3361f79b73d6b3366bc66f9882a05792402f3c5,2633bd942947f365384d093a848750fcf973a860,,7a087ff73e4bd078425f5aa63d3631ee4dc43c58c2f9ce8d81557506044c8643,Tests_passed,ef5f065bb77b54df5889b2c0fd419494db8c57c744a02a6884c3f55d5fcc5c8d,Tests_passed,True,True,True,True,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,0.012008905410766602,0.011568069458007812,0.013265132904052734,0.013435125350952148,0.013039112091064453,0.012888669967651367,0.01353764533996582,0.05105161666870117,0.011375904083251953,0.2993357181549072,0.2986428737640381,0.12022519111633301,1.0369830131530762,0.18302297592163086 +21,refs/heads/master,00d3a7bbff50feb5bc56db4ea1160b58dcb39af0,c3361f79b73d6b3366bc66f9882a05792402f3c5,2633bd942947f365384d093a848750fcf973a860,,7a087ff73e4bd078425f5aa63d3631ee4dc43c58c2f9ce8d81557506044c8643,Tests_passed,ef5f065bb77b54df5889b2c0fd419494db8c57c744a02a6884c3f55d5fcc5c8d,Tests_passed,True,True,True,True,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,0.012008905410766602,0.011568069458007812,0.013265132904052734,0.013435125350952148,0.013039112091064453,0.012888669967651367,0.01353764533996582,0.05105161666870117,0.011375904083251953,0.2941162586212158,0.2961690425872803,0.12022519111633301,1.0369830131530762,0.18302297592163086 diff --git a/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv b/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv index e153cfbd38..ad35d51aa3 100644 --- a/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -66,refs/heads/master,55269af42ba6e2edd3b17cf20eabc76143d56208,b98750751ff6160add3a0a782bead42d06e3568f,2efc7be3a9ab350b884e202fe16e03166de7a126,,01f79cca4b838b33ee97b13e7a3e78b1c21b493c4015fa7b57ec659ea42e7c45,Tests_passed,27411121b15b3b572ee8c41ced45c5a339934b820495741ea019085c58bedca7,Tests_passed,True,True,True,True,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,0.010685443878173828,0.010724782943725586,0.01171731948852539,0.011759281158447266,0.011965274810791016,0.011788368225097656,0.011227846145629883,0.03627657890319824,0.010178804397583008,0.17521977424621582,0.1780412197113037,0.06620121002197266,0.6560940742492676,0.15822505950927734 +66,refs/heads/master,55269af42ba6e2edd3b17cf20eabc76143d56208,b98750751ff6160add3a0a782bead42d06e3568f,2efc7be3a9ab350b884e202fe16e03166de7a126,,01f79cca4b838b33ee97b13e7a3e78b1c21b493c4015fa7b57ec659ea42e7c45,Tests_passed,27411121b15b3b572ee8c41ced45c5a339934b820495741ea019085c58bedca7,Tests_passed,True,True,True,True,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,0.010685443878173828,0.010724782943725586,0.01171731948852539,0.011759281158447266,0.011965274810791016,0.011788368225097656,0.011227846145629883,0.03627657890319824,0.010178804397583008,0.16379809379577637,0.1637253761291504,0.06620121002197266,0.6560940742492676,0.15822505950927734 diff --git a/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv b/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv index 1dffd72642..1fcbd34d12 100644 --- a/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -124,refs/remotes/origin/pull/125,956cedccfa4eac549c80b15c1b4a7369618a4d39,7c5e9c0d73c1db329c9990f868f25f0637cfc862,9f6cf7bab6c7017ca16e9349d3cf754de4bc619c,,True,True,9ee0084b5790365504f2c0a9dfe0e12e1cb5e3ec48f70ac23f0bfabeb230fb42,Tests_passed,76848720ec24edfa57ce4cf4efb47c4303b7d93f68279238d260d20b09bff186,Tests_passed,True,True,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,f74c3dd8b87cae1bb1cbddb12f987c36c4d4b87f935fcf94c521fd93ab0be509,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,c9f206d72701d608e524eb183ff76e715d3317b729f69495407212a799faa55b,Merge_failed,c9f206d72701d608e524eb183ff76e715d3317b729f69495407212a799faa55b,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Merge_failed,46a8118c743f20a862f0028ab1c1610d6cea1ba1bc2e93c64608f56c61886efd,0.017364978790283203,0.017603635787963867,0.019686460494995117,0.020004987716674805,0.02026653289794922,0.020314931869506836,0.020175457000732422,0.049180030822753906,0.024905681610107422,0.08508062362670898,0.0931692123413086,0.07663393020629883,0.5442450046539307,0.18626856803894043 +124,refs/remotes/origin/pull/125,956cedccfa4eac549c80b15c1b4a7369618a4d39,7c5e9c0d73c1db329c9990f868f25f0637cfc862,9f6cf7bab6c7017ca16e9349d3cf754de4bc619c,,True,True,9ee0084b5790365504f2c0a9dfe0e12e1cb5e3ec48f70ac23f0bfabeb230fb42,Tests_passed,76848720ec24edfa57ce4cf4efb47c4303b7d93f68279238d260d20b09bff186,Tests_passed,True,True,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,f74c3dd8b87cae1bb1cbddb12f987c36c4d4b87f935fcf94c521fd93ab0be509,Merge_failed,1eee9adf4e78daf071929eee596a978b8dbd74fc76baf782e92c7ce2fb8a03a6,Merge_failed,c9f206d72701d608e524eb183ff76e715d3317b729f69495407212a799faa55b,Merge_failed,c9f206d72701d608e524eb183ff76e715d3317b729f69495407212a799faa55b,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Merge_failed,46a8118c743f20a862f0028ab1c1610d6cea1ba1bc2e93c64608f56c61886efd,0.017364978790283203,0.017603635787963867,0.019686460494995117,0.020004987716674805,0.02026653289794922,0.020314931869506836,0.020175457000732422,0.049180030822753906,0.024905681610107422,0.0820302963256836,0.09082245826721191,0.07663393020629883,0.5442450046539307,0.18626856803894043 diff --git a/results/combined/merges_timed/jenkinsci/coverity-plugin.csv b/results/combined/merges_timed/jenkinsci/coverity-plugin.csv index a032811165..d4c15e66d3 100644 --- a/results/combined/merges_timed/jenkinsci/coverity-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/coverity-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -181,refs/heads/master,ab382ea7f87d69826dd1c5281156f1f250c49b44,726ec49044213fb73c4c20e770b1263ec9e2eafa,7fbeb1bfa427f969faf5a0a1bf30cdcf097b669e,,True,True,b165e151199d2bf6b432b877e690983b244b6469e3e743b9e552b8b743062dda,Tests_passed,e635af35249f30bcbd9bc7e54b579ae245021b6f7f4f7d2fce1704cae271175e,Tests_passed,True,True,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,a44eb0366dc314ede13ef7f8c9750bcfbce9fad69eeb93503199bc692e5e4b5d,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,d4283368e1f8d4be21a95cadff7fe8142753c72b804d60aa348478dc913e8ee5,Merge_failed,d4283368e1f8d4be21a95cadff7fe8142753c72b804d60aa348478dc913e8ee5,Merge_failed,d37623f0907a530af0595184986186066347f462094f94175f52a0cb50361663,Tests_passed,1f846dcdd0fb0ec117dde81a5dfb356a17de4a008f30fd25355adfa2e991f00a,Merge_failed,e56e9dd8d91bc2789f36644e1f9f206cfe3596211ab3044e03b20c9ba72de4e5,0.048230648040771484,0.05576348304748535,0.05527782440185547,0.04704761505126953,0.05459094047546387,0.049707889556884766,0.05958104133605957,0.23306679725646973,0.05591773986816406,0.2433912754058838,0.244354248046875,0.17502689361572266,2.049198865890503,0.24097442626953125 +181,refs/heads/master,ab382ea7f87d69826dd1c5281156f1f250c49b44,726ec49044213fb73c4c20e770b1263ec9e2eafa,7fbeb1bfa427f969faf5a0a1bf30cdcf097b669e,,True,True,b165e151199d2bf6b432b877e690983b244b6469e3e743b9e552b8b743062dda,Tests_passed,e635af35249f30bcbd9bc7e54b579ae245021b6f7f4f7d2fce1704cae271175e,Tests_passed,True,True,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,a44eb0366dc314ede13ef7f8c9750bcfbce9fad69eeb93503199bc692e5e4b5d,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,d4283368e1f8d4be21a95cadff7fe8142753c72b804d60aa348478dc913e8ee5,Merge_failed,d4283368e1f8d4be21a95cadff7fe8142753c72b804d60aa348478dc913e8ee5,Merge_failed,d37623f0907a530af0595184986186066347f462094f94175f52a0cb50361663,Tests_passed,1f846dcdd0fb0ec117dde81a5dfb356a17de4a008f30fd25355adfa2e991f00a,Merge_failed,e56e9dd8d91bc2789f36644e1f9f206cfe3596211ab3044e03b20c9ba72de4e5,0.048230648040771484,0.05576348304748535,0.05527782440185547,0.04704761505126953,0.05459094047546387,0.049707889556884766,0.05958104133605957,0.23306679725646973,0.05591773986816406,0.24259233474731445,0.2518644332885742,0.17502689361572266,2.049198865890503,0.24097442626953125 diff --git a/results/combined/merges_timed/jenkinsci/credentials-plugin.csv b/results/combined/merges_timed/jenkinsci/credentials-plugin.csv index 9eb3ad31a6..b9941ba527 100644 --- a/results/combined/merges_timed/jenkinsci/credentials-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/credentials-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,ccd45a5263d0b9ffb20a66965a9124e15e2b8e03,d71602e7cc03a96bf876171da18a19d8dcb7efb9,ff276f7134736281d49e9ae9a8bad6b7d2a59587,,True,True,487b7c31de55091409cca54f2edc43b5438e657ba0515be6bfd392245af7675e,Tests_passed,020414aa0adb6906f0cd225f64596900921863e6f11f42e7e00aad1c85f5c630,Tests_passed,True,True,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,7f0cb8ce1c0dbf43ad3c07888cc080b653797724555886d06dbb76cd675ae2a8,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,f122f0d1ce15a3d26602a8a554ca05f64f06dceeff5eac12334eb888a45330fc,Merge_failed,f122f0d1ce15a3d26602a8a554ca05f64f06dceeff5eac12334eb888a45330fc,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Merge_failed,3ea1224e69c73850b8bc76044defb5aba5f438495f0c73a51f5f8b1610743e53,0.012730836868286133,0.012917280197143555,0.06587052345275879,0.06552743911743164,0.06578540802001953,0.06546568870544434,0.06564450263977051,0.08555984497070312,0.06317710876464844,0.07576513290405273,0.07530760765075684,0.07306790351867676,1.112504243850708,0.21162772178649902 +7,refs/heads/master,ccd45a5263d0b9ffb20a66965a9124e15e2b8e03,d71602e7cc03a96bf876171da18a19d8dcb7efb9,ff276f7134736281d49e9ae9a8bad6b7d2a59587,,True,True,487b7c31de55091409cca54f2edc43b5438e657ba0515be6bfd392245af7675e,Tests_passed,020414aa0adb6906f0cd225f64596900921863e6f11f42e7e00aad1c85f5c630,Tests_passed,True,True,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,7f0cb8ce1c0dbf43ad3c07888cc080b653797724555886d06dbb76cd675ae2a8,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,f122f0d1ce15a3d26602a8a554ca05f64f06dceeff5eac12334eb888a45330fc,Merge_failed,f122f0d1ce15a3d26602a8a554ca05f64f06dceeff5eac12334eb888a45330fc,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Merge_failed,3ea1224e69c73850b8bc76044defb5aba5f438495f0c73a51f5f8b1610743e53,0.012730836868286133,0.012917280197143555,0.06587052345275879,0.06552743911743164,0.06578540802001953,0.06546568870544434,0.06564450263977051,0.08555984497070312,0.06317710876464844,0.14790034294128418,0.07549476623535156,0.07306790351867676,1.112504243850708,0.21162772178649902 diff --git a/results/combined/merges_timed/jenkinsci/deploy-plugin.csv b/results/combined/merges_timed/jenkinsci/deploy-plugin.csv index 0ee70e3ec6..3249c49262 100644 --- a/results/combined/merges_timed/jenkinsci/deploy-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/deploy-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,True,True,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,Tests_passed,True,True,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,a72cf44162f0c612e3c2220cd90af30e204218d8cc10e876b683990ed7bbe02b,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,2b0123ac923208bb3ae6c43a0834a3477d86ecd62d49df8043cea31b4c12055a,Merge_failed,75ebaeaf049491c6e9f3978f4f2ccee3b7788e8b316855ffd1f6f997ab37bd8e,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0,0.010303974151611328,0.010198116302490234,0.009979248046875,0.010348796844482422,0.010492801666259766,0.010199785232543945,0.010049819946289062,0.12209534645080566,0.03353691101074219,0.4707913398742676,0.4681527614593506,0.4678025245666504,3.4567370414733887,0.19109797477722168 +23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,True,True,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,Tests_passed,True,True,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,a72cf44162f0c612e3c2220cd90af30e204218d8cc10e876b683990ed7bbe02b,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,2b0123ac923208bb3ae6c43a0834a3477d86ecd62d49df8043cea31b4c12055a,Merge_failed,75ebaeaf049491c6e9f3978f4f2ccee3b7788e8b316855ffd1f6f997ab37bd8e,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0,0.010303974151611328,0.010198116302490234,0.009979248046875,0.010348796844482422,0.010492801666259766,0.010199785232543945,0.010049819946289062,0.12209534645080566,0.03353691101074219,0.472672700881958,0.46982455253601074,0.4678025245666504,3.4567370414733887,0.19109797477722168 diff --git a/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv b/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv index c94daab1a2..c06249de6f 100644 --- a/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -34,refs/heads/master,f527c92357bed2cfa432c19b1673edd642ea49ad,43277872e6203cd15347adc35edc566d7df9de93,0dc146859f808c46831250519fe00eadf238e58d,,True,True,e2a5e580e4e9c822bc6b0506a2849a5d08946b1de35523a81890db7c4af995c5,Tests_passed,de22ffec737eed49b98f57465f6c67e6954803c285ad0234b4b1a9c9ed991aa0,Tests_passed,True,True,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,0.018248558044433594,0.018541812896728516,0.023703336715698242,0.023485183715820312,0.02346634864807129,0.023476600646972656,0.022852182388305664,0.09402203559875488,0.018132925033569336,0.6277565956115723,0.6291327476501465,0.23214983940124512,3.619020700454712,0.2049877643585205 +34,refs/heads/master,f527c92357bed2cfa432c19b1673edd642ea49ad,43277872e6203cd15347adc35edc566d7df9de93,0dc146859f808c46831250519fe00eadf238e58d,,True,True,e2a5e580e4e9c822bc6b0506a2849a5d08946b1de35523a81890db7c4af995c5,Tests_passed,de22ffec737eed49b98f57465f6c67e6954803c285ad0234b4b1a9c9ed991aa0,Tests_passed,True,True,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,0.018248558044433594,0.018541812896728516,0.023703336715698242,0.023485183715820312,0.02346634864807129,0.023476600646972656,0.022852182388305664,0.09402203559875488,0.018132925033569336,0.6204090118408203,0.6241075992584229,0.23214983940124512,3.619020700454712,0.2049877643585205 diff --git a/results/combined/merges_timed/jenkinsci/docker-build-publish-plugin.csv b/results/combined/merges_timed/jenkinsci/docker-build-publish-plugin.csv index c88d6d8375..ff1d1835c0 100644 --- a/results/combined/merges_timed/jenkinsci/docker-build-publish-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/docker-build-publish-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,9d4eb2caee75e0914e50d611c33ed709d11e2923,18b13198466216b6ad9ac577f1f3ef78e233452e,792ae4e63845b99b8b1d121b81a5d5a5e8558be3,,True,True,062155a0025a6c794e457b5a17c520169db88438833b440027576ffc77eb9914,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,True,True,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,0.03667402267456055,0.037560462951660156,0.04653191566467285,0.04507851600646973,0.0393064022064209,0.0572206974029541,0.048683881759643555,0.176513671875,0.04267072677612305,0.1685943603515625,0.16917061805725098,0.10730195045471191,1.1228153705596924,0.19639945030212402 +3,refs/heads/master,9d4eb2caee75e0914e50d611c33ed709d11e2923,18b13198466216b6ad9ac577f1f3ef78e233452e,792ae4e63845b99b8b1d121b81a5d5a5e8558be3,,True,True,062155a0025a6c794e457b5a17c520169db88438833b440027576ffc77eb9914,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,True,True,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,0.03667402267456055,0.037560462951660156,0.04653191566467285,0.04507851600646973,0.0393064022064209,0.0572206974029541,0.048683881759643555,0.176513671875,0.04267072677612305,0.16559052467346191,0.16636157035827637,0.10730195045471191,1.1228153705596924,0.19639945030212402 diff --git a/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv b/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv index 9b47a8bc57..694341379b 100644 --- a/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -51,refs/heads/master,bbf162f5d50c3d37e3ee8940a0f13d3a4ce4ff59,312def504a573f3d4e5a80fe39fccff9e4a7a485,3fc56050feee5e84d074b7bfe11c15e22a15fd0b,,True,True,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f35690ebea5ced8492cf7847eba831c71b721e898f3c7720d1664480528a8d5e,Tests_passed,True,True,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,b1abf47a9ef7821afc644a69c839101fba92f78a1240ae3e06d0eb3fd69c01f2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,6a2b2a689e02ae16b869f82257b8d08997e0287f7396a2a0188d3edb5b04c0f3,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,3b1ed1a4f9029416cc3268d04d89d2e3a30c54935a38567d57d1e9b95a3ef03a,Merge_failed,6a2b2a689e02ae16b869f82257b8d08997e0287f7396a2a0188d3edb5b04c0f3,0.03819561004638672,0.05759453773498535,0.05283999443054199,0.05202746391296387,0.03683829307556152,0.02724432945251465,0.05631422996520996,0.3396117687225342,0.09140968322753906,0.17206048965454102,0.20112037658691406,0.23930096626281738,1.307088851928711,0.27376770973205566 +51,refs/heads/master,bbf162f5d50c3d37e3ee8940a0f13d3a4ce4ff59,312def504a573f3d4e5a80fe39fccff9e4a7a485,3fc56050feee5e84d074b7bfe11c15e22a15fd0b,,True,True,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f35690ebea5ced8492cf7847eba831c71b721e898f3c7720d1664480528a8d5e,Tests_passed,True,True,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,b1abf47a9ef7821afc644a69c839101fba92f78a1240ae3e06d0eb3fd69c01f2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,6a2b2a689e02ae16b869f82257b8d08997e0287f7396a2a0188d3edb5b04c0f3,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,3b1ed1a4f9029416cc3268d04d89d2e3a30c54935a38567d57d1e9b95a3ef03a,Merge_failed,6a2b2a689e02ae16b869f82257b8d08997e0287f7396a2a0188d3edb5b04c0f3,0.03819561004638672,0.05759453773498535,0.05283999443054199,0.05202746391296387,0.03683829307556152,0.02724432945251465,0.05631422996520996,0.3396117687225342,0.09140968322753906,0.17128968238830566,0.19828271865844727,0.23930096626281738,1.307088851928711,0.27376770973205566 diff --git a/results/combined/merges_timed/jenkinsci/embeddable-build-status-plugin.csv b/results/combined/merges_timed/jenkinsci/embeddable-build-status-plugin.csv index dca6f101e3..91d413c86e 100644 --- a/results/combined/merges_timed/jenkinsci/embeddable-build-status-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/embeddable-build-status-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -74,refs/remotes/origin/pull/248,83edeb11f30652257c65d2df6292d608f8dabb1c,a26365da217d87b98b5c0cb01fdb16ae3e72a07e,b1e6224d7c9b0d2a4e61ea296f5ef975272e72cd,,True,True,26ce1c1c330d68fd456c97d1d33391a1c0c0b6494e9843a16049eba523bdd4c0,Tests_passed,221f3d1e87f2d50f76f4c89a310e8f8594f91af1f6b26f939a57c6f5220d0c2a,Tests_passed,True,True,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,3f0d701cd7b699e1dad13046166fcbc19d2c20f639669be77392c39ed4c8fdbd,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,18e28cc049c5071db3878889af86610dae8c46e843084a40e23fcb0e0b2f39d4,Merge_failed,18e28cc049c5071db3878889af86610dae8c46e843084a40e23fcb0e0b2f39d4,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,1d9bceb00342f316c6ea1d8059a0b81b0a68d03a991113f9cdce7f356dd4ef43,0.010234832763671875,0.010677814483642578,0.010470390319824219,0.010282516479492188,0.010415077209472656,0.0103912353515625,0.010629415512084961,0.03777790069580078,0.016217708587646484,0.16630220413208008,0.16790342330932617,0.06633734703063965,0.46724987030029297,0.17106413841247559 +74,refs/remotes/origin/pull/248,83edeb11f30652257c65d2df6292d608f8dabb1c,a26365da217d87b98b5c0cb01fdb16ae3e72a07e,b1e6224d7c9b0d2a4e61ea296f5ef975272e72cd,,True,True,26ce1c1c330d68fd456c97d1d33391a1c0c0b6494e9843a16049eba523bdd4c0,Tests_passed,221f3d1e87f2d50f76f4c89a310e8f8594f91af1f6b26f939a57c6f5220d0c2a,Tests_passed,True,True,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,3f0d701cd7b699e1dad13046166fcbc19d2c20f639669be77392c39ed4c8fdbd,Merge_failed,8d2cb8e6f1f508989c948217f3f204924b3117191bffcbf31a9323f4266b13ef,Merge_failed,18e28cc049c5071db3878889af86610dae8c46e843084a40e23fcb0e0b2f39d4,Merge_failed,18e28cc049c5071db3878889af86610dae8c46e843084a40e23fcb0e0b2f39d4,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,1d9bceb00342f316c6ea1d8059a0b81b0a68d03a991113f9cdce7f356dd4ef43,0.010234832763671875,0.010677814483642578,0.010470390319824219,0.010282516479492188,0.010415077209472656,0.0103912353515625,0.010629415512084961,0.03777790069580078,0.016217708587646484,0.16652178764343262,0.16567587852478027,0.06633734703063965,0.46724987030029297,0.17106413841247559 diff --git a/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv b/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv index 729b5ef8cc..4bdc2e32c4 100644 --- a/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/develop,94f08c7c32d576d99ddd3e215b67653fc99eaeca,b5ac60d0f624ffc26d9c4ac499219fccddb01520,f28bfdf65c3d9df5ecb00be60c44a38fa1c0a153,,True,True,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,3ade099905f25d2168a71c56597f7df29b3b04a066fa144b1f4cf018265d088f,Tests_passed,True,True,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,0.046300649642944336,0.042428016662597656,0.03984546661376953,0.04796171188354492,0.027707576751708984,0.047507286071777344,0.042191505432128906,0.10279989242553711,0.04322481155395508,0.009331941604614258,0.009686946868896484,0.041196346282958984,0.049513816833496094,0.21754837036132812 +9,refs/heads/develop,94f08c7c32d576d99ddd3e215b67653fc99eaeca,b5ac60d0f624ffc26d9c4ac499219fccddb01520,f28bfdf65c3d9df5ecb00be60c44a38fa1c0a153,,True,True,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,3ade099905f25d2168a71c56597f7df29b3b04a066fa144b1f4cf018265d088f,Tests_passed,True,True,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,0.046300649642944336,0.042428016662597656,0.03984546661376953,0.04796171188354492,0.027707576751708984,0.047507286071777344,0.042191505432128906,0.10279989242553711,0.04322481155395508,0.009168386459350586,0.009200096130371094,0.041196346282958984,0.049513816833496094,0.21754837036132812 diff --git a/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv b/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv index c82fe7d35d..7fa7d61310 100644 --- a/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -111,refs/heads/master,4110663ba811f5ac1d99f3997dbd5513dcbe784d,a88f487a4e2095c2d2c55980c38e158217b3ec5b,5315aafdbe128c07fd15c4493cd6a275ac140119,,True,True,7ac61f26f56e9a0dc0dd0701f8970d65d7255480da7aad88251b00714286f2d3,Tests_passed,64f9ca7519c2846d5e3acd4a3f7174e0bfe4ddc1d5024974fc02938a8a0d2bb6,Tests_passed,True,True,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,0.047794342041015625,0.050707101821899414,0.04397988319396973,0.041318655014038086,0.033890485763549805,0.04804682731628418,0.04433393478393555,0.1749563217163086,0.037322998046875,0.16341233253479004,0.16256999969482422,0.11424827575683594,0.6564257144927979,0.22610116004943848 +111,refs/heads/master,4110663ba811f5ac1d99f3997dbd5513dcbe784d,a88f487a4e2095c2d2c55980c38e158217b3ec5b,5315aafdbe128c07fd15c4493cd6a275ac140119,,True,True,7ac61f26f56e9a0dc0dd0701f8970d65d7255480da7aad88251b00714286f2d3,Tests_passed,64f9ca7519c2846d5e3acd4a3f7174e0bfe4ddc1d5024974fc02938a8a0d2bb6,Tests_passed,True,True,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,0.047794342041015625,0.050707101821899414,0.04397988319396973,0.041318655014038086,0.033890485763549805,0.04804682731628418,0.04433393478393555,0.1749563217163086,0.037322998046875,0.16039180755615234,0.16102862358093262,0.11424827575683594,0.6564257144927979,0.22610116004943848 diff --git a/results/combined/merges_timed/jenkinsci/jira-plugin.csv b/results/combined/merges_timed/jenkinsci/jira-plugin.csv index 9c66cf6fc5..56641dd9f9 100644 --- a/results/combined/merges_timed/jenkinsci/jira-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/jira-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -162,refs/heads/master,6ad78581c99587e433715daa56d29b61201e5590,dee906a5f334519d178023f61cdb659473830721,cb12c4d50da9a33540830c117b398589f85d6239,,True,True,5e51adb79fc8acb192b330dc2df954de3b3711e44b60fe08f71b634545c6149a,Tests_passed,e6d3a99d1509ae354d0d0abfcae9e6207b569d26f96aa38e96d01b01fad04bd8,Tests_passed,True,True,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,60875cac8e0770e32501514c1c4de3fd3aa804995d7923828c5a17d7bff6d339,Tests_passed,60875cac8e0770e32501514c1c4de3fd3aa804995d7923828c5a17d7bff6d339,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,0.014419317245483398,0.015277624130249023,0.016493558883666992,0.01668381690979004,0.015999794006347656,0.016013145446777344,0.0162353515625,0.05554032325744629,0.014216899871826172,0.3176865577697754,0.31616759300231934,0.11978411674499512,1.7181119918823242,0.21940398216247559 +162,refs/heads/master,6ad78581c99587e433715daa56d29b61201e5590,dee906a5f334519d178023f61cdb659473830721,cb12c4d50da9a33540830c117b398589f85d6239,,True,True,5e51adb79fc8acb192b330dc2df954de3b3711e44b60fe08f71b634545c6149a,Tests_passed,e6d3a99d1509ae354d0d0abfcae9e6207b569d26f96aa38e96d01b01fad04bd8,Tests_passed,True,True,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,60875cac8e0770e32501514c1c4de3fd3aa804995d7923828c5a17d7bff6d339,Tests_passed,60875cac8e0770e32501514c1c4de3fd3aa804995d7923828c5a17d7bff6d339,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,0.014419317245483398,0.015277624130249023,0.016493558883666992,0.01668381690979004,0.015999794006347656,0.016013145446777344,0.0162353515625,0.05554032325744629,0.014216899871826172,0.31168413162231445,0.3137025833129883,0.11978411674499512,1.7181119918823242,0.21940398216247559 diff --git a/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv b/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv index 5120df9539..e0abd7b86d 100644 --- a/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -120,refs/remotes/origin/pull/79,7feab60b0e47b5866e16881a0e5c86e100fc54eb,fc25ab3f98aedadb6062db1035f66aa3d2b82c03,59e266729e67209ab31606ce161ad4e46bd0159d,,True,True,adaaa463bf65ff8412311a92c532464b3ce547cf70db04eece7153d91b1c4512,Tests_passed,fbe0375142d9ecf36171a214f10bbd015f52970d0de84edfe357e6aba091526b,Tests_passed,True,True,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,eaa890a5a8935167972d34d0e233980b58cdbd373219220bc734b31edd99083a,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,d33cd7f15e5fd927ec3c45d1b70e33703ff381e6d42b7981bc512f679a2cea56,0.07540559768676758,0.01395559310913086,0.0915689468383789,0.09177923202514648,0.09095644950866699,0.09123349189758301,0.09136009216308594,0.14117789268493652,0.09161233901977539,0.39487218856811523,0.38935422897338867,0.18657612800598145,1.8643519878387451,0.28185606002807617 +120,refs/remotes/origin/pull/79,7feab60b0e47b5866e16881a0e5c86e100fc54eb,fc25ab3f98aedadb6062db1035f66aa3d2b82c03,59e266729e67209ab31606ce161ad4e46bd0159d,,True,True,adaaa463bf65ff8412311a92c532464b3ce547cf70db04eece7153d91b1c4512,Tests_passed,fbe0375142d9ecf36171a214f10bbd015f52970d0de84edfe357e6aba091526b,Tests_passed,True,True,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,eaa890a5a8935167972d34d0e233980b58cdbd373219220bc734b31edd99083a,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,d33cd7f15e5fd927ec3c45d1b70e33703ff381e6d42b7981bc512f679a2cea56,0.07540559768676758,0.01395559310913086,0.0915689468383789,0.09177923202514648,0.09095644950866699,0.09123349189758301,0.09136009216308594,0.14117789268493652,0.09161233901977539,0.3816525936126709,0.3905766010284424,0.18657612800598145,1.8643519878387451,0.28185606002807617 diff --git a/results/combined/merges_timed/jenkinsci/junit-plugin.csv b/results/combined/merges_timed/jenkinsci/junit-plugin.csv index ba9ae6691f..d8ef40dd70 100644 --- a/results/combined/merges_timed/jenkinsci/junit-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/junit-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -33,refs/heads/master,2f4179baf22a128be210110ef0752c9a333e3a66,5d5a97fd1a1918a764a08653fc86d1e42d136c99,a70eb66a170d82beff6865a95891740c872daa5c,,True,True,d58d201698df63328f9de94e1b844de17cc597ea8763a5c3efb7b514e43af744,Tests_passed,37546d70380f886331fd366e9cb5968d5aef5e6ef473a9fbbabe888f07f1b9b4,Tests_passed,True,True,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,0.03512287139892578,0.014127492904663086,0.04641914367675781,0.01484060287475586,0.04647469520568848,0.014190196990966797,0.0465397834777832,0.06742024421691895,0.034076690673828125,0.16732501983642578,0.1685187816619873,0.09061408042907715,1.0644755363464355,0.23385095596313477 +33,refs/heads/master,2f4179baf22a128be210110ef0752c9a333e3a66,5d5a97fd1a1918a764a08653fc86d1e42d136c99,a70eb66a170d82beff6865a95891740c872daa5c,,True,True,d58d201698df63328f9de94e1b844de17cc597ea8763a5c3efb7b514e43af744,Tests_passed,37546d70380f886331fd366e9cb5968d5aef5e6ef473a9fbbabe888f07f1b9b4,Tests_passed,True,True,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,0.03512287139892578,0.014127492904663086,0.04641914367675781,0.01484060287475586,0.04647469520568848,0.014190196990966797,0.0465397834777832,0.06742024421691895,0.034076690673828125,0.16931796073913574,0.1682262420654297,0.09061408042907715,1.0644755363464355,0.23385095596313477 diff --git a/results/combined/merges_timed/jenkinsci/ldap-plugin.csv b/results/combined/merges_timed/jenkinsci/ldap-plugin.csv index 11ff96f58f..9d80f2e760 100644 --- a/results/combined/merges_timed/jenkinsci/ldap-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ldap-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -123,refs/remotes/origin/pull/221,fd4cb463ba89f3a6b95707c4cc713d02e45c96e7,7552866a43fa4194b33298c432a1df15bd2e4b34,8cabafe79fad1d461c2f337a9fbfe5046f151f31,,True,True,c678ebd0a70f05c5dd7a9f6f67b4965483c1fb1c78174bea1d08fc78780033d3,Tests_passed,5accbeb4d91349d1cf8ae22b0e84fec8088e8eaa919462730e3cf3f09e3a7a54,Tests_passed,True,True,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aee29310a316508899a263387ddac86e9a2029e06849906d1db6dfc3b5d5c174,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,0.017994165420532227,0.01909661293029785,0.021667003631591797,0.021930694580078125,0.021820783615112305,0.022464275360107422,0.02187180519104004,0.0770258903503418,0.017920970916748047,0.38908815383911133,0.39298295974731445,0.17847466468811035,3.612011194229126,0.18932199478149414 +123,refs/remotes/origin/pull/221,fd4cb463ba89f3a6b95707c4cc713d02e45c96e7,7552866a43fa4194b33298c432a1df15bd2e4b34,8cabafe79fad1d461c2f337a9fbfe5046f151f31,,True,True,c678ebd0a70f05c5dd7a9f6f67b4965483c1fb1c78174bea1d08fc78780033d3,Tests_passed,5accbeb4d91349d1cf8ae22b0e84fec8088e8eaa919462730e3cf3f09e3a7a54,Tests_passed,True,True,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aee29310a316508899a263387ddac86e9a2029e06849906d1db6dfc3b5d5c174,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,0.017994165420532227,0.01909661293029785,0.021667003631591797,0.021930694580078125,0.021820783615112305,0.022464275360107422,0.02187180519104004,0.0770258903503418,0.017920970916748047,0.3760042190551758,0.3775146007537842,0.17847466468811035,3.612011194229126,0.18932199478149414 diff --git a/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv b/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv index f0bc3b73d9..ef48317300 100644 --- a/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/develop,a4d0e3ca611eef6567b9ac34a8b8453a35fb4fd8,b57168beaa534d38eb0fe3d14b5a647ea967e378,13dbf9ee6740a819a5fd36fb9d35601f690dc220,,True,True,07648d91aee9d0f6e494194a78a97607be539191d4020ace934218fccd873032,Tests_passed,dc6f04a493944036cc570f7ba9b270645760c760cb0951b8834da36419cb86db,Tests_passed,True,True,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,8497082d49ac979b18d77baa35fe16f401dd413db07b7ea62ead99f5216e5afc,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Merge_failed,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Merge_failed,97762cb4a8c0e0535c7683a9bd6b863ec1be27a8bced1ad96eb84145f8b687fb,0.009721040725708008,0.009544849395751953,0.009685516357421875,0.009735584259033203,0.009557723999023438,0.01011037826538086,0.010057687759399414,0.06022191047668457,0.014816045761108398,0.4549243450164795,0.4521331787109375,0.1729588508605957,2.170079469680786,0.1795506477355957 +4,refs/heads/develop,a4d0e3ca611eef6567b9ac34a8b8453a35fb4fd8,b57168beaa534d38eb0fe3d14b5a647ea967e378,13dbf9ee6740a819a5fd36fb9d35601f690dc220,,True,True,07648d91aee9d0f6e494194a78a97607be539191d4020ace934218fccd873032,Tests_passed,dc6f04a493944036cc570f7ba9b270645760c760cb0951b8834da36419cb86db,Tests_passed,True,True,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,8497082d49ac979b18d77baa35fe16f401dd413db07b7ea62ead99f5216e5afc,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Merge_failed,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Merge_failed,97762cb4a8c0e0535c7683a9bd6b863ec1be27a8bced1ad96eb84145f8b687fb,0.009721040725708008,0.009544849395751953,0.009685516357421875,0.009735584259033203,0.009557723999023438,0.01011037826538086,0.010057687759399414,0.06022191047668457,0.014816045761108398,0.44756102561950684,0.44707298278808594,0.1729588508605957,2.170079469680786,0.1795506477355957 diff --git a/results/combined/merges_timed/jenkinsci/mailer-plugin.csv b/results/combined/merges_timed/jenkinsci/mailer-plugin.csv index 1fe2617332..d3ced70dc4 100644 --- a/results/combined/merges_timed/jenkinsci/mailer-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/mailer-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,06a11a1de909d15bacd04459d29807af9e0882d8,7deeda155287f04384088e250f40c59ef151d305,cc4c337146011301d9c6f4ab9269bad52a83f8e3,,True,True,b7977e1d365e6a0d3243f110fd22a3593e3970de3d9085b28ba869648e1cb443,Tests_passed,d03eab9b6e7b54c9c752a738fa4147450f60425db3c9da196bef9f45f9f41074,Tests_passed,True,True,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,e25209df566c229cdfbd36c89d62238fe6ee65e19ad7fbd15dd3311bbff8021a,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,e25209df566c229cdfbd36c89d62238fe6ee65e19ad7fbd15dd3311bbff8021a,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,62a9a4fe430ecd0fc31d0412c5897d12228f6e12cb75af749b9e3427103e3caf,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,99ad27ceab705591f5ac9c59e6ba7c7923ce7fae66cde93557eb06af39f867b2,Merge_failed,99ad27ceab705591f5ac9c59e6ba7c7923ce7fae66cde93557eb06af39f867b2,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,81b8dd259b81a17907dc8c6c6765a61f5f964cd70fb64bc88776818b595fd4b2,Merge_failed,c37a2489b6644311855de201a164a7ac8f50b45c7f5503a6802664e709566425,0.011716604232788086,0.011257410049438477,0.011705875396728516,0.011518716812133789,0.011629819869995117,0.012204408645629883,0.012160539627075195,0.0511624813079834,0.02010512351989746,0.07823991775512695,0.06855487823486328,0.12544035911560059,1.1870241165161133,0.16150355339050293 +14,refs/heads/master,06a11a1de909d15bacd04459d29807af9e0882d8,7deeda155287f04384088e250f40c59ef151d305,cc4c337146011301d9c6f4ab9269bad52a83f8e3,,True,True,b7977e1d365e6a0d3243f110fd22a3593e3970de3d9085b28ba869648e1cb443,Tests_passed,d03eab9b6e7b54c9c752a738fa4147450f60425db3c9da196bef9f45f9f41074,Tests_passed,True,True,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,e25209df566c229cdfbd36c89d62238fe6ee65e19ad7fbd15dd3311bbff8021a,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,e25209df566c229cdfbd36c89d62238fe6ee65e19ad7fbd15dd3311bbff8021a,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,62a9a4fe430ecd0fc31d0412c5897d12228f6e12cb75af749b9e3427103e3caf,Merge_failed,1c8b0225341bfbee5422c4ea4555395f845b01de58525afddaaf4ceda7bc13d9,Merge_failed,99ad27ceab705591f5ac9c59e6ba7c7923ce7fae66cde93557eb06af39f867b2,Merge_failed,99ad27ceab705591f5ac9c59e6ba7c7923ce7fae66cde93557eb06af39f867b2,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,81b8dd259b81a17907dc8c6c6765a61f5f964cd70fb64bc88776818b595fd4b2,Merge_failed,c37a2489b6644311855de201a164a7ac8f50b45c7f5503a6802664e709566425,0.011716604232788086,0.011257410049438477,0.011705875396728516,0.011518716812133789,0.011629819869995117,0.012204408645629883,0.012160539627075195,0.0511624813079834,0.02010512351989746,0.07808971405029297,0.07737374305725098,0.12544035911560059,1.1870241165161133,0.16150355339050293 diff --git a/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv b/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv index 1df9653c1a..83a10a1795 100644 --- a/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -181,refs/remotes/origin/pull/323,67abe2c502f27a1b6676e7e5ffdc5f0544ab1f5f,a3302aa4a69f1db5f3a843fa2bf48eb0ea6d84de,f4e6886ff1d6eabff84a03b78f0e8a2aae9a0dee,,903206fac46e8412fac58fda3ea664cffc390795edd477f4e133cc496dab4b8d,Tests_passed,b07f7512f3e2b0fd7c9b93a8b0c27ee475595e530cb40c14c8d9711895a32bc1,Tests_passed,True,True,True,True,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,85ec0bc3b448ce6ff05be4204e56290a65f4436d015fc09a5af813155997918a,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,948aabdb06fc6e30872a1a5cec9156713a5e0ee4cd544591becba97ddcdf68be,Merge_failed,948aabdb06fc6e30872a1a5cec9156713a5e0ee4cd544591becba97ddcdf68be,Merge_failed,01bb8df73585c3e327e65fe5eb4331369e1c1180acf5f894a98ebc3304c40dd5,Merge_failed,04f92c355bde7e945be83c9a313d8868cee3e3c3123d80aff25b6468e0e38408,Merge_failed,abc0d01c8d1a84ee4b463c584fac98bef753d7b813c9ef510318c710d2f6ddd0,0.012847661972045898,0.0126190185546875,0.013224363327026367,0.013382911682128906,0.01372528076171875,0.014285087585449219,0.014081716537475586,0.045313358306884766,0.02247476577758789,0.13571715354919434,0.17134952545166016,0.07057023048400879,0.5301423072814941,0.1766805648803711 +181,refs/remotes/origin/pull/323,67abe2c502f27a1b6676e7e5ffdc5f0544ab1f5f,a3302aa4a69f1db5f3a843fa2bf48eb0ea6d84de,f4e6886ff1d6eabff84a03b78f0e8a2aae9a0dee,,903206fac46e8412fac58fda3ea664cffc390795edd477f4e133cc496dab4b8d,Tests_passed,b07f7512f3e2b0fd7c9b93a8b0c27ee475595e530cb40c14c8d9711895a32bc1,Tests_passed,True,True,True,True,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,85ec0bc3b448ce6ff05be4204e56290a65f4436d015fc09a5af813155997918a,Merge_failed,7506e7238a04cbce30e4a489f0ed7781ff64e0bb6e301b14e1a8db4e8724595b,Merge_failed,948aabdb06fc6e30872a1a5cec9156713a5e0ee4cd544591becba97ddcdf68be,Merge_failed,948aabdb06fc6e30872a1a5cec9156713a5e0ee4cd544591becba97ddcdf68be,Merge_failed,01bb8df73585c3e327e65fe5eb4331369e1c1180acf5f894a98ebc3304c40dd5,Merge_failed,04f92c355bde7e945be83c9a313d8868cee3e3c3123d80aff25b6468e0e38408,Merge_failed,abc0d01c8d1a84ee4b463c584fac98bef753d7b813c9ef510318c710d2f6ddd0,0.012847661972045898,0.0126190185546875,0.013224363327026367,0.013382911682128906,0.01372528076171875,0.014285087585449219,0.014081716537475586,0.045313358306884766,0.02247476577758789,0.15102720260620117,0.13637757301330566,0.07057023048400879,0.5301423072814941,0.1766805648803711 diff --git a/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv b/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv index ece1abb1ac..476d9bad98 100644 --- a/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -41,refs/heads/master,442c688d35c5d22fd37822285b997c0addc5c3eb,7ad0c7ed48378c86e23c90fadc32e647bbcd45c0,2a6bc4be4425be43e355067e0c3bfc0c8db5ee76,,9eac327212a73c1e75f93937810cb27ebc80878505ccdca34c96db826bded004,Tests_passed,82844bccf5727fd47ced32a688634253da9682292f5caca1946fe9e8c189c363,Tests_passed,True,True,True,True,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,0.012492179870605469,0.01269221305847168,0.015578985214233398,0.01525568962097168,0.015403509140014648,0.015561103820800781,0.015411138534545898,0.042191505432128906,0.012513160705566406,0.15138483047485352,0.15076923370361328,0.06831741333007812,0.625678300857544,0.1838080883026123 +41,refs/heads/master,442c688d35c5d22fd37822285b997c0addc5c3eb,7ad0c7ed48378c86e23c90fadc32e647bbcd45c0,2a6bc4be4425be43e355067e0c3bfc0c8db5ee76,,9eac327212a73c1e75f93937810cb27ebc80878505ccdca34c96db826bded004,Tests_passed,82844bccf5727fd47ced32a688634253da9682292f5caca1946fe9e8c189c363,Tests_passed,True,True,True,True,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,0.012492179870605469,0.01269221305847168,0.015578985214233398,0.01525568962097168,0.015403509140014648,0.015561103820800781,0.015411138534545898,0.042191505432128906,0.012513160705566406,0.14819717407226562,0.14878439903259277,0.06831741333007812,0.625678300857544,0.1838080883026123 diff --git a/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv b/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv index 5372d05475..d5c8c85b81 100644 --- a/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,94ea285c76a8bd6fec6c17193488009557d4ab2c,e8c66c2217dba216df05030200e0704684c1dda4,fd7070ab51330e9a4919a773408d927f43b6b6ec,,True,True,0b8a32a4f448291b6a1d829f2cdb29c7b970b74b4a1886047fba917eb1d9f98b,Tests_passed,c45470d6a8e382d7af6526f9073a25f39ff27ddfd09883300b0ff85bf54b3141,Tests_passed,True,True,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,0.04579353332519531,0.04236292839050293,0.04701399803161621,0.04546761512756348,0.04216194152832031,0.04418683052062988,0.0454404354095459,0.23775672912597656,0.04575014114379883,0.3115823268890381,0.30775928497314453,0.17183160781860352,1.830491542816162,0.18924784660339355 +4,refs/heads/master,94ea285c76a8bd6fec6c17193488009557d4ab2c,e8c66c2217dba216df05030200e0704684c1dda4,fd7070ab51330e9a4919a773408d927f43b6b6ec,,True,True,0b8a32a4f448291b6a1d829f2cdb29c7b970b74b4a1886047fba917eb1d9f98b,Tests_passed,c45470d6a8e382d7af6526f9073a25f39ff27ddfd09883300b0ff85bf54b3141,Tests_passed,True,True,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,0.04579353332519531,0.04236292839050293,0.04701399803161621,0.04546761512756348,0.04216194152832031,0.04418683052062988,0.0454404354095459,0.23775672912597656,0.04575014114379883,0.3045651912689209,0.30468297004699707,0.17183160781860352,1.830491542816162,0.18924784660339355 diff --git a/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv b/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv index fb8dbb453b..808d2239d0 100644 --- a/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/remotes/origin/pull/73,1b83e76b9746823f89b48506efbc043c0b42646f,e3731a6f6485dc93f46c48ddc81882b20bc54d5c,c3da4fa3e757e55ce78e3477d3e6f96b7ab865e2,,True,True,8dbd36c05296e7bfe203e5c54f5eba61c2ceed9ba969bf390ec6830c98450004,Tests_passed,bb1debed5b38d446f4e05acb0a158cd995a3b386406ccfd93d10d9c381c59ca2,Tests_passed,True,True,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,c18033e0778783adefa90a7bf71fdfa24d260e632cdb74f7e7648aee03d80420,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,21bceaf680bf250c370e13e48bbdf9ebddc8ba78fff5196a60b34771f94022de,Merge_failed,21bceaf680bf250c370e13e48bbdf9ebddc8ba78fff5196a60b34771f94022de,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,0d177e124dcc4350398208b97f329c9d1eb6de5ec26cb9bf993c5fb90c2e99e7,0.037672996520996094,0.036737680435180664,0.03862285614013672,0.03915119171142578,0.04468488693237305,0.03654122352600098,0.041373252868652344,0.29058074951171875,0.0793919563293457,0.3444230556488037,0.3456146717071533,0.24038410186767578,2.5889248847961426,0.20974230766296387 +26,refs/remotes/origin/pull/73,1b83e76b9746823f89b48506efbc043c0b42646f,e3731a6f6485dc93f46c48ddc81882b20bc54d5c,c3da4fa3e757e55ce78e3477d3e6f96b7ab865e2,,True,True,8dbd36c05296e7bfe203e5c54f5eba61c2ceed9ba969bf390ec6830c98450004,Tests_passed,bb1debed5b38d446f4e05acb0a158cd995a3b386406ccfd93d10d9c381c59ca2,Tests_passed,True,True,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,c18033e0778783adefa90a7bf71fdfa24d260e632cdb74f7e7648aee03d80420,Merge_failed,dd19bd7096a7727a2e1485f1a71d58b338a0dd0d11d4d39c17b933d27ee7fc45,Merge_failed,21bceaf680bf250c370e13e48bbdf9ebddc8ba78fff5196a60b34771f94022de,Merge_failed,21bceaf680bf250c370e13e48bbdf9ebddc8ba78fff5196a60b34771f94022de,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,0d177e124dcc4350398208b97f329c9d1eb6de5ec26cb9bf993c5fb90c2e99e7,0.037672996520996094,0.036737680435180664,0.03862285614013672,0.03915119171142578,0.04468488693237305,0.03654122352600098,0.041373252868652344,0.29058074951171875,0.0793919563293457,0.34442949295043945,0.34159207344055176,0.24038410186767578,2.5889248847961426,0.20974230766296387 diff --git a/results/combined/merges_timed/jenkinsci/plot-plugin.csv b/results/combined/merges_timed/jenkinsci/plot-plugin.csv index 32a3af7130..50c709ec37 100644 --- a/results/combined/merges_timed/jenkinsci/plot-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/plot-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -71,refs/remotes/origin/pull/71,047e97312d44206b7c8b3f19c46aea40cb65b22a,448c2265849e8ab8953aef9fc16c510c879450ea,3c1ac06b43dcc820faeca28b71922231e682d429,,True,True,49e0cb0ef7afeded35b5996aea911f00758729e3eda26e8a7940029f126492f9,Tests_passed,23eb6d208ecc54e9c35c0b9f45b372253960606ce43e8a326beecf38fbc90bed,Tests_passed,True,True,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,0.013599395751953125,0.01356816291809082,0.014861583709716797,0.01477813720703125,0.015224933624267578,0.014503002166748047,0.01479482650756836,0.053110361099243164,0.01336216926574707,0.3233036994934082,0.32230377197265625,0.12256264686584473,2.021440267562866,0.1958599090576172 +71,refs/remotes/origin/pull/71,047e97312d44206b7c8b3f19c46aea40cb65b22a,448c2265849e8ab8953aef9fc16c510c879450ea,3c1ac06b43dcc820faeca28b71922231e682d429,,True,True,49e0cb0ef7afeded35b5996aea911f00758729e3eda26e8a7940029f126492f9,Tests_passed,23eb6d208ecc54e9c35c0b9f45b372253960606ce43e8a326beecf38fbc90bed,Tests_passed,True,True,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,0.013599395751953125,0.01356816291809082,0.014861583709716797,0.01477813720703125,0.015224933624267578,0.014503002166748047,0.01479482650756836,0.053110361099243164,0.01336216926574707,0.3208315372467041,0.3208167552947998,0.12256264686584473,2.021440267562866,0.1958599090576172 diff --git a/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv b/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv index 51d885b00f..4601ea5cd3 100644 --- a/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -49,refs/heads/master,90cff675a1008c2167bd647a27a4c62f3b9a9c6a,af28c1241fac960920e8700cdde08c8f4d54414f,219727bd20bac7fad6f71fa77b33d192a36e72c6,,e7ff9c59df7a232ff0c03172efcecf68ce81a3b7b9a8a4843edf911e4dd3fb62,Tests_passed,ea06d927f2569648bb447f8d065ec5e6d0fe724fb4e3beeb14829af3164e1c52,Tests_passed,True,True,True,True,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,83cecea0eb6657d355449d158a277a7369da867da4f5930fb4cc907a69c99487,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,645e629ee62c295ad558a4bccf48a7c92c08be4752113484e0b6578622788e58,Merge_failed,645e629ee62c295ad558a4bccf48a7c92c08be4752113484e0b6578622788e58,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Merge_failed,0ff5733c358bdd31e379c293c437c89f684f739977bfb4ab594c1c16d5fc1a77,0.04456949234008789,0.04310798645019531,0.04223942756652832,0.03923296928405762,0.03853011131286621,0.044621944427490234,0.033077239990234375,0.13556170463562012,0.0659036636352539,0.07030463218688965,0.07165980339050293,0.11705183982849121,1.042269229888916,0.2236008644104004 +49,refs/heads/master,90cff675a1008c2167bd647a27a4c62f3b9a9c6a,af28c1241fac960920e8700cdde08c8f4d54414f,219727bd20bac7fad6f71fa77b33d192a36e72c6,,e7ff9c59df7a232ff0c03172efcecf68ce81a3b7b9a8a4843edf911e4dd3fb62,Tests_passed,ea06d927f2569648bb447f8d065ec5e6d0fe724fb4e3beeb14829af3164e1c52,Tests_passed,True,True,True,True,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,83cecea0eb6657d355449d158a277a7369da867da4f5930fb4cc907a69c99487,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,645e629ee62c295ad558a4bccf48a7c92c08be4752113484e0b6578622788e58,Merge_failed,645e629ee62c295ad558a4bccf48a7c92c08be4752113484e0b6578622788e58,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Merge_failed,0ff5733c358bdd31e379c293c437c89f684f739977bfb4ab594c1c16d5fc1a77,0.04456949234008789,0.04310798645019531,0.04223942756652832,0.03923296928405762,0.03853011131286621,0.044621944427490234,0.033077239990234375,0.13556170463562012,0.0659036636352539,0.07135891914367676,0.06438708305358887,0.11705183982849121,1.042269229888916,0.2236008644104004 diff --git a/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv b/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv index 99f8043147..8290afebda 100644 --- a/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -71,refs/remotes/origin/pull/64,fa2a472f46cbbfe1e0c7c4d0e3f0d40a1bb33a19,1adfe8fb9559836a45a99c86ad80605f2c30b1b4,fbf91ab63db56523914007976c7d2a369be08065,,True,True,ba1dbb64f06280d9e24bfb04575fe72dc269545f18290c6fdf41d1b3c8e68baf,Tests_passed,4b277c7cd1ea44107ed47f25e7da9f7a2c4938e07ff7b0c06333fdf4411cec5a,Tests_passed,True,True,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,0.010820150375366211,0.011069297790527344,0.012006521224975586,0.011275053024291992,0.011603355407714844,0.011385202407836914,0.011369705200195312,0.036032915115356445,0.010467767715454102,0.17093992233276367,0.17094063758850098,0.06627774238586426,0.9948873519897461,0.1615312099456787 +71,refs/remotes/origin/pull/64,fa2a472f46cbbfe1e0c7c4d0e3f0d40a1bb33a19,1adfe8fb9559836a45a99c86ad80605f2c30b1b4,fbf91ab63db56523914007976c7d2a369be08065,,True,True,ba1dbb64f06280d9e24bfb04575fe72dc269545f18290c6fdf41d1b3c8e68baf,Tests_passed,4b277c7cd1ea44107ed47f25e7da9f7a2c4938e07ff7b0c06333fdf4411cec5a,Tests_passed,True,True,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,0.010820150375366211,0.011069297790527344,0.012006521224975586,0.011275053024291992,0.011603355407714844,0.011385202407836914,0.011369705200195312,0.036032915115356445,0.010467767715454102,0.16385531425476074,0.16555380821228027,0.06627774238586426,0.9948873519897461,0.1615312099456787 diff --git a/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv b/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv index faf94a0552..e0745ba1ad 100644 --- a/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/remotes/origin/pull/6,39375b570201fcf8b133343bea4d124bf7351210,92be9dc3bb9db0abf462653b236dd5ee69d21156,3d8ce2e3cb1e769fca79b0f08be9d449f83dea21,,True,True,8fc2c75921936a7c2fc8979207818efe527e802b6f9ab513b8db0b1e85ccf78f,Tests_passed,010ab39676fafa2f98562da90f6b8b1b2f58d8d61fccae47c884f13f428a1ffa,Tests_passed,True,True,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,352ecfe60a8c562664eda1cb46e275c50530461bac4d3dc1116e66c0882da138,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,352ecfe60a8c562664eda1cb46e275c50530461bac4d3dc1116e66c0882da138,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,f7869cda2fbd13fc39e3658f80b1f9eb031187acd856f3c22479fa66cb84ad41,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,166f7e32f2c7388ba71ed035f413abb38d6007a9ba2d8678b3086020ed1a218d,Merge_failed,1060561cc522d5972a3567642d5d8e394930c819e53d2e6040cf406a45e854d8,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,c489a634b9d773226ee45f18c9be35e42e6bc866422607df51edf53e3000e756,Merge_failed,c4839ed75f4cbeb3965a407db6687138200d6e34cfa0e7090ccc5b95c6657bba,0.05094456672668457,0.05145668983459473,0.062398672103881836,0.062270164489746094,0.06225466728210449,0.0626833438873291,0.06206226348876953,0.16838884353637695,0.06512737274169922,0.3992433547973633,0.384840726852417,0.32964301109313965,1.5538756847381592,0.20897388458251953 +7,refs/remotes/origin/pull/6,39375b570201fcf8b133343bea4d124bf7351210,92be9dc3bb9db0abf462653b236dd5ee69d21156,3d8ce2e3cb1e769fca79b0f08be9d449f83dea21,,True,True,8fc2c75921936a7c2fc8979207818efe527e802b6f9ab513b8db0b1e85ccf78f,Tests_passed,010ab39676fafa2f98562da90f6b8b1b2f58d8d61fccae47c884f13f428a1ffa,Tests_passed,True,True,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,352ecfe60a8c562664eda1cb46e275c50530461bac4d3dc1116e66c0882da138,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,352ecfe60a8c562664eda1cb46e275c50530461bac4d3dc1116e66c0882da138,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,f7869cda2fbd13fc39e3658f80b1f9eb031187acd856f3c22479fa66cb84ad41,Merge_failed,ef5fb4c65d46c34536ccd6b126c933ed2179572035ce00c9f4f81e69d79294fe,Merge_failed,166f7e32f2c7388ba71ed035f413abb38d6007a9ba2d8678b3086020ed1a218d,Merge_failed,1060561cc522d5972a3567642d5d8e394930c819e53d2e6040cf406a45e854d8,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,c489a634b9d773226ee45f18c9be35e42e6bc866422607df51edf53e3000e756,Merge_failed,c4839ed75f4cbeb3965a407db6687138200d6e34cfa0e7090ccc5b95c6657bba,0.05094456672668457,0.05145668983459473,0.062398672103881836,0.062270164489746094,0.06225466728210449,0.0626833438873291,0.06206226348876953,0.16838884353637695,0.06512737274169922,0.3973517417907715,0.39671850204467773,0.32964301109313965,1.5538756847381592,0.20897388458251953 diff --git a/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv b/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv index 53eeb7b05f..a4f61466f0 100644 --- a/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -68,refs/remotes/origin/pull/260,67b86f05f7f5d4cce393b8a6eeda9ebf5af23307,6d732bfe8d1d195fead4b2c1753b4c79338f0d6d,4b3a02a729f7376a1794920af7d1b661b310339d,,True,True,25a55b9dd6eb461129f7e7ae1b8fbec6b1b0ae381f310f046337cb96cca825a5,Tests_passed,a0c904e5f5a467c4a98640f4391c7ee1d6827367b32ddba1d3422345c372079a,Tests_passed,True,True,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,55c797321bc21aafc117a253a72c7b26b721bf24a604bceff1e3f0619e2668b8,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,3b79e41256ceb5a79bc16a92a0ff424dfc7b5223d8a3e9ca3f97929802f5802a,Merge_failed,3b79e41256ceb5a79bc16a92a0ff424dfc7b5223d8a3e9ca3f97929802f5802a,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Merge_failed,9acc8bc5bbf62e1246fb2553ab32c352f1ee0a3f5d4a4310eea2463ff888ba6a,0.021859407424926758,0.010999679565429688,0.021836042404174805,0.011475086212158203,0.02257561683654785,0.010357141494750977,0.02172541618347168,0.055838823318481445,0.028402328491210938,0.07361865043640137,0.06487631797790527,0.0786142349243164,0.7880175113677979,0.20523786544799805 +68,refs/remotes/origin/pull/260,67b86f05f7f5d4cce393b8a6eeda9ebf5af23307,6d732bfe8d1d195fead4b2c1753b4c79338f0d6d,4b3a02a729f7376a1794920af7d1b661b310339d,,True,True,25a55b9dd6eb461129f7e7ae1b8fbec6b1b0ae381f310f046337cb96cca825a5,Tests_passed,a0c904e5f5a467c4a98640f4391c7ee1d6827367b32ddba1d3422345c372079a,Tests_passed,True,True,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,55c797321bc21aafc117a253a72c7b26b721bf24a604bceff1e3f0619e2668b8,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,3b79e41256ceb5a79bc16a92a0ff424dfc7b5223d8a3e9ca3f97929802f5802a,Merge_failed,3b79e41256ceb5a79bc16a92a0ff424dfc7b5223d8a3e9ca3f97929802f5802a,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Merge_failed,9acc8bc5bbf62e1246fb2553ab32c352f1ee0a3f5d4a4310eea2463ff888ba6a,0.021859407424926758,0.010999679565429688,0.021836042404174805,0.011475086212158203,0.02257561683654785,0.010357141494750977,0.02172541618347168,0.055838823318481445,0.028402328491210938,0.07309484481811523,0.07326078414916992,0.0786142349243164,0.7880175113677979,0.20523786544799805 diff --git a/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv b/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv index cdb78318da..abb91283f4 100644 --- a/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,2df4e9dca40488bdb4d10816d04c1f672de4d57c,cbbe722570d1bdd06267e642af03ddc32ff5f39d,a0d5f66521e3bc470047a0b683004ce8889d3369,,True,True,5da7031c76120c5751f7cdada2178ba36af2c442ffa4c19590ffde5e18b6a861,Tests_passed,08ef0bc46c3164762ed860b24683da2aedf5ebdb899b56405be7c34fad3dc99d,Tests_passed,True,True,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Merge_failed,399af49b22b5cb3cc4ab9f34d291567deb02d32787ba733f4bf1231d76de2d42,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Merge_failed,320b1df5e431a1500fcddf4c654e4e1540dacc0cba7d6b445d646f54d15dbcb9,Merge_failed,320b1df5e431a1500fcddf4c654e4e1540dacc0cba7d6b445d646f54d15dbcb9,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Merge_failed,1cee1a02835452df81654006481222ae630e76a6cdc5ebef97fbf5096e9c1675,0.01439666748046875,0.015810012817382812,0.015296459197998047,0.017889022827148438,0.014990806579589844,0.015125751495361328,0.015153884887695312,0.056555986404418945,0.020418882369995117,0.23597931861877441,0.2373032569885254,0.12335944175720215,1.5844447612762451,0.187300443649292 +20,refs/heads/master,2df4e9dca40488bdb4d10816d04c1f672de4d57c,cbbe722570d1bdd06267e642af03ddc32ff5f39d,a0d5f66521e3bc470047a0b683004ce8889d3369,,True,True,5da7031c76120c5751f7cdada2178ba36af2c442ffa4c19590ffde5e18b6a861,Tests_passed,08ef0bc46c3164762ed860b24683da2aedf5ebdb899b56405be7c34fad3dc99d,Tests_passed,True,True,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Merge_failed,399af49b22b5cb3cc4ab9f34d291567deb02d32787ba733f4bf1231d76de2d42,Merge_failed,ab2c618c1c703475ed5409b9a0aa65c39bbce3eba640f05d61c7c39352cff931,Merge_failed,320b1df5e431a1500fcddf4c654e4e1540dacc0cba7d6b445d646f54d15dbcb9,Merge_failed,320b1df5e431a1500fcddf4c654e4e1540dacc0cba7d6b445d646f54d15dbcb9,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Merge_failed,1cee1a02835452df81654006481222ae630e76a6cdc5ebef97fbf5096e9c1675,0.01439666748046875,0.015810012817382812,0.015296459197998047,0.017889022827148438,0.014990806579589844,0.015125751495361328,0.015153884887695312,0.056555986404418945,0.020418882369995117,0.22944283485412598,0.23813796043395996,0.12335944175720215,1.5844447612762451,0.187300443649292 diff --git a/results/combined/merges_timed/jenkinsci/throttle-concurrent-builds-plugin.csv b/results/combined/merges_timed/jenkinsci/throttle-concurrent-builds-plugin.csv index 620cbae7d0..871b7278fc 100644 --- a/results/combined/merges_timed/jenkinsci/throttle-concurrent-builds-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/throttle-concurrent-builds-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -29,refs/heads/master,5032e15fb75155d73e9fd1bcccc64ce177fdd57b,4bfc64f6985f1303bbf23f9ec15dd1a952b8cae4,c31b212352d2ff3f87404cf546cf22e53a105269,,True,True,732d9321738e21f9182beca1f01b6aa530ddece503824d8477b90e2feb71fcd9,Tests_passed,76f4d30888d5787bcf45fc7bb881cff5c277c96625b6dd93ae7f7099179be25a,Tests_passed,True,True,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,0.010823965072631836,0.010698318481445312,0.01191258430480957,0.011263847351074219,0.011278390884399414,0.01170969009399414,0.0119476318359375,0.0362851619720459,0.010198116302490234,0.16490602493286133,0.16637468338012695,0.0655522346496582,1.237520456314087,0.16074299812316895 +29,refs/heads/master,5032e15fb75155d73e9fd1bcccc64ce177fdd57b,4bfc64f6985f1303bbf23f9ec15dd1a952b8cae4,c31b212352d2ff3f87404cf546cf22e53a105269,,True,True,732d9321738e21f9182beca1f01b6aa530ddece503824d8477b90e2feb71fcd9,Tests_passed,76f4d30888d5787bcf45fc7bb881cff5c277c96625b6dd93ae7f7099179be25a,Tests_passed,True,True,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,0.010823965072631836,0.010698318481445312,0.01191258430480957,0.011263847351074219,0.011278390884399414,0.01170969009399414,0.0119476318359375,0.0362851619720459,0.010198116302490234,0.1643693447113037,0.1652672290802002,0.0655522346496582,1.237520456314087,0.16074299812316895 diff --git a/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv b/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv index caf4ed07c1..582d23d43b 100644 --- a/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -61,refs/remotes/origin/pull/88,47d8b7d061275a8c961c9f0fd17bffcb2a656b89,7c063fb30ca13cca989b49f3834f86504995799b,b2ddd4c391c910628567cbba43e5e48fbd3e16b5,,True,True,871803410282e8e4366c7f14398928a0a3e35656db91dd1f07c559ce97a46242,Tests_passed,4dae64f82b3a67fc14640f9845d7b7e2e6f488771ddfe642c11ed7ff6512f095,Tests_passed,True,True,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,bb353d80ff39078e74ca1328f8e9e92c84241964b06c4ed3003de465c68f1798,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,d24e13a37a92c8d68018ba3a1f61515e21e4fefebb720b3a06f714d668d09e51,Merge_failed,d24e13a37a92c8d68018ba3a1f61515e21e4fefebb720b3a06f714d668d09e51,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Merge_failed,583ba42ce7285a2b709457370adcf04f58dd4f68bdb83f506ded9c3a33e8375f,0.04359030723571777,0.03660440444946289,0.03833913803100586,0.04634284973144531,0.04389691352844238,0.037693023681640625,0.03993344306945801,0.2400355339050293,0.08845925331115723,0.08925318717956543,0.08838796615600586,0.16442227363586426,0.7402603626251221,0.2136378288269043 +61,refs/remotes/origin/pull/88,47d8b7d061275a8c961c9f0fd17bffcb2a656b89,7c063fb30ca13cca989b49f3834f86504995799b,b2ddd4c391c910628567cbba43e5e48fbd3e16b5,,True,True,871803410282e8e4366c7f14398928a0a3e35656db91dd1f07c559ce97a46242,Tests_passed,4dae64f82b3a67fc14640f9845d7b7e2e6f488771ddfe642c11ed7ff6512f095,Tests_passed,True,True,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,bb353d80ff39078e74ca1328f8e9e92c84241964b06c4ed3003de465c68f1798,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,d24e13a37a92c8d68018ba3a1f61515e21e4fefebb720b3a06f714d668d09e51,Merge_failed,d24e13a37a92c8d68018ba3a1f61515e21e4fefebb720b3a06f714d668d09e51,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Merge_failed,583ba42ce7285a2b709457370adcf04f58dd4f68bdb83f506ded9c3a33e8375f,0.04359030723571777,0.03660440444946289,0.03833913803100586,0.04634284973144531,0.04389691352844238,0.037693023681640625,0.03993344306945801,0.2400355339050293,0.08845925331115723,0.08678793907165527,0.08605742454528809,0.16442227363586426,0.7402603626251221,0.2136378288269043 diff --git a/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv b/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv index e9d2c6ba5e..ec98a296cc 100644 --- a/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -28,refs/remotes/origin/pull/14,179ee92cdf658ab0fefbb2e20d341443fbaf5ddd,cd322943dcc1363e90555c011d97ffde1807e6e3,d7e88884dd90310b67193b4aab8139998a107486,,True,True,6761b9b89eb5f3b7e18758f9876712fdd0e1cd766d367e678a691197d01e6677,Tests_passed,015a7155f157be9f6ba6af0e0df998c3e6a140cf7d600492a1fb581b1f86e5c9,Tests_passed,True,True,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,0.01176905632019043,0.01200103759765625,0.012701272964477539,0.012426376342773438,0.012407541275024414,0.01263570785522461,0.013041973114013672,0.03686356544494629,0.011133193969726562,0.15319371223449707,0.15421223640441895,0.06705236434936523,0.5276811122894287,0.17062807083129883 +28,refs/remotes/origin/pull/14,179ee92cdf658ab0fefbb2e20d341443fbaf5ddd,cd322943dcc1363e90555c011d97ffde1807e6e3,d7e88884dd90310b67193b4aab8139998a107486,,True,True,6761b9b89eb5f3b7e18758f9876712fdd0e1cd766d367e678a691197d01e6677,Tests_passed,015a7155f157be9f6ba6af0e0df998c3e6a140cf7d600492a1fb581b1f86e5c9,Tests_passed,True,True,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,0.01176905632019043,0.01200103759765625,0.012701272964477539,0.012426376342773438,0.012407541275024414,0.01263570785522461,0.013041973114013672,0.03686356544494629,0.011133193969726562,0.15137696266174316,0.1515960693359375,0.06705236434936523,0.5276811122894287,0.17062807083129883 diff --git a/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv b/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv index d721026ce6..826098b7fe 100644 --- a/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/master,636236f91bcd67ba35a17a01f43f271fb6150021,52aed37f45183395978126b7b547cdc6372c0126,739387ce7f2b1b61231fb7f5c460ffefde4cfe02,,082b0839f729d1ea6adba90dda0aa0bf06854764125346c6207b4a75e3ef4de9,Tests_passed,a89f5f20c1cd9c02cda65a4cec851eeae7faabd6653b32fc347f9046bb3fd1bf,Tests_passed,True,True,True,True,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,0.046317338943481445,0.03866696357727051,0.05179309844970703,0.046936750411987305,0.04125332832336426,0.04193997383117676,0.04362773895263672,0.045658111572265625,0.053780317306518555,0.16997122764587402,0.1701829433441162,0.12179350852966309,1.2615399360656738,0.21814250946044922 +26,refs/heads/master,636236f91bcd67ba35a17a01f43f271fb6150021,52aed37f45183395978126b7b547cdc6372c0126,739387ce7f2b1b61231fb7f5c460ffefde4cfe02,,082b0839f729d1ea6adba90dda0aa0bf06854764125346c6207b4a75e3ef4de9,Tests_passed,a89f5f20c1cd9c02cda65a4cec851eeae7faabd6653b32fc347f9046bb3fd1bf,Tests_passed,True,True,True,True,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,0.046317338943481445,0.03866696357727051,0.05179309844970703,0.046936750411987305,0.04125332832336426,0.04193997383117676,0.04362773895263672,0.045658111572265625,0.053780317306518555,0.16878414154052734,0.16777276992797852,0.12179350852966309,1.2615399360656738,0.21814250946044922 diff --git a/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv b/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv index 5ce1034da5..fbae27c809 100644 --- a/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -95,refs/remotes/origin/pull/112,9d608121dd2c89e1c5eadb6717ccfa7c412148f9,f5f88b588c8c76b53ca5a569b8f38084bb368c74,e81bbdb1045efc0513bef1271216bc624d375fb1,,True,True,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,Tests_passed,1d41135e87c8ab2c58592179fe5698e7397e6d6054ed65ca76547ef1943c90d0,Tests_passed,True,True,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Merge_failed,b6419a0a468f5cc7496360bf3aefc187394c1c72254d0b41df538ce77571877d,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,b1c34e0fcd479abfac20b4e1457d5fdfe0acbe51f7c8510c48af2ea6eae9e3ac,Merge_failed,b1c34e0fcd479abfac20b4e1457d5fdfe0acbe51f7c8510c48af2ea6eae9e3ac,0.041115522384643555,0.037482500076293945,0.027384519577026367,0.023156166076660156,0.015912294387817383,0.04701805114746094,0.0159909725189209,0.22847580909729004,0.08645296096801758,0.3033437728881836,0.3040452003479004,0.17321085929870605,0.025867938995361328,0.22262787818908691 +95,refs/remotes/origin/pull/112,9d608121dd2c89e1c5eadb6717ccfa7c412148f9,f5f88b588c8c76b53ca5a569b8f38084bb368c74,e81bbdb1045efc0513bef1271216bc624d375fb1,,True,True,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,Tests_passed,1d41135e87c8ab2c58592179fe5698e7397e6d6054ed65ca76547ef1943c90d0,Tests_passed,True,True,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Merge_failed,b6419a0a468f5cc7496360bf3aefc187394c1c72254d0b41df538ce77571877d,Merge_failed,3752fb162f6ec88fb9ef39126d6effcf02180fc820989c6d4b3507c8f83e3db3,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,b1c34e0fcd479abfac20b4e1457d5fdfe0acbe51f7c8510c48af2ea6eae9e3ac,Merge_failed,b1c34e0fcd479abfac20b4e1457d5fdfe0acbe51f7c8510c48af2ea6eae9e3ac,0.041115522384643555,0.037482500076293945,0.027384519577026367,0.023156166076660156,0.015912294387817383,0.04701805114746094,0.0159909725189209,0.22847580909729004,0.08645296096801758,0.3010063171386719,0.30121922492980957,0.17321085929870605,0.025867938995361328,0.22262787818908691 diff --git a/results/combined/merges_timed/jenkinsci/windows-azure-storage-plugin.csv b/results/combined/merges_timed/jenkinsci/windows-azure-storage-plugin.csv index 8959d3f096..fdffeda70d 100644 --- a/results/combined/merges_timed/jenkinsci/windows-azure-storage-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/windows-azure-storage-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -70,refs/remotes/origin/pull/192,68f96cee84c20a9a94696b400e3a5231f0caae4f,40521b451ea70ac7055171aba07f761400fe4e0a,36c07129d7d345a276e8760e33a60e3b4c4f6b3a,,1cab803bfe52b220bb4063ed752b3351f6117caaed56c5e93f14edf4a865ece2,Tests_passed,7c572faa50c82739fb4e5d45354fc7cdf2fb0d93ab7e330a9ad292c5e5e778dc,Tests_passed,True,True,True,True,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,0.011737346649169922,0.012323856353759766,0.013914108276367188,0.013825178146362305,0.013606071472167969,0.01330709457397461,0.013443946838378906,0.0396425724029541,0.012048006057739258,0.16706395149230957,0.16738200187683105,0.06792807579040527,1.1510636806488037,0.18299269676208496 +70,refs/remotes/origin/pull/192,68f96cee84c20a9a94696b400e3a5231f0caae4f,40521b451ea70ac7055171aba07f761400fe4e0a,36c07129d7d345a276e8760e33a60e3b4c4f6b3a,,1cab803bfe52b220bb4063ed752b3351f6117caaed56c5e93f14edf4a865ece2,Tests_passed,7c572faa50c82739fb4e5d45354fc7cdf2fb0d93ab7e330a9ad292c5e5e778dc,Tests_passed,True,True,True,True,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,0.011737346649169922,0.012323856353759766,0.013914108276367188,0.013825178146362305,0.013606071472167969,0.01330709457397461,0.013443946838378906,0.0396425724029541,0.012048006057739258,0.1663048267364502,0.1650693416595459,0.06792807579040527,1.1510636806488037,0.18299269676208496 diff --git a/results/combined/merges_timed/jexp/jpatterns.csv b/results/combined/merges_timed/jexp/jpatterns.csv index a46e8e1b91..b169cc7b31 100644 --- a/results/combined/merges_timed/jexp/jpatterns.csv +++ b/results/combined/merges_timed/jexp/jpatterns.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/remotes/origin/pull/3,ef9f7d0e000c5af9d0a9e6843eed56e7b3450bc9,5305b3ebd8d787b57bf599118826be47097c6d22,14bb2740fde84b37d6f4a48f839c7a1eef194e97,,4e3aec4b6a31cb1b0e2ec76ae1d1b2f4b82c333038cde5c33cca2c30bc04cf28,Tests_passed,85c4ea1f34217247aae5eb9cc08d0a6fa80c466982644fcde419bb884009fbee,Tests_passed,True,True,True,True,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,e6e75c9d6151d5b1f07bb79ada7fe44d47b5d015923a654c31908852e0c1a6e2,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,ecd28a79e44ce97ed3ad9c60eeed7e9628d8dc40e6e58de5a12c55229f715760,Tests_passed,ecd28a79e44ce97ed3ad9c60eeed7e9628d8dc40e6e58de5a12c55229f715760,Merge_failed,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,269e2f25b31869e45f5f1e203706cc2cc9bbd64f4aff0914cb0e510feb4c77ac,0.07150006294250488,0.059450387954711914,0.06499052047729492,0.06132674217224121,0.05617046356201172,0.06578302383422852,0.06175041198730469,1.9265525341033936,0.5854570865631104,6.564327001571655,6.510929584503174,2.6424057483673096,21.234198808670044,0.2630279064178467 +5,refs/remotes/origin/pull/3,ef9f7d0e000c5af9d0a9e6843eed56e7b3450bc9,5305b3ebd8d787b57bf599118826be47097c6d22,14bb2740fde84b37d6f4a48f839c7a1eef194e97,,4e3aec4b6a31cb1b0e2ec76ae1d1b2f4b82c333038cde5c33cca2c30bc04cf28,Tests_passed,85c4ea1f34217247aae5eb9cc08d0a6fa80c466982644fcde419bb884009fbee,Tests_passed,True,True,True,True,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,e6e75c9d6151d5b1f07bb79ada7fe44d47b5d015923a654c31908852e0c1a6e2,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,ecd28a79e44ce97ed3ad9c60eeed7e9628d8dc40e6e58de5a12c55229f715760,Tests_passed,ecd28a79e44ce97ed3ad9c60eeed7e9628d8dc40e6e58de5a12c55229f715760,Merge_failed,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,269e2f25b31869e45f5f1e203706cc2cc9bbd64f4aff0914cb0e510feb4c77ac,0.07150006294250488,0.059450387954711914,0.06499052047729492,0.06132674217224121,0.05617046356201172,0.06578302383422852,0.06175041198730469,1.9265525341033936,0.5854570865631104,6.270048379898071,6.282435178756714,2.6424057483673096,21.234198808670044,0.2630279064178467 diff --git a/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv b/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv index b1d68b5ffc..aeed6fbf69 100644 --- a/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv +++ b/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,266500d1c5d5131664a1538b03399f313936af99,81dcb38041bd12ef136f07a1c11ea8bdcb235237,f0900a36160502da9867e48db990874982c6b9f9,,d29d2b8551e236512b506f5943599f542cb65078548070e621ac7ff4b042ecdd,Tests_passed,ddbaa818eff33f73c7f8f10a1700ef22d0c6db83f1453ef78ca38e9df73b61ab,Tests_passed,True,True,True,True,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,0.013459205627441406,0.01370859146118164,0.016000986099243164,0.015800952911376953,0.015899658203125,0.0160677433013916,0.01641559600830078,0.04207181930541992,0.013483285903930664,0.14788365364074707,0.14799022674560547,0.0690617561340332,0.4411039352416992,0.17579317092895508 +1,refs/heads/master,266500d1c5d5131664a1538b03399f313936af99,81dcb38041bd12ef136f07a1c11ea8bdcb235237,f0900a36160502da9867e48db990874982c6b9f9,,d29d2b8551e236512b506f5943599f542cb65078548070e621ac7ff4b042ecdd,Tests_passed,ddbaa818eff33f73c7f8f10a1700ef22d0c6db83f1453ef78ca38e9df73b61ab,Tests_passed,True,True,True,True,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,0.013459205627441406,0.01370859146118164,0.016000986099243164,0.015800952911376953,0.015899658203125,0.0160677433013916,0.01641559600830078,0.04207181930541992,0.013483285903930664,0.14746761322021484,0.14835286140441895,0.0690617561340332,0.4411039352416992,0.17579317092895508 diff --git a/results/combined/merges_timed/jfaster/mango.csv b/results/combined/merges_timed/jfaster/mango.csv index a75775f19c..b234ddc287 100644 --- a/results/combined/merges_timed/jfaster/mango.csv +++ b/results/combined/merges_timed/jfaster/mango.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/remotes/origin/pull/26,6c28ffc629752987623e939e30b2ae66e1952a2f,ff1a792c607c318590ec447591691a91cedf8875,65c5d160cef1cd5ae01144d6bb809033aba61078,,True,True,33a81092f3a084163e7257a6b2bebbff7deaf9f8694b5879f16dfe4693069bef,Tests_passed,6491b1030229b60f98251a9878b6750e9b2eb812890d0c1b4122812e28f2a940,Tests_passed,True,True,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,55a922a05927fb321ef0a8c689fac3465578f09e09b997d5d13fd42e368b5923,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,36d9fb03309c642ca75752c703cb0eab15392e685cfe1281a2c099b47aa93c20,Merge_failed,36d9fb03309c642ca75752c703cb0eab15392e685cfe1281a2c099b47aa93c20,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,ecb245518a89ee6711c0d7daeb1d6307510a48e34745fbc8d7ad982eceb70a9d,0.06231975555419922,0.05386066436767578,0.04415321350097656,0.0385289192199707,0.05516314506530762,0.05315041542053223,0.0686805248260498,0.1176762580871582,0.07934832572937012,0.21329450607299805,0.21222972869873047,0.17880630493164062,1.3427941799163818,0.48528528213500977 +10,refs/remotes/origin/pull/26,6c28ffc629752987623e939e30b2ae66e1952a2f,ff1a792c607c318590ec447591691a91cedf8875,65c5d160cef1cd5ae01144d6bb809033aba61078,,True,True,33a81092f3a084163e7257a6b2bebbff7deaf9f8694b5879f16dfe4693069bef,Tests_passed,6491b1030229b60f98251a9878b6750e9b2eb812890d0c1b4122812e28f2a940,Tests_passed,True,True,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,55a922a05927fb321ef0a8c689fac3465578f09e09b997d5d13fd42e368b5923,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,36d9fb03309c642ca75752c703cb0eab15392e685cfe1281a2c099b47aa93c20,Merge_failed,36d9fb03309c642ca75752c703cb0eab15392e685cfe1281a2c099b47aa93c20,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,ecb245518a89ee6711c0d7daeb1d6307510a48e34745fbc8d7ad982eceb70a9d,0.06231975555419922,0.05386066436767578,0.04415321350097656,0.0385289192199707,0.05516314506530762,0.05315041542053223,0.0686805248260498,0.1176762580871582,0.07934832572937012,0.21519064903259277,0.21448063850402832,0.17880630493164062,1.3427941799163818,0.48528528213500977 diff --git a/results/combined/merges_timed/jfinal/jfinal.csv b/results/combined/merges_timed/jfinal/jfinal.csv index 1000dfa90f..2ad92d6387 100644 --- a/results/combined/merges_timed/jfinal/jfinal.csv +++ b/results/combined/merges_timed/jfinal/jfinal.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -59,refs/remotes/origin/jfinal-java8,0c6e8ea6cab44a710a87e6168ef10784130e9a7d,e5587b08619f7800a99cde0b8d54b47413009b1d,bf183262ac9b54efd32a258c3263810e9f2c397d,,True,True,7e29d89d38eb0e7b9324c586b3e47a519614e7f739f5d98ae10f670159cf6439,Tests_passed,a20f75e73c999c4d5fa53174f6e9d82fc2f3990dda28e94bd755013db5034ed7,Tests_passed,True,True,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,5db17abe963840df8e61d2a93c1226fafc18fd4541cbbeaf5acba55e23d0f3a9,Tests_passed,5db17abe963840df8e61d2a93c1226fafc18fd4541cbbeaf5acba55e23d0f3a9,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,6f9185baa7138bf9d37bb64f01aa93022a67c9eec3cc036b3ea699f009b7ae2c,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,0.029575109481811523,0.029511213302612305,0.026318788528442383,0.034606218338012695,0.0353085994720459,0.03537702560424805,0.03512930870056152,0.08303642272949219,0.02487945556640625,0.1783137321472168,0.18346095085144043,0.13912129402160645,0.7708566188812256,0.36817479133605957 +59,refs/remotes/origin/jfinal-java8,0c6e8ea6cab44a710a87e6168ef10784130e9a7d,e5587b08619f7800a99cde0b8d54b47413009b1d,bf183262ac9b54efd32a258c3263810e9f2c397d,,True,True,7e29d89d38eb0e7b9324c586b3e47a519614e7f739f5d98ae10f670159cf6439,Tests_passed,a20f75e73c999c4d5fa53174f6e9d82fc2f3990dda28e94bd755013db5034ed7,Tests_passed,True,True,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,5db17abe963840df8e61d2a93c1226fafc18fd4541cbbeaf5acba55e23d0f3a9,Tests_passed,5db17abe963840df8e61d2a93c1226fafc18fd4541cbbeaf5acba55e23d0f3a9,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,6f9185baa7138bf9d37bb64f01aa93022a67c9eec3cc036b3ea699f009b7ae2c,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,0.029575109481811523,0.029511213302612305,0.026318788528442383,0.034606218338012695,0.0353085994720459,0.03537702560424805,0.03512930870056152,0.08303642272949219,0.02487945556640625,0.1759490966796875,0.1710796356201172,0.13912129402160645,0.7708566188812256,0.36817479133605957 diff --git a/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv b/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv index 068019d402..cd229ad024 100644 --- a/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv +++ b/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -47,refs/remotes/origin/pull/115,08f8573776df392bef2843094930ed26e1a39b54,527b02fa114cc6bf196e842ff2301208ce9335c2,5510a3f02afa1a68943069423d710049a50234cf,,True,True,4da1b8e223e67844e679b74f20c0123922c940e9d92c540bba32cb4671fa83e7,Tests_passed,0c72927c38c151d3160f04415aa9f504d5180c2a6e3fdd02e13283eef62bd0b9,Tests_passed,True,True,Merge_failed,874341bcb3c15643301de4ef8d38e33b796fe3652ed9f3367b6f2756e7410ae8,Merge_failed,78aa6f19a29d9621d6e743f5c7c79fee4fa1113e002368ebf6ec4fcb538e0076,Merge_failed,874341bcb3c15643301de4ef8d38e33b796fe3652ed9f3367b6f2756e7410ae8,Merge_failed,78aa6f19a29d9621d6e743f5c7c79fee4fa1113e002368ebf6ec4fcb538e0076,Merge_failed,dade99fe1a1d10fe26cf8e9c0711e39aba02950f77134c4a8e9428f083b8965e,Merge_failed,dade99fe1a1d10fe26cf8e9c0711e39aba02950f77134c4a8e9428f083b8965e,Merge_failed,874341bcb3c15643301de4ef8d38e33b796fe3652ed9f3367b6f2756e7410ae8,Merge_failed,a246d1419a705ae1cccf08c92975112feabcaf220b74727079220ca01ac98a95,Merge_failed,874341bcb3c15643301de4ef8d38e33b796fe3652ed9f3367b6f2756e7410ae8,Merge_failed,be16d95b2cfec68ca31dccaee19ef330e585058a35f1c2c750a14ae509f2b123,Merge_failed,be16d95b2cfec68ca31dccaee19ef330e585058a35f1c2c750a14ae509f2b123,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,6ee99094ae1b0358e8153656469736f477a5f4146b03ed34d0b16e66bd0d493d,0.017512798309326172,0.017928361892700195,0.019116640090942383,0.018454790115356445,0.018294572830200195,0.018285036087036133,0.018404006958007812,0.09440159797668457,0.028916358947753906,0.36089372634887695,0.37175488471984863,0.29701733589172363,3.993100166320801,0.23145484924316406 +47,refs/remotes/origin/pull/115,08f8573776df392bef2843094930ed26e1a39b54,527b02fa114cc6bf196e842ff2301208ce9335c2,5510a3f02afa1a68943069423d710049a50234cf,,True,True,4da1b8e223e67844e679b74f20c0123922c940e9d92c540bba32cb4671fa83e7,Tests_passed,0c72927c38c151d3160f04415aa9f504d5180c2a6e3fdd02e13283eef62bd0b9,Tests_passed,True,True,Merge_failed,874341bcb3c15643301de4ef8d38e33b796fe3652ed9f3367b6f2756e7410ae8,Merge_failed,78aa6f19a29d9621d6e743f5c7c79fee4fa1113e002368ebf6ec4fcb538e0076,Merge_failed,874341bcb3c15643301de4ef8d38e33b796fe3652ed9f3367b6f2756e7410ae8,Merge_failed,78aa6f19a29d9621d6e743f5c7c79fee4fa1113e002368ebf6ec4fcb538e0076,Merge_failed,dade99fe1a1d10fe26cf8e9c0711e39aba02950f77134c4a8e9428f083b8965e,Merge_failed,dade99fe1a1d10fe26cf8e9c0711e39aba02950f77134c4a8e9428f083b8965e,Merge_failed,874341bcb3c15643301de4ef8d38e33b796fe3652ed9f3367b6f2756e7410ae8,Merge_failed,a246d1419a705ae1cccf08c92975112feabcaf220b74727079220ca01ac98a95,Merge_failed,874341bcb3c15643301de4ef8d38e33b796fe3652ed9f3367b6f2756e7410ae8,Merge_failed,be16d95b2cfec68ca31dccaee19ef330e585058a35f1c2c750a14ae509f2b123,Merge_failed,be16d95b2cfec68ca31dccaee19ef330e585058a35f1c2c750a14ae509f2b123,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,6ee99094ae1b0358e8153656469736f477a5f4146b03ed34d0b16e66bd0d493d,0.017512798309326172,0.017928361892700195,0.019116640090942383,0.018454790115356445,0.018294572830200195,0.018285036087036133,0.018404006958007812,0.09440159797668457,0.028916358947753906,0.36251139640808105,0.3637864589691162,0.29701733589172363,3.993100166320801,0.23145484924316406 diff --git a/results/combined/merges_timed/jgralab/jgralab.csv b/results/combined/merges_timed/jgralab/jgralab.csv index 04f3452323..e8416f2d6b 100644 --- a/results/combined/merges_timed/jgralab/jgralab.csv +++ b/results/combined/merges_timed/jgralab/jgralab.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -374,refs/remotes/origin/disk-store,fbd9a0ffd885f02b80fbd72715848d2f0d5c0bc9,e1661886641270fc867fc80e971ccb21bdda20e8,0282b628a97a63728ab36d1837234aa998fbe6f2,,True,True,4e94f6f784c015b60f537cd47d3ff5b6d1794d110ad63a73f030b32ade165c5e,Tests_passed,85847ada20a0be7cf15901e6c180538d8accdff44402fb808c74cc2d360f8adb,Tests_passed,True,True,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Merge_failed,6ad35ef2ce3fcbfc347e37b56fbe3ef573771d59a171ee9cb9d2f87031eeac5e,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Merge_failed,0bbfd03e84bc1b72771fd4b487a8d479e071fba59f2e0b370192934d44215e08,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,0.019261598587036133,0.019805192947387695,0.023595571517944336,0.02446436882019043,0.023405075073242188,0.023762226104736328,0.02151632308959961,0.11314225196838379,0.019435882568359375,0.819434642791748,0.8132896423339844,0.293903112411499,5.831105470657349,0.6854932308197021 +374,refs/remotes/origin/disk-store,fbd9a0ffd885f02b80fbd72715848d2f0d5c0bc9,e1661886641270fc867fc80e971ccb21bdda20e8,0282b628a97a63728ab36d1837234aa998fbe6f2,,True,True,4e94f6f784c015b60f537cd47d3ff5b6d1794d110ad63a73f030b32ade165c5e,Tests_passed,85847ada20a0be7cf15901e6c180538d8accdff44402fb808c74cc2d360f8adb,Tests_passed,True,True,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Merge_failed,6ad35ef2ce3fcbfc347e37b56fbe3ef573771d59a171ee9cb9d2f87031eeac5e,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Merge_failed,0bbfd03e84bc1b72771fd4b487a8d479e071fba59f2e0b370192934d44215e08,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,0.019261598587036133,0.019805192947387695,0.023595571517944336,0.02446436882019043,0.023405075073242188,0.023762226104736328,0.02151632308959961,0.11314225196838379,0.019435882568359375,0.8171117305755615,0.8124570846557617,0.293903112411499,5.831105470657349,0.6854932308197021 diff --git a/results/combined/merges_timed/jgrapht/jgrapht.csv b/results/combined/merges_timed/jgrapht/jgrapht.csv index 6f47362c3e..5d6b94d5ed 100644 --- a/results/combined/merges_timed/jgrapht/jgrapht.csv +++ b/results/combined/merges_timed/jgrapht/jgrapht.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -61,refs/heads/master,8f3dfa07cf62a9032f18a22f8022b3480dfbf1c7,bb5bf7b4680787e3f4ce8f19a19576c53a5a3427,e76f73409146e565f36021cef9a755d4d12c0f53,,7f5790db42cf8cea7e23583e65dac8b823fba71eb4ce07c8e61bbe3b34fd874a,Tests_passed,d0c851fb09c381d0ba8c9b1bde8ad65746a1bb0c6d7b28777de882ff2223d16a,Tests_passed,True,True,True,True,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,5b278d288790dabdcda38335ffe09597050b8dc3abf261cf8e8db71c58a9be37,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,5b278d288790dabdcda38335ffe09597050b8dc3abf261cf8e8db71c58a9be37,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,14980d9e070bde4e288a3c02e4f7c0866b3aea36f21e57c9ea44ac0c769f806d,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,abf22f61ec929f147e9a7a556efe04f6908dcb57214fbad9936eeae0713e7e35,Merge_failed,abf22f61ec929f147e9a7a556efe04f6908dcb57214fbad9936eeae0713e7e35,Merge_failed,655af229e325403c961cedf07b7da92f8245ae46360717dcddaec516668929a7,Merge_failed,9eb2f48f8a51ffb3e75a8106c31abe2204176f344d2095e923d7a59a793a0358,Merge_failed,b5a2e1882b0064dcfa738acca270357c8d5486b9c024ebf6c9786b25eb61afad,0.08601260185241699,0.09016299247741699,0.09491539001464844,0.09223270416259766,0.09329414367675781,0.09366631507873535,0.09295320510864258,0.6092128753662109,0.22285199165344238,0.9831106662750244,0.9739291667938232,0.5247592926025391,4.734174489974976,1.5197994709014893 +61,refs/heads/master,8f3dfa07cf62a9032f18a22f8022b3480dfbf1c7,bb5bf7b4680787e3f4ce8f19a19576c53a5a3427,e76f73409146e565f36021cef9a755d4d12c0f53,,7f5790db42cf8cea7e23583e65dac8b823fba71eb4ce07c8e61bbe3b34fd874a,Tests_passed,d0c851fb09c381d0ba8c9b1bde8ad65746a1bb0c6d7b28777de882ff2223d16a,Tests_passed,True,True,True,True,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,5b278d288790dabdcda38335ffe09597050b8dc3abf261cf8e8db71c58a9be37,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,5b278d288790dabdcda38335ffe09597050b8dc3abf261cf8e8db71c58a9be37,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,14980d9e070bde4e288a3c02e4f7c0866b3aea36f21e57c9ea44ac0c769f806d,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,abf22f61ec929f147e9a7a556efe04f6908dcb57214fbad9936eeae0713e7e35,Merge_failed,abf22f61ec929f147e9a7a556efe04f6908dcb57214fbad9936eeae0713e7e35,Merge_failed,655af229e325403c961cedf07b7da92f8245ae46360717dcddaec516668929a7,Merge_failed,9eb2f48f8a51ffb3e75a8106c31abe2204176f344d2095e923d7a59a793a0358,Merge_failed,b5a2e1882b0064dcfa738acca270357c8d5486b9c024ebf6c9786b25eb61afad,0.08601260185241699,0.09016299247741699,0.09491539001464844,0.09223270416259766,0.09329414367675781,0.09366631507873535,0.09295320510864258,0.6092128753662109,0.22285199165344238,0.9760353565216064,0.9645118713378906,0.5247592926025391,4.734174489974976,1.5197994709014893 diff --git a/results/combined/merges_timed/jhalterman/concurrentunit.csv b/results/combined/merges_timed/jhalterman/concurrentunit.csv index be8af3aedf..b672557703 100644 --- a/results/combined/merges_timed/jhalterman/concurrentunit.csv +++ b/results/combined/merges_timed/jhalterman/concurrentunit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,ff9794f7485bb6455f5360b989c22f3173b679a6,e0a180ded55fff37fc7e0801d416b02b3019f194,21cab232bc4e99b4b9d9250d84c833f4e01ad894,,True,True,a45de44d2cc427bcd14e936631f7ad73f6e6ec99868dca53b4394fda7935ce7b,Tests_passed,ab7027ce12ea65b1337952fd4befdbfb9be95fa1ad03f22288cce803d094f0ac,Tests_passed,True,True,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ef56bccb00f25c230feb0ef297ce10303b77373192674e342865f2a5af4f20d0,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,591cd429dd189c4df87fa14c7846adacf769c8a366144bb4541c6b94e30eb09d,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,dfbb7b6173b9d1783584f440052e21480980778ef3a6457138b23f691b991bf7,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,bc2dfd2332ac753ded3495625360141b71fc3f00675025deeafa1995b43e6a59,Merge_failed,93545bb14686c9990bb9aa244dcd033e2076dbc6162d82080a48bbd1b3d46fc6,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,93e9a53a5918d72cbf316a3bc461c5e51a0ad82333b97688fc63f51b8660dbb1,Merge_failed,4cd63c695ec8e7bea17dbaf0119414a2c2dd7aadf4a3048c9b1c170145523365,0.036554813385009766,0.04093503952026367,0.010076522827148438,0.009281396865844727,0.009896039962768555,0.04133415222167969,0.024639129638671875,0.40541863441467285,0.11728453636169434,0.3924741744995117,0.4257316589355469,0.3318352699279785,1.6225087642669678,0.19618916511535645 +7,refs/heads/master,ff9794f7485bb6455f5360b989c22f3173b679a6,e0a180ded55fff37fc7e0801d416b02b3019f194,21cab232bc4e99b4b9d9250d84c833f4e01ad894,,True,True,a45de44d2cc427bcd14e936631f7ad73f6e6ec99868dca53b4394fda7935ce7b,Tests_passed,ab7027ce12ea65b1337952fd4befdbfb9be95fa1ad03f22288cce803d094f0ac,Tests_passed,True,True,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ef56bccb00f25c230feb0ef297ce10303b77373192674e342865f2a5af4f20d0,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,591cd429dd189c4df87fa14c7846adacf769c8a366144bb4541c6b94e30eb09d,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,dfbb7b6173b9d1783584f440052e21480980778ef3a6457138b23f691b991bf7,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,bc2dfd2332ac753ded3495625360141b71fc3f00675025deeafa1995b43e6a59,Merge_failed,93545bb14686c9990bb9aa244dcd033e2076dbc6162d82080a48bbd1b3d46fc6,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,93e9a53a5918d72cbf316a3bc461c5e51a0ad82333b97688fc63f51b8660dbb1,Merge_failed,4cd63c695ec8e7bea17dbaf0119414a2c2dd7aadf4a3048c9b1c170145523365,0.036554813385009766,0.04093503952026367,0.010076522827148438,0.009281396865844727,0.009896039962768555,0.04133415222167969,0.024639129638671875,0.40541863441467285,0.11728453636169434,0.397280216217041,0.37969064712524414,0.3318352699279785,1.6225087642669678,0.19618916511535645 diff --git a/results/combined/merges_timed/jhalterman/expiringmap.csv b/results/combined/merges_timed/jhalterman/expiringmap.csv index ddf6adb51f..a968ebed78 100644 --- a/results/combined/merges_timed/jhalterman/expiringmap.csv +++ b/results/combined/merges_timed/jhalterman/expiringmap.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/remotes/origin/pull/62,a0c2e3e6a0995582ef1199db7c250f9883b075ea,6cb40a4752c7391c5a4d308d5737639e26dc1815,b6a544d640196f96fc91e21c8227735781a1a0f2,,True,True,7a9c35ea159f49c724359e863eb1ab029d2a0dd2d4db7f4712bd8f1e51c503d9,Tests_passed,f0233b79d474b97e985835d8a8942615107ba2fb96eae333d6021525f364c73e,Tests_passed,True,True,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,e904aa385702481f94c295c43d536b55132d4791ddf2421585e0ac2ade021538,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,4779730431e960fdaf7d926ec830c254d9101d3d727da7daec52f0cdf5afa063,Merge_failed,4779730431e960fdaf7d926ec830c254d9101d3d727da7daec52f0cdf5afa063,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_failed,2f7e82248a9d821aa2ed1dc31bed1288710d262c9de07b925fe1f264bddc603a,0.0465540885925293,0.04394102096557617,0.04411005973815918,0.04365277290344238,0.0460050106048584,0.04077935218811035,0.0419464111328125,0.17460870742797852,0.06023120880126953,0.07434773445129395,0.0831298828125,0.12178659439086914,1.8704066276550293,0.19252681732177734 +15,refs/remotes/origin/pull/62,a0c2e3e6a0995582ef1199db7c250f9883b075ea,6cb40a4752c7391c5a4d308d5737639e26dc1815,b6a544d640196f96fc91e21c8227735781a1a0f2,,True,True,7a9c35ea159f49c724359e863eb1ab029d2a0dd2d4db7f4712bd8f1e51c503d9,Tests_passed,f0233b79d474b97e985835d8a8942615107ba2fb96eae333d6021525f364c73e,Tests_passed,True,True,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,e904aa385702481f94c295c43d536b55132d4791ddf2421585e0ac2ade021538,Merge_failed,786cac94b4a870ead855d8e24aa5acff52466ff8e1d2d4c51369a2eca774b493,Merge_failed,4779730431e960fdaf7d926ec830c254d9101d3d727da7daec52f0cdf5afa063,Merge_failed,4779730431e960fdaf7d926ec830c254d9101d3d727da7daec52f0cdf5afa063,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_failed,2f7e82248a9d821aa2ed1dc31bed1288710d262c9de07b925fe1f264bddc603a,0.0465540885925293,0.04394102096557617,0.04411005973815918,0.04365277290344238,0.0460050106048584,0.04077935218811035,0.0419464111328125,0.17460870742797852,0.06023120880126953,0.08009719848632812,0.08042025566101074,0.12178659439086914,1.8704066276550293,0.19252681732177734 diff --git a/results/combined/merges_timed/jhalterman/failsafe.csv b/results/combined/merges_timed/jhalterman/failsafe.csv index 64321491ff..2e0af97f9f 100644 --- a/results/combined/merges_timed/jhalterman/failsafe.csv +++ b/results/combined/merges_timed/jhalterman/failsafe.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,b15e3bd52f2d6cfe3d2b456766847691694fcd72,947589141b1290c6eb3bbfdf67c55a62b4972dbf,ea1bb689ad2a75ef6a89843ab31dc881926d603a,,5366623e94bc3b3f96f8892568e6f864aae6e5e21aee1a9c1d06497323fd4dce,Tests_passed,db05e5da5c5daca74e35a9ceabc60a9bdf34ec2f7b1e5fb96532a76f604a53ad,Tests_passed,True,True,True,True,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,0.03919172286987305,0.03924965858459473,0.047580718994140625,0.03768420219421387,0.03964662551879883,0.04326152801513672,0.04137730598449707,0.22632622718811035,0.040305137634277344,0.15376925468444824,0.15454554557800293,0.1583564281463623,0.656266450881958,0.1982097625732422 +15,refs/heads/master,b15e3bd52f2d6cfe3d2b456766847691694fcd72,947589141b1290c6eb3bbfdf67c55a62b4972dbf,ea1bb689ad2a75ef6a89843ab31dc881926d603a,,5366623e94bc3b3f96f8892568e6f864aae6e5e21aee1a9c1d06497323fd4dce,Tests_passed,db05e5da5c5daca74e35a9ceabc60a9bdf34ec2f7b1e5fb96532a76f604a53ad,Tests_passed,True,True,True,True,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,0.03919172286987305,0.03924965858459473,0.047580718994140625,0.03768420219421387,0.03964662551879883,0.04326152801513672,0.04137730598449707,0.22632622718811035,0.040305137634277344,0.15377378463745117,0.15107131004333496,0.1583564281463623,0.656266450881958,0.1982097625732422 diff --git a/results/combined/merges_timed/jiaqi/jmxterm.csv b/results/combined/merges_timed/jiaqi/jmxterm.csv index 3196b5da1e..d9c62a6eb2 100644 --- a/results/combined/merges_timed/jiaqi/jmxterm.csv +++ b/results/combined/merges_timed/jiaqi/jmxterm.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/main,eb38f4012dacafe4b4e876004ccf09080bde4e8a,32cf434df4d70cd02503e60d3be65b9156e2f7d7,211a81796b512118b338f16231de0cf748e0b673,,True,True,25afcf9a4d83300c0e1502b5a7ce34f163f7c7e1e011553961a716e2ec4ac222,Tests_passed,feaf8dc103ef91d74e3d22fd1ad24e6ee3db2d94ee248f23c517c912bda1ca88,Tests_passed,True,True,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Merge_failed,4764f7aa58d29d5a78d4fecc35a8593d6f6676daf1a38971a4ab5cdd4876bdc1,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Merge_failed,1810e8cceff2f11fd27120424ada5dcc9bd8feb98d50240f00cfb0a4e0dad3ec,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,7f5102f3fa6b5e01de6f09416320e56de99e81e838dd74ec4dfc7881cd7f2a10,Merge_failed,1810e8cceff2f11fd27120424ada5dcc9bd8feb98d50240f00cfb0a4e0dad3ec,0.039209842681884766,0.05180096626281738,0.04096364974975586,0.044327735900878906,0.0431060791015625,0.03855276107788086,0.04003620147705078,0.21147823333740234,0.06565618515014648,0.16665315628051758,0.16282010078430176,0.16685247421264648,0.7971315383911133,0.2176666259765625 +5,refs/heads/main,eb38f4012dacafe4b4e876004ccf09080bde4e8a,32cf434df4d70cd02503e60d3be65b9156e2f7d7,211a81796b512118b338f16231de0cf748e0b673,,True,True,25afcf9a4d83300c0e1502b5a7ce34f163f7c7e1e011553961a716e2ec4ac222,Tests_passed,feaf8dc103ef91d74e3d22fd1ad24e6ee3db2d94ee248f23c517c912bda1ca88,Tests_passed,True,True,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Merge_failed,4764f7aa58d29d5a78d4fecc35a8593d6f6676daf1a38971a4ab5cdd4876bdc1,Merge_failed,90728687d404b9df6a343a1de6a591fb43c0f8a2d2db9c8e2b74fee96cf0674f,Merge_failed,1810e8cceff2f11fd27120424ada5dcc9bd8feb98d50240f00cfb0a4e0dad3ec,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,7f5102f3fa6b5e01de6f09416320e56de99e81e838dd74ec4dfc7881cd7f2a10,Merge_failed,1810e8cceff2f11fd27120424ada5dcc9bd8feb98d50240f00cfb0a4e0dad3ec,0.039209842681884766,0.05180096626281738,0.04096364974975586,0.044327735900878906,0.0431060791015625,0.03855276107788086,0.04003620147705078,0.21147823333740234,0.06565618515014648,0.15084266662597656,0.15906620025634766,0.16685247421264648,0.7971315383911133,0.2176666259765625 diff --git a/results/combined/merges_timed/jinahya/bit-io.csv b/results/combined/merges_timed/jinahya/bit-io.csv index ed027a25a7..82a53bbb8c 100644 --- a/results/combined/merges_timed/jinahya/bit-io.csv +++ b/results/combined/merges_timed/jinahya/bit-io.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -36,refs/heads/develop,a3ad5c4ce8fe0b5633b4aa90cccc0e73d774247d,b1642eefdabeb4b1b09e329f82882eed1909acc1,292af81fc26154d3707be9e83cbf8b3b8a526474,,0455c6c56a5c273fb4ed01800d7e226b42695080bb7aa78da7260ce7f4fe0266,Tests_passed,7afb2a8aa488f16b0c53927630708680535b8d831d7b509ce47439bb0cd653e4,Tests_passed,True,True,True,True,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,268f566c90059d413f7176d2372c98c9993ee90b2af678f63428df4a55dfc01d,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,6b7dd207b91aa8e61e519f944c297c8d8dd71e895edf7ce1d2655bde97e26878,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,0.008577346801757812,0.008734941482543945,0.008577585220336914,0.00867009162902832,0.008471488952636719,0.008391380310058594,0.008445024490356445,0.08540940284729004,0.05658912658691406,0.14612627029418945,0.14620637893676758,0.12073898315429688,0.5287883281707764,0.29013705253601074 +36,refs/heads/develop,a3ad5c4ce8fe0b5633b4aa90cccc0e73d774247d,b1642eefdabeb4b1b09e329f82882eed1909acc1,292af81fc26154d3707be9e83cbf8b3b8a526474,,0455c6c56a5c273fb4ed01800d7e226b42695080bb7aa78da7260ce7f4fe0266,Tests_passed,7afb2a8aa488f16b0c53927630708680535b8d831d7b509ce47439bb0cd653e4,Tests_passed,True,True,True,True,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,268f566c90059d413f7176d2372c98c9993ee90b2af678f63428df4a55dfc01d,Merge_failed,ec47dfe975cf5ff0bc035a4ea8dafbddc0ec9c4e8fcae074ffd2f74b44b49956,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,6b7dd207b91aa8e61e519f944c297c8d8dd71e895edf7ce1d2655bde97e26878,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,0.008577346801757812,0.008734941482543945,0.008577585220336914,0.00867009162902832,0.008471488952636719,0.008391380310058594,0.008445024490356445,0.08540940284729004,0.05658912658691406,0.14478230476379395,0.14452600479125977,0.12073898315429688,0.5287883281707764,0.29013705253601074 diff --git a/results/combined/merges_timed/jingwei/krati.csv b/results/combined/merges_timed/jingwei/krati.csv index 05e04e168c..a17b88eda4 100644 --- a/results/combined/merges_timed/jingwei/krati.csv +++ b/results/combined/merges_timed/jingwei/krati.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,1781566efcd25979a849227f0d90ecc108e25342,d65fdedc86f39b553f6f5b717177fa4130dea9bd,c0d6e5e6baf21463785bdfec285c5178734753ce,,True,True,be3c3ca22673b3593cdecd577ae8c8b3066c2fc8049c4f42840c4911d53c4596,Tests_passed,70ba88d87f91a874aefe681846e6aec86ee936fd396d25cbab90dfae78fc5680,Tests_passed,True,True,Merge_failed,98a613bc709611a731e2ce2e59f81b1038cccc1f44ead56d72335b24ab02c041,Merge_failed,1fcf73f467e024b71dad656f83fce55a727d082ad4a56e326211052484d326d9,Merge_failed,98a613bc709611a731e2ce2e59f81b1038cccc1f44ead56d72335b24ab02c041,Merge_failed,db8d9c7c8d166c4f0eee598d36cb4ef849f42a5036e88861b9217a0acee30333,Merge_failed,ffec5939b0c6d5a037e2b36128fca424747f93b6e510fa7e96a9d17a53cf43e0,Merge_failed,ffec5939b0c6d5a037e2b36128fca424747f93b6e510fa7e96a9d17a53cf43e0,Merge_failed,98a613bc709611a731e2ce2e59f81b1038cccc1f44ead56d72335b24ab02c041,Merge_failed,19a061fb950d54cf49b3d1ba64b82f09b66a50f26b21a837f99de6229d661805,Merge_failed,98a613bc709611a731e2ce2e59f81b1038cccc1f44ead56d72335b24ab02c041,Merge_failed,4adb6867c719b947457e9d7f4a39fa73db32425ac62608d63633e9e3d8abb29b,Merge_failed,4adb6867c719b947457e9d7f4a39fa73db32425ac62608d63633e9e3d8abb29b,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Merge_failed,ad82fff029faeb070e4d3f8e5093e461b1b5f7111018baadd811b523adac86eb,0.028177261352539062,0.010645389556884766,0.032659292221069336,0.010593891143798828,0.03278040885925293,0.02961421012878418,0.0332338809967041,0.07159614562988281,0.03610348701477051,0.15169882774353027,0.16022038459777832,0.06957435607910156,0.5070490837097168,0.20349597930908203 +10,refs/heads/master,1781566efcd25979a849227f0d90ecc108e25342,d65fdedc86f39b553f6f5b717177fa4130dea9bd,c0d6e5e6baf21463785bdfec285c5178734753ce,,True,True,be3c3ca22673b3593cdecd577ae8c8b3066c2fc8049c4f42840c4911d53c4596,Tests_passed,70ba88d87f91a874aefe681846e6aec86ee936fd396d25cbab90dfae78fc5680,Tests_passed,True,True,Merge_failed,98a613bc709611a731e2ce2e59f81b1038cccc1f44ead56d72335b24ab02c041,Merge_failed,1fcf73f467e024b71dad656f83fce55a727d082ad4a56e326211052484d326d9,Merge_failed,98a613bc709611a731e2ce2e59f81b1038cccc1f44ead56d72335b24ab02c041,Merge_failed,db8d9c7c8d166c4f0eee598d36cb4ef849f42a5036e88861b9217a0acee30333,Merge_failed,ffec5939b0c6d5a037e2b36128fca424747f93b6e510fa7e96a9d17a53cf43e0,Merge_failed,ffec5939b0c6d5a037e2b36128fca424747f93b6e510fa7e96a9d17a53cf43e0,Merge_failed,98a613bc709611a731e2ce2e59f81b1038cccc1f44ead56d72335b24ab02c041,Merge_failed,19a061fb950d54cf49b3d1ba64b82f09b66a50f26b21a837f99de6229d661805,Merge_failed,98a613bc709611a731e2ce2e59f81b1038cccc1f44ead56d72335b24ab02c041,Merge_failed,4adb6867c719b947457e9d7f4a39fa73db32425ac62608d63633e9e3d8abb29b,Merge_failed,4adb6867c719b947457e9d7f4a39fa73db32425ac62608d63633e9e3d8abb29b,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Merge_failed,ad82fff029faeb070e4d3f8e5093e461b1b5f7111018baadd811b523adac86eb,0.028177261352539062,0.010645389556884766,0.032659292221069336,0.010593891143798828,0.03278040885925293,0.02961421012878418,0.0332338809967041,0.07159614562988281,0.03610348701477051,0.13105130195617676,0.14944934844970703,0.06957435607910156,0.5070490837097168,0.20349597930908203 diff --git a/results/combined/merges_timed/jitsi/dnssecjava.csv b/results/combined/merges_timed/jitsi/dnssecjava.csv index 156276040b..b181d1f26b 100644 --- a/results/combined/merges_timed/jitsi/dnssecjava.csv +++ b/results/combined/merges_timed/jitsi/dnssecjava.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,05cb5d378fe90768618ce158335fbcb564274790,c3843fa5766a7e1f7f02362e7e413282dc3e061e,72b617fe945d40563b1d0577d42258b4b7eb1cf4,,61b329bd8c8fba5a72e08ce2c04532c9a66b1dbb11af4c270c1e69a5ad40d0c9,Tests_passed,86dd535427e6efdb5b7012875f6222ebb1ecd07e19b97f91707b596ee9c1fc5d,Tests_passed,True,True,True,True,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,0.07851672172546387,0.07200288772583008,0.06151771545410156,0.053415536880493164,0.045073509216308594,0.05920863151550293,0.07761311531066895,0.49457454681396484,0.0623173713684082,0.650761604309082,0.6542191505432129,0.3729708194732666,4.702235698699951,0.2577042579650879 +5,refs/heads/master,05cb5d378fe90768618ce158335fbcb564274790,c3843fa5766a7e1f7f02362e7e413282dc3e061e,72b617fe945d40563b1d0577d42258b4b7eb1cf4,,61b329bd8c8fba5a72e08ce2c04532c9a66b1dbb11af4c270c1e69a5ad40d0c9,Tests_passed,86dd535427e6efdb5b7012875f6222ebb1ecd07e19b97f91707b596ee9c1fc5d,Tests_passed,True,True,True,True,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,0.07851672172546387,0.07200288772583008,0.06151771545410156,0.053415536880493164,0.045073509216308594,0.05920863151550293,0.07761311531066895,0.49457454681396484,0.0623173713684082,0.6450188159942627,0.6558659076690674,0.3729708194732666,4.702235698699951,0.2577042579650879 diff --git a/results/combined/merges_timed/jkotlinski/lsdpatch.csv b/results/combined/merges_timed/jkotlinski/lsdpatch.csv index caf31f4f28..3365771b69 100644 --- a/results/combined/merges_timed/jkotlinski/lsdpatch.csv +++ b/results/combined/merges_timed/jkotlinski/lsdpatch.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/remotes/origin/pull/83,6a4e1c82830d6579ddf349bea58a67acbdb29320,7d2dabf069cf7a85bdd91465673b185621237e57,ce522dbe7c021ffbfdc790e0c984df28e144932b,,eda8b13df9368694b3691f5595464a07bb8638c278c9fdc1cd4d2d9fd6c021c0,Tests_passed,1ebdf987b44770a653955c7f07921fce00dde2fde938785d4a4e044dfa45ca45,Tests_passed,True,True,True,True,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,ad3540ff4728bd1f0a550eafc6207dfd49a1d3577188b61bdf9d0b9fe475a679,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,7c56ed1900cd148bbaf981d2615b4b5ce82f84b022d0c8cc17016d966f0694b2,Merge_failed,7c56ed1900cd148bbaf981d2615b4b5ce82f84b022d0c8cc17016d966f0694b2,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,2288275a4df96e14cf99d4e732b3de5a1148ae8c50fa8f9f6f5753ab10704bae,Merge_failed,2288275a4df96e14cf99d4e732b3de5a1148ae8c50fa8f9f6f5753ab10704bae,0.034659385681152344,0.02092289924621582,0.036170244216918945,0.04937148094177246,0.036908864974975586,0.02235555648803711,0.026747465133666992,0.18806815147399902,0.0646970272064209,0.08460354804992676,0.07402563095092773,0.12509679794311523,0.04550933837890625,0.18121981620788574 +25,refs/remotes/origin/pull/83,6a4e1c82830d6579ddf349bea58a67acbdb29320,7d2dabf069cf7a85bdd91465673b185621237e57,ce522dbe7c021ffbfdc790e0c984df28e144932b,,eda8b13df9368694b3691f5595464a07bb8638c278c9fdc1cd4d2d9fd6c021c0,Tests_passed,1ebdf987b44770a653955c7f07921fce00dde2fde938785d4a4e044dfa45ca45,Tests_passed,True,True,True,True,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,ad3540ff4728bd1f0a550eafc6207dfd49a1d3577188b61bdf9d0b9fe475a679,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,7c56ed1900cd148bbaf981d2615b4b5ce82f84b022d0c8cc17016d966f0694b2,Merge_failed,7c56ed1900cd148bbaf981d2615b4b5ce82f84b022d0c8cc17016d966f0694b2,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,2288275a4df96e14cf99d4e732b3de5a1148ae8c50fa8f9f6f5753ab10704bae,Merge_failed,2288275a4df96e14cf99d4e732b3de5a1148ae8c50fa8f9f6f5753ab10704bae,0.034659385681152344,0.02092289924621582,0.036170244216918945,0.04937148094177246,0.036908864974975586,0.02235555648803711,0.026747465133666992,0.18806815147399902,0.0646970272064209,0.0744924545288086,0.08440113067626953,0.12509679794311523,0.04550933837890625,0.18121981620788574 diff --git a/results/combined/merges_timed/jline/jline2.csv b/results/combined/merges_timed/jline/jline2.csv index 50c7279a2f..2e371b774c 100644 --- a/results/combined/merges_timed/jline/jline2.csv +++ b/results/combined/merges_timed/jline/jline2.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -38,refs/heads/master,120b7ad28294b67e9f7936f0ad1869fc7190c5ad,9975dedecf6bdc438a3be3c8628ee55eb3842795,d5095191d2d0632f32bed7c0545acfa2613e0402,,269332d09243e20c121ddc566d1f14ee6b986c3c80d3ac9586785eb94fab98d7,Tests_passed,f1e4cd88c8393187dd5202a588e4e58fdb6fd50f2bb890fed68658916d64bbc4,Tests_passed,True,True,True,True,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,0ced24897ea2240f88547432679f2d7c4cdd3f5758711bbcd8f4d9bcc33dbbb5,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,0.05009818077087402,0.05250811576843262,0.06056380271911621,0.06182742118835449,0.05870938301086426,0.05945420265197754,0.05234932899475098,0.20185589790344238,0.05865764617919922,0.21764230728149414,0.2244110107421875,0.12497925758361816,2.421617031097412,0.21644282341003418 +38,refs/heads/master,120b7ad28294b67e9f7936f0ad1869fc7190c5ad,9975dedecf6bdc438a3be3c8628ee55eb3842795,d5095191d2d0632f32bed7c0545acfa2613e0402,,269332d09243e20c121ddc566d1f14ee6b986c3c80d3ac9586785eb94fab98d7,Tests_passed,f1e4cd88c8393187dd5202a588e4e58fdb6fd50f2bb890fed68658916d64bbc4,Tests_passed,True,True,True,True,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,Tests_passed,0ced24897ea2240f88547432679f2d7c4cdd3f5758711bbcd8f4d9bcc33dbbb5,Tests_passed,994fd3b668a9b6734ccf744d1ed44eb162d32c4ef6309c27c8933cb9f389cb47,0.05009818077087402,0.05250811576843262,0.06056380271911621,0.06182742118835449,0.05870938301086426,0.05945420265197754,0.05234932899475098,0.20185589790344238,0.05865764617919922,0.21614718437194824,0.21522235870361328,0.12497925758361816,2.421617031097412,0.21644282341003418 diff --git a/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv b/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv index d152946bbf..58e492a97c 100644 --- a/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv +++ b/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/remotes/origin/pull/67,8b87e2b2c3427b604f42bb48d3c06843b6ed77d0,8319caab3c74065fcd1e0cf10c206f829aa6b650,a4693da53065f64bf9164e41c4db2f137cb0654a,,5bce0b2309a52ff1040ebbd5f73cb49698a2a7428dca680892af250f38919ab1,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,True,True,True,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,0.04502224922180176,0.05085611343383789,0.052910566329956055,0.0509793758392334,0.05642390251159668,0.014815330505371094,0.06270527839660645,0.17273974418640137,0.05050349235534668,0.1810779571533203,0.18422961235046387,0.13174843788146973,1.3170785903930664,0.19994878768920898 +18,refs/remotes/origin/pull/67,8b87e2b2c3427b604f42bb48d3c06843b6ed77d0,8319caab3c74065fcd1e0cf10c206f829aa6b650,a4693da53065f64bf9164e41c4db2f137cb0654a,,5bce0b2309a52ff1040ebbd5f73cb49698a2a7428dca680892af250f38919ab1,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,True,True,True,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,0.04502224922180176,0.05085611343383789,0.052910566329956055,0.0509793758392334,0.05642390251159668,0.014815330505371094,0.06270527839660645,0.17273974418640137,0.05050349235534668,0.18350911140441895,0.18651580810546875,0.13174843788146973,1.3170785903930664,0.19994878768920898 diff --git a/results/combined/merges_timed/jmacglashan/burlap.csv b/results/combined/merges_timed/jmacglashan/burlap.csv index b8fe6d41a8..6daa852b84 100644 --- a/results/combined/merges_timed/jmacglashan/burlap.csv +++ b/results/combined/merges_timed/jmacglashan/burlap.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,4e8800b6680f46064862f5b9c28ca5499203ddbd,3b1917000b96d9fe9cba84db6ae8cbd3143dad2f,f4bc6379d047c30d86fc62227c55e5a7b09b5a35,,23fa978adb1b61e4ffa7be83aa8f83aa8d39a796ed4e9ce5d4b43ddbd90be278,Tests_passed,43a9728a1d77cac8cfe3fd1c5c3bc70274727ae2a60193bc0d0ea0311a39bd11,Tests_passed,True,True,True,True,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,0.05646061897277832,0.04650282859802246,0.022189855575561523,0.05553460121154785,0.04914116859436035,0.06977987289428711,0.06025576591491699,0.3118295669555664,0.050769805908203125,0.4746744632720947,0.47779226303100586,0.2185671329498291,2.793132781982422,0.4410426616668701 +18,refs/heads/master,4e8800b6680f46064862f5b9c28ca5499203ddbd,3b1917000b96d9fe9cba84db6ae8cbd3143dad2f,f4bc6379d047c30d86fc62227c55e5a7b09b5a35,,23fa978adb1b61e4ffa7be83aa8f83aa8d39a796ed4e9ce5d4b43ddbd90be278,Tests_passed,43a9728a1d77cac8cfe3fd1c5c3bc70274727ae2a60193bc0d0ea0311a39bd11,Tests_passed,True,True,True,True,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,0.05646061897277832,0.04650282859802246,0.022189855575561523,0.05553460121154785,0.04914116859436035,0.06977987289428711,0.06025576591491699,0.3118295669555664,0.050769805908203125,0.46921682357788086,0.46721744537353516,0.2185671329498291,2.793132781982422,0.4410426616668701 diff --git a/results/combined/merges_timed/jmetal/jmetal.csv b/results/combined/merges_timed/jmetal/jmetal.csv index 26fda45ba8..383d330357 100644 --- a/results/combined/merges_timed/jmetal/jmetal.csv +++ b/results/combined/merges_timed/jmetal/jmetal.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -194,refs/heads/main,b4630972a8b9aebfc552e9782906bf084249fcf0,7c8c5a6039da2ea3dfc881dad1291f8246162a39,c83f2e8205bdc51687bf4740add46d495117ecc7,,ae4a3dc358e64d3098dc3c432a4fc6bae135dfae72465defeb76e50b051f282d,Tests_passed,881c02dc2deed33ed76364343076d24893438e237345431d336b7853feebc53c,Tests_passed,True,True,True,True,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,68672d7775a153218f5a9257b3b3b7170a0d3b884a87be558ebae6fb558b104f,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,68672d7775a153218f5a9257b3b3b7170a0d3b884a87be558ebae6fb558b104f,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,ce1d667c1e805465778f39f67183f122efafeeb56747dc0c60c023757d9c177b,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,341ea30b2b1286e568cc9f4ff99c97150fbd991708cf33b7cdaa0343e94318cd,Merge_failed,70ef3369c01ed96b348ef412e7049812f85a0d0bac6c3073a7957e4f81e2acbc,0.07122683525085449,0.07567906379699707,0.07891654968261719,0.08118152618408203,0.07793331146240234,0.07143020629882812,0.08107233047485352,0.32357120513916016,0.2141256332397461,0.3064267635345459,0.3049764633178711,0.21947026252746582,1.5080265998840332,1.0000152587890625 +194,refs/heads/main,b4630972a8b9aebfc552e9782906bf084249fcf0,7c8c5a6039da2ea3dfc881dad1291f8246162a39,c83f2e8205bdc51687bf4740add46d495117ecc7,,ae4a3dc358e64d3098dc3c432a4fc6bae135dfae72465defeb76e50b051f282d,Tests_passed,881c02dc2deed33ed76364343076d24893438e237345431d336b7853feebc53c,Tests_passed,True,True,True,True,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,68672d7775a153218f5a9257b3b3b7170a0d3b884a87be558ebae6fb558b104f,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,68672d7775a153218f5a9257b3b3b7170a0d3b884a87be558ebae6fb558b104f,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,ce1d667c1e805465778f39f67183f122efafeeb56747dc0c60c023757d9c177b,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,341ea30b2b1286e568cc9f4ff99c97150fbd991708cf33b7cdaa0343e94318cd,Merge_failed,70ef3369c01ed96b348ef412e7049812f85a0d0bac6c3073a7957e4f81e2acbc,0.07122683525085449,0.07567906379699707,0.07891654968261719,0.08118152618408203,0.07793331146240234,0.07143020629882812,0.08107233047485352,0.32357120513916016,0.2141256332397461,0.3016049861907959,0.3028559684753418,0.21947026252746582,1.5080265998840332,1.0000152587890625 diff --git a/results/combined/merges_timed/jmeter-maven-plugin/jmeter-maven-plugin.csv b/results/combined/merges_timed/jmeter-maven-plugin/jmeter-maven-plugin.csv index ab94802108..90c0227e39 100644 --- a/results/combined/merges_timed/jmeter-maven-plugin/jmeter-maven-plugin.csv +++ b/results/combined/merges_timed/jmeter-maven-plugin/jmeter-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/main,efc1712ae3cf864ff9e552c855f79ec5617dba34,bf8b0b908c2115a4e6a89172df35ba44e9e78703,8d2d280c9edccd06633c5a08af53a5a02b3695b2,,852319d1cc6497dabf78b628d68ee3987d280c672c12647b717fe17c3cf02766,Tests_passed,2e75242bb607218708415c75eee0ecefb0af740899a29fdead2c8287d6939e75,Tests_passed,True,True,True,True,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,2a6e321d3c114486298d32d628595c7b8ccd46a6c55cb3318711cd941bdb1d98,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,0b60e2e71dad73cd4d9f40af6eb093f0e933714aafcf9a1f4010f665dda2e8d0,Merge_failed,0b60e2e71dad73cd4d9f40af6eb093f0e933714aafcf9a1f4010f665dda2e8d0,Merge_failed,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Merge_failed,b54f5215aa90f1f3622a06826c8de9a1919f349de616504db8fa60628a644eb7,0.04708504676818848,0.04547834396362305,0.04378914833068848,0.04325127601623535,0.04729509353637695,0.042407989501953125,0.04461860656738281,0.21392178535461426,0.07922053337097168,0.2178971767425537,0.21763038635253906,0.18015265464782715,1.2906816005706787,0.206315279006958 +18,refs/heads/main,efc1712ae3cf864ff9e552c855f79ec5617dba34,bf8b0b908c2115a4e6a89172df35ba44e9e78703,8d2d280c9edccd06633c5a08af53a5a02b3695b2,,852319d1cc6497dabf78b628d68ee3987d280c672c12647b717fe17c3cf02766,Tests_passed,2e75242bb607218708415c75eee0ecefb0af740899a29fdead2c8287d6939e75,Tests_passed,True,True,True,True,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,2a6e321d3c114486298d32d628595c7b8ccd46a6c55cb3318711cd941bdb1d98,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,0b60e2e71dad73cd4d9f40af6eb093f0e933714aafcf9a1f4010f665dda2e8d0,Merge_failed,0b60e2e71dad73cd4d9f40af6eb093f0e933714aafcf9a1f4010f665dda2e8d0,Merge_failed,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Merge_failed,b54f5215aa90f1f3622a06826c8de9a1919f349de616504db8fa60628a644eb7,0.04708504676818848,0.04547834396362305,0.04378914833068848,0.04325127601623535,0.04729509353637695,0.042407989501953125,0.04461860656738281,0.21392178535461426,0.07922053337097168,0.21643590927124023,0.2176051139831543,0.18015265464782715,1.2906816005706787,0.206315279006958 diff --git a/results/combined/merges_timed/jmrozanec/cron-utils.csv b/results/combined/merges_timed/jmrozanec/cron-utils.csv index ff7a759a83..6b64c79b5f 100644 --- a/results/combined/merges_timed/jmrozanec/cron-utils.csv +++ b/results/combined/merges_timed/jmrozanec/cron-utils.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -47,refs/heads/master,56a9faab1c79a0118677324ad31878e8bba372f9,be40542c2c55cd1d0a4c59374e508955200714ae,55f277f1ee25ce954d82c79af23f0633ef55b361,,True,True,83826e842e905a6dcaf76f7cd95eb254f19b4c9100edcd2a203135a9d2df0162,Tests_passed,c78ba8d1e823d5f0eca39d0a0de135c8c471425422247d4d76582538ab924e4f,Tests_passed,True,True,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,0.0156862735748291,0.01611948013305664,0.01943373680114746,0.01987004280090332,0.020124435424804688,0.020251989364624023,0.019536495208740234,0.04855060577392578,0.01595759391784668,0.1558399200439453,0.1619114875793457,0.07240056991577148,0.5316851139068604,0.18839192390441895 +47,refs/heads/master,56a9faab1c79a0118677324ad31878e8bba372f9,be40542c2c55cd1d0a4c59374e508955200714ae,55f277f1ee25ce954d82c79af23f0633ef55b361,,True,True,83826e842e905a6dcaf76f7cd95eb254f19b4c9100edcd2a203135a9d2df0162,Tests_passed,c78ba8d1e823d5f0eca39d0a0de135c8c471425422247d4d76582538ab924e4f,Tests_passed,True,True,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,0.0156862735748291,0.01611948013305664,0.01943373680114746,0.01987004280090332,0.020124435424804688,0.020251989364624023,0.019536495208740234,0.04855060577392578,0.01595759391784668,0.16266894340515137,0.1628882884979248,0.07240056991577148,0.5316851139068604,0.18839192390441895 diff --git a/results/combined/merges_timed/jmurty/java-xmlbuilder.csv b/results/combined/merges_timed/jmurty/java-xmlbuilder.csv index 80664bf15b..c94af69dcf 100644 --- a/results/combined/merges_timed/jmurty/java-xmlbuilder.csv +++ b/results/combined/merges_timed/jmurty/java-xmlbuilder.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,4ee5f60778e25cc1f762eb5c6f6747ea15354931,de0c78aa839dda06bdfc92fa0eb7aa8af3d8104c,6483a913a5ee3561e8ebe0b23e5716f96eb447fb,,True,True,d04f0ec5d99017403ed35fd42761441d2abbcabd333a4b8f80afdd7e1a34154d,Tests_passed,cce0483f078c4fe02f23db8cab1e9b0e2fef8f7fb90d8585dad4b2aba264366f,Tests_passed,True,True,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,0.011434555053710938,0.02182602882385254,0.04998421669006348,0.031247377395629883,0.051496267318725586,0.04898691177368164,0.04977273941040039,0.17703986167907715,0.011845588684082031,0.16797423362731934,0.16510224342346191,0.11590433120727539,0.8774635791778564,0.20343279838562012 +5,refs/heads/master,4ee5f60778e25cc1f762eb5c6f6747ea15354931,de0c78aa839dda06bdfc92fa0eb7aa8af3d8104c,6483a913a5ee3561e8ebe0b23e5716f96eb447fb,,True,True,d04f0ec5d99017403ed35fd42761441d2abbcabd333a4b8f80afdd7e1a34154d,Tests_passed,cce0483f078c4fe02f23db8cab1e9b0e2fef8f7fb90d8585dad4b2aba264366f,Tests_passed,True,True,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,0.011434555053710938,0.02182602882385254,0.04998421669006348,0.031247377395629883,0.051496267318725586,0.04898691177368164,0.04977273941040039,0.17703986167907715,0.011845588684082031,0.16398930549621582,0.16359639167785645,0.11590433120727539,0.8774635791778564,0.20343279838562012 diff --git a/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv b/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv index 2aa145e8e6..315d6ed10a 100644 --- a/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv +++ b/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,2266cfcadd9491cea8c5eea1d7c08116ce35471d,4148ed2bc9f8fe8ea4b1595b905669d39b4dfa40,524b8648461b933e02d7e2a8e7f3cd91f9cc0da5,,True,True,fcaa257aca4e29b23958701e9570b2078ebdafa2a4d44423a64642742a312257,Tests_passed,c8c9734bdea9c1796f2906014144d0e6d76f6fd044b8aec1515b9e8c42d04e05,Tests_passed,True,True,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,0.04684591293334961,0.050606489181518555,0.042392730712890625,0.03792929649353027,0.03833436965942383,0.04034256935119629,0.04842567443847656,0.18633222579956055,0.04140520095825195,0.19175314903259277,0.19120001792907715,0.11317563056945801,1.8918898105621338,0.2162914276123047 +4,refs/heads/master,2266cfcadd9491cea8c5eea1d7c08116ce35471d,4148ed2bc9f8fe8ea4b1595b905669d39b4dfa40,524b8648461b933e02d7e2a8e7f3cd91f9cc0da5,,True,True,fcaa257aca4e29b23958701e9570b2078ebdafa2a4d44423a64642742a312257,Tests_passed,c8c9734bdea9c1796f2906014144d0e6d76f6fd044b8aec1515b9e8c42d04e05,Tests_passed,True,True,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,0.04684591293334961,0.050606489181518555,0.042392730712890625,0.03792929649353027,0.03833436965942383,0.04034256935119629,0.04842567443847656,0.18633222579956055,0.04140520095825195,0.19048857688903809,0.18931841850280762,0.11317563056945801,1.8918898105621338,0.2162914276123047 diff --git a/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv b/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv index 016796eb11..d3cb970a0e 100644 --- a/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv +++ b/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/master,60e40f2ad4d067e75c9433b56c139e15ba4642f5,50eaacd59890332041d69ac0ede573d96329ed95,59e060ee6566654261084e583b34b0dc1194a6ec,,True,True,9788efbefcfb3a717e7e765c416dbf05e672d61c3c763e01cda3422676025e6b,Tests_passed,fe6fb2c3b34875510b4f9e5057dea4e97995649ec570b5bf00acf0d12e4c0fa6,Tests_passed,True,True,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,5f4f21b4eb3f7d47129a4695ff631f7f17002741b7062b8d48df1016aa747b67,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,9e55a7e82bb0f0791f0ece58744f350e322043657319535502a0926033e5c0c0,Merge_failed,9e55a7e82bb0f0791f0ece58744f350e322043657319535502a0926033e5c0c0,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,808984bd76f665bd17544d1eaca764b2362ea730ef354b05d042b20ad8f58fd6,0.0497128963470459,0.05024909973144531,0.05640745162963867,0.05954241752624512,0.06285500526428223,0.0525968074798584,0.048598289489746094,0.3167283535003662,0.0881342887878418,0.412996768951416,0.4138062000274658,0.22979474067687988,2.571502685546875,0.21503162384033203 +31,refs/heads/master,60e40f2ad4d067e75c9433b56c139e15ba4642f5,50eaacd59890332041d69ac0ede573d96329ed95,59e060ee6566654261084e583b34b0dc1194a6ec,,True,True,9788efbefcfb3a717e7e765c416dbf05e672d61c3c763e01cda3422676025e6b,Tests_passed,fe6fb2c3b34875510b4f9e5057dea4e97995649ec570b5bf00acf0d12e4c0fa6,Tests_passed,True,True,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,5f4f21b4eb3f7d47129a4695ff631f7f17002741b7062b8d48df1016aa747b67,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,9e55a7e82bb0f0791f0ece58744f350e322043657319535502a0926033e5c0c0,Merge_failed,9e55a7e82bb0f0791f0ece58744f350e322043657319535502a0926033e5c0c0,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,808984bd76f665bd17544d1eaca764b2362ea730ef354b05d042b20ad8f58fd6,0.0497128963470459,0.05024909973144531,0.05640745162963867,0.05954241752624512,0.06285500526428223,0.0525968074798584,0.048598289489746094,0.3167283535003662,0.0881342887878418,0.4201374053955078,0.42043328285217285,0.22979474067687988,2.571502685546875,0.21503162384033203 diff --git a/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv b/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv index 15d68a9605..7cfe2f725f 100644 --- a/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv +++ b/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/remotes/origin/pull/2,d2203a3c4b2373e013348cd1f2c167a8343ee344,2eb297e73a9bfb689da7571f0d5d0dd5fdb0f079,ca033c9d60c34680cf208f7c6eb4cdc59d62eea4,,fe86e67eefc50de41a818b5c41ed4bc5cbc7b4317b56d242c678fa24d7c379a2,Tests_passed,24db2423433b76a5166a57598ed69cd1e94d5f6cf314afbee317035000dff892,Tests_passed,True,True,True,True,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,479fd8c49dbcf642cd2e1575c69c6341e8be36f6a1d4264540ba9500a191cd9f,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,21e76e11a3c061166e8342283a966308dc6e9442cd227c2c04beffc7e25e2d9c,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,2db1c0814b07e13153d62f7d6bafced3b335f24f2bba1fdf88614e9c4c42afcf,Merge_failed,6945a29813500703599b8e055e74b3d700ff8d57a11e0cca8641f29cdc257748,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,238e1c278b291c7e0b5ab94af38b616bdc7be0270448d3bee436596f56146fb4,Merge_failed,238e1c278b291c7e0b5ab94af38b616bdc7be0270448d3bee436596f56146fb4,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Merge_failed,415abfbab25c8b7f4e7034e3c08e4ac4c7a0d2b213f7b8d28aba035ecd048e20,0.04593968391418457,0.044380903244018555,0.03961348533630371,0.041805267333984375,0.04321622848510742,0.043566226959228516,0.04289984703063965,0.16353154182434082,0.06563401222229004,0.1592724323272705,0.13753986358642578,0.1208658218383789,1.7341010570526123,0.18475890159606934 +2,refs/remotes/origin/pull/2,d2203a3c4b2373e013348cd1f2c167a8343ee344,2eb297e73a9bfb689da7571f0d5d0dd5fdb0f079,ca033c9d60c34680cf208f7c6eb4cdc59d62eea4,,fe86e67eefc50de41a818b5c41ed4bc5cbc7b4317b56d242c678fa24d7c379a2,Tests_passed,24db2423433b76a5166a57598ed69cd1e94d5f6cf314afbee317035000dff892,Tests_passed,True,True,True,True,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,479fd8c49dbcf642cd2e1575c69c6341e8be36f6a1d4264540ba9500a191cd9f,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,21e76e11a3c061166e8342283a966308dc6e9442cd227c2c04beffc7e25e2d9c,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,2db1c0814b07e13153d62f7d6bafced3b335f24f2bba1fdf88614e9c4c42afcf,Merge_failed,6945a29813500703599b8e055e74b3d700ff8d57a11e0cca8641f29cdc257748,Merge_failed,b0506fb94c6f2fb5c2eb9b98adb1926d344083c8f226716c5dc4067e3c900623,Merge_failed,238e1c278b291c7e0b5ab94af38b616bdc7be0270448d3bee436596f56146fb4,Merge_failed,238e1c278b291c7e0b5ab94af38b616bdc7be0270448d3bee436596f56146fb4,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Merge_failed,415abfbab25c8b7f4e7034e3c08e4ac4c7a0d2b213f7b8d28aba035ecd048e20,0.04593968391418457,0.044380903244018555,0.03961348533630371,0.041805267333984375,0.04321622848510742,0.043566226959228516,0.04289984703063965,0.16353154182434082,0.06563401222229004,0.13683032989501953,0.13347530364990234,0.1208658218383789,1.7341010570526123,0.18475890159606934 diff --git a/results/combined/merges_timed/jnr/jnr-enxio.csv b/results/combined/merges_timed/jnr/jnr-enxio.csv index 7b71cc7011..51253690cf 100644 --- a/results/combined/merges_timed/jnr/jnr-enxio.csv +++ b/results/combined/merges_timed/jnr/jnr-enxio.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,06504df5c5e789b3ae946cb938e00c2aa2e78072,c23148ed63fe76f01f16e74720adecc69981f803,7a3a45805cd2b44414df118fd8d21a9606fad2d9,,a78e5a501c75c5b9a06f5562475d74e5c40a5bb8df8c85e333c4a86352952fb5,Tests_passed,e3768f8888ccce91518edf8ea78139163681ff2d99fda57841fe82a1b02fb442,Tests_passed,True,True,True,True,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,0.04137611389160156,0.03892040252685547,0.023033857345581055,0.04365849494934082,0.04348587989807129,0.04316258430480957,0.045990705490112305,0.15509414672851562,0.04179215431213379,0.16168451309204102,0.16319894790649414,0.11496925354003906,1.0193750858306885,0.18111228942871094 +2,refs/heads/master,06504df5c5e789b3ae946cb938e00c2aa2e78072,c23148ed63fe76f01f16e74720adecc69981f803,7a3a45805cd2b44414df118fd8d21a9606fad2d9,,a78e5a501c75c5b9a06f5562475d74e5c40a5bb8df8c85e333c4a86352952fb5,Tests_passed,e3768f8888ccce91518edf8ea78139163681ff2d99fda57841fe82a1b02fb442,Tests_passed,True,True,True,True,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,0.04137611389160156,0.03892040252685547,0.023033857345581055,0.04365849494934082,0.04348587989807129,0.04316258430480957,0.045990705490112305,0.15509414672851562,0.04179215431213379,0.15558147430419922,0.1555483341217041,0.11496925354003906,1.0193750858306885,0.18111228942871094 diff --git a/results/combined/merges_timed/jnr/jnr-unixsocket.csv b/results/combined/merges_timed/jnr/jnr-unixsocket.csv index ad062d3321..980fd2282a 100644 --- a/results/combined/merges_timed/jnr/jnr-unixsocket.csv +++ b/results/combined/merges_timed/jnr/jnr-unixsocket.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/heads/master,1a75fb81ead63de73cb637dca45353706395fb2f,b13d7e769dc494756ae27c9763530590636ec630,47c0a2aa49646012285b43f87e2ddb02dbe26947,,f6a48e08cfbdffaac34c12958f297e5a01309138adbc1b14d1b90b4e1cccf988,Tests_passed,e5e9a8041c228a125ed2a30755ab53485bf9f840508695866b5a4182b12e97be,Tests_passed,True,True,True,True,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,fee0305723caed464b14ce9a1e6729cdd9500d63df0e3da068e9242782d559dd,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,571e0a816eb7904800b0f66e89e7af6b5916fdbcddb9eb76b758906fb1239f41,Merge_failed,571e0a816eb7904800b0f66e89e7af6b5916fdbcddb9eb76b758906fb1239f41,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,a53c3f8d3d3352b2215263c988e77250139f75875def88ebb142f5071d7c8b35,0.044419288635253906,0.041289329528808594,0.037514686584472656,0.04025006294250488,0.04430818557739258,0.04515695571899414,0.045497894287109375,0.23205280303955078,0.06970524787902832,0.27994346618652344,0.2554051876068115,0.15510869026184082,0.8724830150604248,0.20404505729675293 +25,refs/heads/master,1a75fb81ead63de73cb637dca45353706395fb2f,b13d7e769dc494756ae27c9763530590636ec630,47c0a2aa49646012285b43f87e2ddb02dbe26947,,f6a48e08cfbdffaac34c12958f297e5a01309138adbc1b14d1b90b4e1cccf988,Tests_passed,e5e9a8041c228a125ed2a30755ab53485bf9f840508695866b5a4182b12e97be,Tests_passed,True,True,True,True,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,fee0305723caed464b14ce9a1e6729cdd9500d63df0e3da068e9242782d559dd,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,571e0a816eb7904800b0f66e89e7af6b5916fdbcddb9eb76b758906fb1239f41,Merge_failed,571e0a816eb7904800b0f66e89e7af6b5916fdbcddb9eb76b758906fb1239f41,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,a53c3f8d3d3352b2215263c988e77250139f75875def88ebb142f5071d7c8b35,0.044419288635253906,0.041289329528808594,0.037514686584472656,0.04025006294250488,0.04430818557739258,0.04515695571899414,0.045497894287109375,0.23205280303955078,0.06970524787902832,0.27379846572875977,0.280348539352417,0.15510869026184082,0.8724830150604248,0.20404505729675293 diff --git a/results/combined/merges_timed/joaoarthurbm/designwizard.csv b/results/combined/merges_timed/joaoarthurbm/designwizard.csv index 1fdc93e2e9..e3b3fb4672 100644 --- a/results/combined/merges_timed/joaoarthurbm/designwizard.csv +++ b/results/combined/merges_timed/joaoarthurbm/designwizard.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,58fcd555cc6909bb7ca3df27d277600d8c871a81,dc838e11ebd5703f3b6f9506291d6f8f7f2e1f48,1cad83c5ea89ea295fcd6b3019bf095f05dea38c,,True,True,2cc66e406f85207dfb76a2b85fff5474fe37b2330c35f99b0b479e28b9866701,Tests_passed,b64c099bef0bed2dd66aea9472ad9a462f4e580cd526cbae3b31fe9543d3c781,Tests_passed,True,True,Merge_failed,25e343432d72f72ea8e411c2b1f6ddb98a16f3d2af1b3c7dc2f8ef0f3c34f271,Merge_failed,d1e1b259ba96cd4f806271535148906a6f37fd448cb49a9b6b154bb772b0ef62,Merge_failed,25e343432d72f72ea8e411c2b1f6ddb98a16f3d2af1b3c7dc2f8ef0f3c34f271,Merge_failed,4eda210094ceeb35f2d71e52469c090a0babd13ade6e7515e49780192d2bfc01,Merge_failed,0d7c6087816d61ea865f5104739ccd6b21babc49d06c1fab7b2df476379fc3b3,Merge_failed,0d7c6087816d61ea865f5104739ccd6b21babc49d06c1fab7b2df476379fc3b3,Merge_failed,25e343432d72f72ea8e411c2b1f6ddb98a16f3d2af1b3c7dc2f8ef0f3c34f271,Merge_failed,b712637bfc7741ac1ed72b6baee99594cacd23a0f37e32f8d43ecc12a61629c7,Merge_failed,25e343432d72f72ea8e411c2b1f6ddb98a16f3d2af1b3c7dc2f8ef0f3c34f271,Merge_failed,3cd96cd11ad98985c6eafe33dfb637e6bbf832b86b6c196c5fd58fb37cebcb13,Merge_failed,44a02508857e41ba5f4d60168b87fdb90e3e3ed24079e131c258d3286d9fa29c,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,21679d53d2ef46adf438acb79fc7b47162ede579b05778f1253a20c0ccf40eee,Merge_failed,b8d84e4711cbab02bca054b3d3c5f6f896da49ea1a8a4a9386bafc6e0d0d9cf2,0.030118465423583984,0.024637699127197266,0.03443408012390137,0.0342259407043457,0.05332374572753906,0.042693376541137695,0.030167341232299805,0.2801034450531006,0.0777122974395752,0.2958798408508301,0.29604363441467285,0.286210298538208,3.597059488296509,0.3324730396270752 +8,refs/heads/master,58fcd555cc6909bb7ca3df27d277600d8c871a81,dc838e11ebd5703f3b6f9506291d6f8f7f2e1f48,1cad83c5ea89ea295fcd6b3019bf095f05dea38c,,True,True,2cc66e406f85207dfb76a2b85fff5474fe37b2330c35f99b0b479e28b9866701,Tests_passed,b64c099bef0bed2dd66aea9472ad9a462f4e580cd526cbae3b31fe9543d3c781,Tests_passed,True,True,Merge_failed,25e343432d72f72ea8e411c2b1f6ddb98a16f3d2af1b3c7dc2f8ef0f3c34f271,Merge_failed,d1e1b259ba96cd4f806271535148906a6f37fd448cb49a9b6b154bb772b0ef62,Merge_failed,25e343432d72f72ea8e411c2b1f6ddb98a16f3d2af1b3c7dc2f8ef0f3c34f271,Merge_failed,4eda210094ceeb35f2d71e52469c090a0babd13ade6e7515e49780192d2bfc01,Merge_failed,0d7c6087816d61ea865f5104739ccd6b21babc49d06c1fab7b2df476379fc3b3,Merge_failed,0d7c6087816d61ea865f5104739ccd6b21babc49d06c1fab7b2df476379fc3b3,Merge_failed,25e343432d72f72ea8e411c2b1f6ddb98a16f3d2af1b3c7dc2f8ef0f3c34f271,Merge_failed,b712637bfc7741ac1ed72b6baee99594cacd23a0f37e32f8d43ecc12a61629c7,Merge_failed,25e343432d72f72ea8e411c2b1f6ddb98a16f3d2af1b3c7dc2f8ef0f3c34f271,Merge_failed,3cd96cd11ad98985c6eafe33dfb637e6bbf832b86b6c196c5fd58fb37cebcb13,Merge_failed,44a02508857e41ba5f4d60168b87fdb90e3e3ed24079e131c258d3286d9fa29c,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,21679d53d2ef46adf438acb79fc7b47162ede579b05778f1253a20c0ccf40eee,Merge_failed,b8d84e4711cbab02bca054b3d3c5f6f896da49ea1a8a4a9386bafc6e0d0d9cf2,0.030118465423583984,0.024637699127197266,0.03443408012390137,0.0342259407043457,0.05332374572753906,0.042693376541137695,0.030167341232299805,0.2801034450531006,0.0777122974395752,0.29791784286499023,0.2967567443847656,0.286210298538208,3.597059488296509,0.3324730396270752 diff --git a/results/combined/merges_timed/jodaorg/joda-beans.csv b/results/combined/merges_timed/jodaorg/joda-beans.csv index 3f2b766091..ef98f343d2 100644 --- a/results/combined/merges_timed/jodaorg/joda-beans.csv +++ b/results/combined/merges_timed/jodaorg/joda-beans.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/remotes/origin/pull/212,dec9b88627fa8e7ff0b7804a22cb5cf594dbe7df,dc23f43d5e28cfe4ea9acd7e45e2bdb85556d4c4,5f44ff767131606cda6135a13f25c4816623a558,,364df857cee01a24477a12059a69b1f0ba58b4d25dc681b790083baf82decf67,Tests_passed,270a8129d623eb08b47281cded7e46d7b9751d44418092bb6802da065b2603a0,Tests_passed,True,True,True,True,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,0.021939754486083984,0.035685062408447266,0.04360556602478027,0.04532051086425781,0.023697614669799805,0.044596195220947266,0.04378795623779297,0.13222670555114746,0.033867835998535156,0.39333438873291016,0.39289379119873047,0.24751067161560059,3.194833278656006,0.26049041748046875 +14,refs/remotes/origin/pull/212,dec9b88627fa8e7ff0b7804a22cb5cf594dbe7df,dc23f43d5e28cfe4ea9acd7e45e2bdb85556d4c4,5f44ff767131606cda6135a13f25c4816623a558,,364df857cee01a24477a12059a69b1f0ba58b4d25dc681b790083baf82decf67,Tests_passed,270a8129d623eb08b47281cded7e46d7b9751d44418092bb6802da065b2603a0,Tests_passed,True,True,True,True,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,0.021939754486083984,0.035685062408447266,0.04360556602478027,0.04532051086425781,0.023697614669799805,0.044596195220947266,0.04378795623779297,0.13222670555114746,0.033867835998535156,0.352158784866333,0.35817742347717285,0.24751067161560059,3.194833278656006,0.26049041748046875 diff --git a/results/combined/merges_timed/jodastephen/property-alliance.csv b/results/combined/merges_timed/jodastephen/property-alliance.csv index 70ed81073c..6e47561859 100644 --- a/results/combined/merges_timed/jodastephen/property-alliance.csv +++ b/results/combined/merges_timed/jodastephen/property-alliance.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,13848ab05df1997879b886e6488fba6265cc8233,5d2861df97016960d3c2ec09bbde50a30cc2e0c0,7d9b6dd776dd981d0d7dcba883e40358b860b85c,,True,True,c3df6d211dddacb99be8f62152b6adcc5e1d76d73a9207a2fdc958da99129880,Tests_passed,a70f0d0b3c55fda89f2d14f11dd80ff1732c8e957fd7be4ce92abf056509920c,Tests_passed,True,True,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Merge_failed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,0.04447579383850098,0.0353853702545166,0.04542422294616699,0.04469180107116699,0.04566454887390137,0.043085575103759766,0.045067787170410156,0.23141860961914062,0.04100298881530762,0.3012855052947998,0.30109620094299316,0.17456340789794922,1.0964851379394531,0.19396543502807617 +5,refs/heads/master,13848ab05df1997879b886e6488fba6265cc8233,5d2861df97016960d3c2ec09bbde50a30cc2e0c0,7d9b6dd776dd981d0d7dcba883e40358b860b85c,,True,True,c3df6d211dddacb99be8f62152b6adcc5e1d76d73a9207a2fdc958da99129880,Tests_passed,a70f0d0b3c55fda89f2d14f11dd80ff1732c8e957fd7be4ce92abf056509920c,Tests_passed,True,True,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Merge_failed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,0.04447579383850098,0.0353853702545166,0.04542422294616699,0.04469180107116699,0.04566454887390137,0.043085575103759766,0.045067787170410156,0.23141860961914062,0.04100298881530762,0.3022291660308838,0.30077052116394043,0.17456340789794922,1.0964851379394531,0.19396543502807617 diff --git a/results/combined/merges_timed/joel-costigliola/assertj-assertions-generator.csv b/results/combined/merges_timed/joel-costigliola/assertj-assertions-generator.csv index be16bdc7e0..7a4ae155c1 100644 --- a/results/combined/merges_timed/joel-costigliola/assertj-assertions-generator.csv +++ b/results/combined/merges_timed/joel-costigliola/assertj-assertions-generator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/main,e9c59be58d0f5f8598375f4031f5f06ac0f1cdcc,110502e40c6e85333a4c6e5161f35f0757e8c493,535559c9286c16ac8f356676bcecf8a3392f9022,,c2206d168feee7de6ad83adfe0ed8d09893fa9d9f3c4d2fac4b6f6c6c47c4f0a,Tests_passed,64d33d228f278c8174aaf4b491d897899d579952a0c1fe5b95bc96c52630bd64,Tests_passed,True,True,True,True,Merge_failed,28271d3d72652813f0f3127e936c7fb3b1026fd8d0e68e47aeaf98943bd3f40c,Merge_failed,4c758c6608cc116427a3b709d95c3aa29214498cae4c185ace117bcb59da943c,Merge_failed,28271d3d72652813f0f3127e936c7fb3b1026fd8d0e68e47aeaf98943bd3f40c,Merge_failed,6846335aea17e24a2aeb782fb6e363397fc915588273fe224b3ad6362548a8de,Merge_failed,7f44249ae2779b18fb25b81f645cd4c8c2ec091da200ccee81e5bf611230de1c,Merge_failed,7f44249ae2779b18fb25b81f645cd4c8c2ec091da200ccee81e5bf611230de1c,Merge_failed,10f3fadc37e71f6237a855a72cba28ab30de5baad0a56ab61d2bca9708d17c05,Merge_failed,dc1580e9ff77c52e6cb14fc1e27a72c8723abd3301af669a6751b52c372fefb4,Merge_failed,28271d3d72652813f0f3127e936c7fb3b1026fd8d0e68e47aeaf98943bd3f40c,Merge_failed,b4ea15b075d9f06fa4645799bde4b678beee4134c43d0122f02e1c5f383a8ade,Merge_failed,b4ea15b075d9f06fa4645799bde4b678beee4134c43d0122f02e1c5f383a8ade,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,70aac63c47daf47648143432243c279abc30e2d8d8bcd576385b55e17aae0534,0.0594935417175293,0.05236530303955078,0.051554203033447266,0.05587482452392578,0.049386024475097656,0.05462050437927246,0.060712337493896484,0.6363668441772461,0.10449767112731934,0.862126350402832,0.8548183441162109,0.5410242080688477,6.6980626583099365,0.23412370681762695 +1,refs/heads/main,e9c59be58d0f5f8598375f4031f5f06ac0f1cdcc,110502e40c6e85333a4c6e5161f35f0757e8c493,535559c9286c16ac8f356676bcecf8a3392f9022,,c2206d168feee7de6ad83adfe0ed8d09893fa9d9f3c4d2fac4b6f6c6c47c4f0a,Tests_passed,64d33d228f278c8174aaf4b491d897899d579952a0c1fe5b95bc96c52630bd64,Tests_passed,True,True,True,True,Merge_failed,28271d3d72652813f0f3127e936c7fb3b1026fd8d0e68e47aeaf98943bd3f40c,Merge_failed,4c758c6608cc116427a3b709d95c3aa29214498cae4c185ace117bcb59da943c,Merge_failed,28271d3d72652813f0f3127e936c7fb3b1026fd8d0e68e47aeaf98943bd3f40c,Merge_failed,6846335aea17e24a2aeb782fb6e363397fc915588273fe224b3ad6362548a8de,Merge_failed,7f44249ae2779b18fb25b81f645cd4c8c2ec091da200ccee81e5bf611230de1c,Merge_failed,7f44249ae2779b18fb25b81f645cd4c8c2ec091da200ccee81e5bf611230de1c,Merge_failed,10f3fadc37e71f6237a855a72cba28ab30de5baad0a56ab61d2bca9708d17c05,Merge_failed,dc1580e9ff77c52e6cb14fc1e27a72c8723abd3301af669a6751b52c372fefb4,Merge_failed,28271d3d72652813f0f3127e936c7fb3b1026fd8d0e68e47aeaf98943bd3f40c,Merge_failed,b4ea15b075d9f06fa4645799bde4b678beee4134c43d0122f02e1c5f383a8ade,Merge_failed,b4ea15b075d9f06fa4645799bde4b678beee4134c43d0122f02e1c5f383a8ade,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,70aac63c47daf47648143432243c279abc30e2d8d8bcd576385b55e17aae0534,0.0594935417175293,0.05236530303955078,0.051554203033447266,0.05587482452392578,0.049386024475097656,0.05462050437927246,0.060712337493896484,0.6363668441772461,0.10449767112731934,0.853050947189331,0.8565025329589844,0.5410242080688477,6.6980626583099365,0.23412370681762695 diff --git a/results/combined/merges_timed/joel-costigliola/assertj-core.csv b/results/combined/merges_timed/joel-costigliola/assertj-core.csv index 8ada62764d..68149f5f0e 100644 --- a/results/combined/merges_timed/joel-costigliola/assertj-core.csv +++ b/results/combined/merges_timed/joel-costigliola/assertj-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -52,refs/heads/main,01799c8c9011d8695ba0a97ff7b659e5ce879d11,5f77a95ba5277ac3648f805f96d4692edd6ac9f3,9bf86bc554b5cf3bd9ff5f541fbee4adf2a811cf,,True,True,32455f4c599a798753c1eefb3c0e1720ae98d051ea16b5b61b2d759cd672c1fc,Tests_passed,a79bef6baf9c3bc084de56d80c1bf0b5835a1d9983e635878e0792174aaa0cbb,Tests_passed,True,True,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Merge_failed,d6255fd2cf7a2918146a697bdc2b891589bc58d472e904fed9f90d3960905ef0,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_failed,d10c219404ceb738a840d84216038f6cca67d3cbfe30d8ea7a093774b888bebe,Tests_failed,d10c219404ceb738a840d84216038f6cca67d3cbfe30d8ea7a093774b888bebe,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_failed,5965f9e98f97f528237051135b3681518a4707330ce837e8588f14f7db43e4ad,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,0.07190561294555664,0.07251882553100586,0.08411836624145508,0.08067631721496582,0.08944988250732422,0.08176183700561523,0.0756533145904541,0.6391732692718506,0.07225513458251953,1.3705615997314453,1.37605619430542,0.5138726234436035,7.798923969268799,2.374288558959961 +52,refs/heads/main,01799c8c9011d8695ba0a97ff7b659e5ce879d11,5f77a95ba5277ac3648f805f96d4692edd6ac9f3,9bf86bc554b5cf3bd9ff5f541fbee4adf2a811cf,,True,True,32455f4c599a798753c1eefb3c0e1720ae98d051ea16b5b61b2d759cd672c1fc,Tests_passed,a79bef6baf9c3bc084de56d80c1bf0b5835a1d9983e635878e0792174aaa0cbb,Tests_passed,True,True,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Merge_failed,d6255fd2cf7a2918146a697bdc2b891589bc58d472e904fed9f90d3960905ef0,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_failed,d10c219404ceb738a840d84216038f6cca67d3cbfe30d8ea7a093774b888bebe,Tests_failed,d10c219404ceb738a840d84216038f6cca67d3cbfe30d8ea7a093774b888bebe,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_failed,5965f9e98f97f528237051135b3681518a4707330ce837e8588f14f7db43e4ad,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,0.07190561294555664,0.07251882553100586,0.08411836624145508,0.08067631721496582,0.08944988250732422,0.08176183700561523,0.0756533145904541,0.6391732692718506,0.07225513458251953,1.3402841091156006,1.3485734462738037,0.5138726234436035,7.798923969268799,2.374288558959961 diff --git a/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv b/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv index ad1d0888bd..69caa34187 100644 --- a/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv +++ b/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,e407eb6955fe9325b7b0c2ce4069e7d640c1cf81,f451b3a5c0d067c8341ca9d73d9c38c45a457cf9,d596ee43d3f18a8b46fa38218a9d2592e606c265,,True,True,d358cb0059aab155c1bb2cf22761b4f139c0434b4a44d61a541024f259994a06,Tests_passed,9babcde81773aa2f18c88f90dca876bb0816b1fb74e3d55d1018b39e0b4d4bdd,Tests_passed,True,True,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,0e17d920d4ba2e00fa22b61f44dab5b0f3f79155b18969f5bdae927e08828ce8,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,4a676ff94ab392606a890eb5cdf3664ab870061d3e022ff80e4107a2c542d6a4,Merge_failed,4a676ff94ab392606a890eb5cdf3664ab870061d3e022ff80e4107a2c542d6a4,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,478477a436f10235c2726ad7129569b6c2658644824786b712f3a2351bc6b364,Merge_failed,3b5d398417141e86619ab7b8f2e1a136c9f7598460b9411c9a942014b9f89bf6,0.03798937797546387,0.03644275665283203,0.04597640037536621,0.039075374603271484,0.044461965560913086,0.045563697814941406,0.04413175582885742,0.224684476852417,0.08462905883789062,0.07757258415222168,0.07887077331542969,0.21860432624816895,0.806220293045044,0.20076370239257812 +14,refs/heads/master,e407eb6955fe9325b7b0c2ce4069e7d640c1cf81,f451b3a5c0d067c8341ca9d73d9c38c45a457cf9,d596ee43d3f18a8b46fa38218a9d2592e606c265,,True,True,d358cb0059aab155c1bb2cf22761b4f139c0434b4a44d61a541024f259994a06,Tests_passed,9babcde81773aa2f18c88f90dca876bb0816b1fb74e3d55d1018b39e0b4d4bdd,Tests_passed,True,True,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,0e17d920d4ba2e00fa22b61f44dab5b0f3f79155b18969f5bdae927e08828ce8,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,4a676ff94ab392606a890eb5cdf3664ab870061d3e022ff80e4107a2c542d6a4,Merge_failed,4a676ff94ab392606a890eb5cdf3664ab870061d3e022ff80e4107a2c542d6a4,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,478477a436f10235c2726ad7129569b6c2658644824786b712f3a2351bc6b364,Merge_failed,3b5d398417141e86619ab7b8f2e1a136c9f7598460b9411c9a942014b9f89bf6,0.03798937797546387,0.03644275665283203,0.04597640037536621,0.039075374603271484,0.044461965560913086,0.045563697814941406,0.04413175582885742,0.224684476852417,0.08462905883789062,0.06800580024719238,0.0681619644165039,0.21860432624816895,0.806220293045044,0.20076370239257812 diff --git a/results/combined/merges_timed/johncarl81/parceler.csv b/results/combined/merges_timed/johncarl81/parceler.csv index f84ea211d6..226cd802a4 100644 --- a/results/combined/merges_timed/johncarl81/parceler.csv +++ b/results/combined/merges_timed/johncarl81/parceler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,Tests_passed,True,True,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,0.01697397232055664,0.017736434936523438,0.022325515747070312,0.022197484970092773,0.02158522605895996,0.022143125534057617,0.02219414710998535,0.05076146125793457,0.017192840576171875,0.16641926765441895,0.1591663360595703,0.07213878631591797,1.0636169910430908,0.181929349899292 +36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,Tests_passed,True,True,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,0.01697397232055664,0.017736434936523438,0.022325515747070312,0.022197484970092773,0.02158522605895996,0.022143125534057617,0.02219414710998535,0.05076146125793457,0.017192840576171875,0.1654038429260254,0.16548871994018555,0.07213878631591797,1.0636169910430908,0.181929349899292 diff --git a/results/combined/merges_timed/johnnei/javatorrent.csv b/results/combined/merges_timed/johnnei/javatorrent.csv index f4cc4ac167..d04eb7f919 100644 --- a/results/combined/merges_timed/johnnei/javatorrent.csv +++ b/results/combined/merges_timed/johnnei/javatorrent.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/develop,3e2e076b0d94417e7a92f6e1f861ab06696dbaba,2fbad48779e19f1ce23c2d60097cdb2fed19ac89,effadbf711ec7d523c87d62deca64528d61c0fc8,,True,True,3e2e08cebda51e66bb9f926d48ba36fbf4e02cabf33b513bc07fa050393f495e,Tests_passed,ef0432d0e74301e6e414e666645e9bd449e9bbbd8285c883ee16eba53c4bc7c5,Tests_passed,True,True,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,0.15433049201965332,0.14623260498046875,0.12893891334533691,0.16030430793762207,0.1604595184326172,0.14382433891296387,0.13800787925720215,0.2703728675842285,0.13273978233337402,0.1750805377960205,0.16897940635681152,0.17521333694458008,0.09856295585632324,0.38846349716186523 +16,refs/heads/develop,3e2e076b0d94417e7a92f6e1f861ab06696dbaba,2fbad48779e19f1ce23c2d60097cdb2fed19ac89,effadbf711ec7d523c87d62deca64528d61c0fc8,,True,True,3e2e08cebda51e66bb9f926d48ba36fbf4e02cabf33b513bc07fa050393f495e,Tests_passed,ef0432d0e74301e6e414e666645e9bd449e9bbbd8285c883ee16eba53c4bc7c5,Tests_passed,True,True,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,0.15433049201965332,0.14623260498046875,0.12893891334533691,0.16030430793762207,0.1604595184326172,0.14382433891296387,0.13800787925720215,0.2703728675842285,0.13273978233337402,0.17216110229492188,0.1734778881072998,0.17521333694458008,0.09856295585632324,0.38846349716186523 diff --git a/results/combined/merges_timed/jooq/jooq.csv b/results/combined/merges_timed/jooq/jooq.csv index 4130f66ddb..1be45d736e 100644 --- a/results/combined/merges_timed/jooq/jooq.csv +++ b/results/combined/merges_timed/jooq/jooq.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,Tests_passed,True,True,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,0.05702948570251465,0.05356884002685547,0.0689246654510498,0.0749216079711914,0.0643165111541748,0.07329773902893066,0.05992484092712402,0.2512493133544922,0.057192325592041016,0.3103508949279785,0.314190149307251,0.17312407493591309,8.96409797668457,1.450141191482544 +26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,Tests_passed,True,True,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,0.05702948570251465,0.05356884002685547,0.0689246654510498,0.0749216079711914,0.0643165111541748,0.07329773902893066,0.05992484092712402,0.2512493133544922,0.057192325592041016,0.29502010345458984,0.3017463684082031,0.17312407493591309,8.96409797668457,1.450141191482544 diff --git a/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv b/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv index 3e93ca80ac..1d46f1d8ec 100644 --- a/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv +++ b/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,Tests_passed,True,True,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,d75f7a5a34e9e6031338d92a6e7c0978e7257b1a810c0d74f375a229bd564826,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,d75f7a5a34e9e6031338d92a6e7c0978e7257b1a810c0d74f375a229bd564826,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,07b5a9fd1ea4d51aa8ef98244f1d16fac2d5cdc8acc8ae9dfcc07367678f26a3,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,81db2f3286671428d0d62f06a6671d7b3fff4d15047603e08e81d3ce0d62bb10,Merge_failed,0f2cbc208db7ec7603b6bc03d8b0fa70579d38f1d92ecb6c67905565fc509751,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,0.04706239700317383,0.04752039909362793,0.03997945785522461,0.03621697425842285,0.009907007217407227,0.009777545928955078,0.010146617889404297,0.3724863529205322,0.10832762718200684,0.11864757537841797,0.11889410018920898,0.2910497188568115,1.1195287704467773,0.1979966163635254 +3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,Tests_passed,True,True,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,d75f7a5a34e9e6031338d92a6e7c0978e7257b1a810c0d74f375a229bd564826,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,d75f7a5a34e9e6031338d92a6e7c0978e7257b1a810c0d74f375a229bd564826,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,07b5a9fd1ea4d51aa8ef98244f1d16fac2d5cdc8acc8ae9dfcc07367678f26a3,Merge_failed,ffdb81f3ec65133ae7d87b442f279807c8028772ad08f0e7aa3026fc610f18db,Merge_failed,81db2f3286671428d0d62f06a6671d7b3fff4d15047603e08e81d3ce0d62bb10,Merge_failed,0f2cbc208db7ec7603b6bc03d8b0fa70579d38f1d92ecb6c67905565fc509751,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,0.04706239700317383,0.04752039909362793,0.03997945785522461,0.03621697425842285,0.009907007217407227,0.009777545928955078,0.010146617889404297,0.3724863529205322,0.10832762718200684,0.11814761161804199,0.11874747276306152,0.2910497188568115,1.1195287704467773,0.1979966163635254 diff --git a/results/combined/merges_timed/joschi/dropwizard-flyway.csv b/results/combined/merges_timed/joschi/dropwizard-flyway.csv index d4f57da615..01012d977c 100644 --- a/results/combined/merges_timed/joschi/dropwizard-flyway.csv +++ b/results/combined/merges_timed/joschi/dropwizard-flyway.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,Tests_passed,True,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,9ff21883be4b013010b45d15e5e4ae19a3afeaaaebd204ca711097608e1cd7b1,Merge_failed,9ff21883be4b013010b45d15e5e4ae19a3afeaaaebd204ca711097608e1cd7b1,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,01896943414eb7316ff72b30c61aacb0a39c1f1855ca6891e08147860c1d9684,0.03916025161743164,0.04445385932922363,0.039504051208496094,0.04703092575073242,0.04264521598815918,0.03714466094970703,0.04491162300109863,0.17237281799316406,0.07734966278076172,0.07629847526550293,0.07705259323120117,0.11269545555114746,0.9853577613830566,0.20882940292358398 +7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,Tests_passed,True,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,9ff21883be4b013010b45d15e5e4ae19a3afeaaaebd204ca711097608e1cd7b1,Merge_failed,9ff21883be4b013010b45d15e5e4ae19a3afeaaaebd204ca711097608e1cd7b1,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,01896943414eb7316ff72b30c61aacb0a39c1f1855ca6891e08147860c1d9684,0.03916025161743164,0.04445385932922363,0.039504051208496094,0.04703092575073242,0.04264521598815918,0.03714466094970703,0.04491162300109863,0.17237281799316406,0.07734966278076172,0.07675337791442871,0.07656598091125488,0.11269545555114746,0.9853577613830566,0.20882940292358398 diff --git a/results/combined/merges_timed/joshlong/spring-birt.csv b/results/combined/merges_timed/joshlong/spring-birt.csv index 3bbb2fca57..6618d8e4a7 100644 --- a/results/combined/merges_timed/joshlong/spring-birt.csv +++ b/results/combined/merges_timed/joshlong/spring-birt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,f38e819c4a81bcc9f55b6496c7c9a8728d550694,e674445485360c05639371647a788352f3eaa9bc,dfe261e1b7b69475d706f5e0a6a56a50dc8856b8,,7d079ce21ab7fae3260104e45fcd5daf8b0e974d9a22dd26ff5331319f9dfdf2,Tests_passed,2bf2e5ac6c9cd6c29d2ae9d1e8d3d76a3b9c3631e40d2739bc6f4ff3fd7a4e0b,Tests_passed,True,True,True,True,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,a2ee21b8abdbcd112f92e9324654b06d78ae5581f26f35162f7bcf71e6e9c49f,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,da5052b97d3b00897a5b75e008be989503409ae84f90d66414de56dcadd8ebf4,Merge_failed,da5052b97d3b00897a5b75e008be989503409ae84f90d66414de56dcadd8ebf4,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,69fdb942705e10523af4b0415a584d6cb8f0139d0e916f6ef460b5474f1dbfb4,0.036927223205566406,0.017066478729248047,0.05132865905761719,0.05055427551269531,0.03971219062805176,0.03368043899536133,0.034694671630859375,0.17089390754699707,0.06898784637451172,0.07133078575134277,0.07104682922363281,0.12137079238891602,0.5011632442474365,0.18956756591796875 +1,refs/heads/master,f38e819c4a81bcc9f55b6496c7c9a8728d550694,e674445485360c05639371647a788352f3eaa9bc,dfe261e1b7b69475d706f5e0a6a56a50dc8856b8,,7d079ce21ab7fae3260104e45fcd5daf8b0e974d9a22dd26ff5331319f9dfdf2,Tests_passed,2bf2e5ac6c9cd6c29d2ae9d1e8d3d76a3b9c3631e40d2739bc6f4ff3fd7a4e0b,Tests_passed,True,True,True,True,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,a2ee21b8abdbcd112f92e9324654b06d78ae5581f26f35162f7bcf71e6e9c49f,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,da5052b97d3b00897a5b75e008be989503409ae84f90d66414de56dcadd8ebf4,Merge_failed,da5052b97d3b00897a5b75e008be989503409ae84f90d66414de56dcadd8ebf4,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,69fdb942705e10523af4b0415a584d6cb8f0139d0e916f6ef460b5474f1dbfb4,0.036927223205566406,0.017066478729248047,0.05132865905761719,0.05055427551269531,0.03971219062805176,0.03368043899536133,0.034694671630859375,0.17089390754699707,0.06898784637451172,0.07014799118041992,0.06998562812805176,0.12137079238891602,0.5011632442474365,0.18956756591796875 diff --git a/results/combined/merges_timed/joyent/java-manta.csv b/results/combined/merges_timed/joyent/java-manta.csv index 35065a6304..ea1c61809e 100644 --- a/results/combined/merges_timed/joyent/java-manta.csv +++ b/results/combined/merges_timed/joyent/java-manta.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -123,refs/remotes/origin/buckets-m1,5fb0fe7ba2f3107ca1ed1b26c8e6f2d30262db6d,aad00fd5b8d53dc9c75ab14c35067898922c6215,0a0df02b8f5f8e0e90623f67d6e4ddd529fea956,,True,True,b33aac36e6a95ae891f9dd786b45ba17f1c83db4f20c60c78c8a0dc71acd6597,Tests_passed,346752f3d97f0de6b2e8fd5842337fe16436d2eac969f7e9c16677c2008cfe5c,Tests_passed,True,True,Merge_failed,707618a1352273ad03305cfa7295f26b8084856b06e8af60d06d3f1463b24cf9,Merge_failed,a7f739f7191efe21119dbecfadb84b6fa73ced9e91cda3146eb4cf640ef672da,Merge_failed,707618a1352273ad03305cfa7295f26b8084856b06e8af60d06d3f1463b24cf9,Merge_failed,ad6f43325f152f1e4acf3fbdee66c062639550f7bcf0551b0bea81dc6b7a0779,Merge_failed,1eb92e5fda47dcdb25cf83b23033d8182b4ffc8dc6fb0577e12f61814aafb560,Merge_failed,1eb92e5fda47dcdb25cf83b23033d8182b4ffc8dc6fb0577e12f61814aafb560,Merge_failed,707618a1352273ad03305cfa7295f26b8084856b06e8af60d06d3f1463b24cf9,Merge_failed,ec26dcacc5b459f9bc4b5d7f0e4196171eeb26e8d8c674173d91689531718d2d,Merge_failed,707618a1352273ad03305cfa7295f26b8084856b06e8af60d06d3f1463b24cf9,Merge_failed,6441c87dbce37b907c4afc5ecc639d9bbc0b0b0b3e95122ab0d1791dc71c2978,Merge_failed,6441c87dbce37b907c4afc5ecc639d9bbc0b0b0b3e95122ab0d1791dc71c2978,Merge_failed,61ac56f1ab937fbdca10f266e6dc5d0f32087123808e359be3f98bcd7cbe6b32,Merge_failed,8a2264bbd82536471540d0444ecc58d33813e9f23954b1c74a2379245e6bfd5e,Merge_failed,e152dccb52bd99333bdc86d71d4d50d9d107d22a6f5d035d57cce8eda3ea3a9a,0.04119515419006348,0.042608022689819336,0.02714395523071289,0.028490543365478516,0.04684615135192871,0.04653310775756836,0.027832746505737305,0.2538325786590576,0.0521392822265625,1.0365476608276367,1.0346355438232422,0.6859967708587646,10.505682229995728,0.32437825202941895 +123,refs/remotes/origin/buckets-m1,5fb0fe7ba2f3107ca1ed1b26c8e6f2d30262db6d,aad00fd5b8d53dc9c75ab14c35067898922c6215,0a0df02b8f5f8e0e90623f67d6e4ddd529fea956,,True,True,b33aac36e6a95ae891f9dd786b45ba17f1c83db4f20c60c78c8a0dc71acd6597,Tests_passed,346752f3d97f0de6b2e8fd5842337fe16436d2eac969f7e9c16677c2008cfe5c,Tests_passed,True,True,Merge_failed,707618a1352273ad03305cfa7295f26b8084856b06e8af60d06d3f1463b24cf9,Merge_failed,a7f739f7191efe21119dbecfadb84b6fa73ced9e91cda3146eb4cf640ef672da,Merge_failed,707618a1352273ad03305cfa7295f26b8084856b06e8af60d06d3f1463b24cf9,Merge_failed,ad6f43325f152f1e4acf3fbdee66c062639550f7bcf0551b0bea81dc6b7a0779,Merge_failed,1eb92e5fda47dcdb25cf83b23033d8182b4ffc8dc6fb0577e12f61814aafb560,Merge_failed,1eb92e5fda47dcdb25cf83b23033d8182b4ffc8dc6fb0577e12f61814aafb560,Merge_failed,707618a1352273ad03305cfa7295f26b8084856b06e8af60d06d3f1463b24cf9,Merge_failed,ec26dcacc5b459f9bc4b5d7f0e4196171eeb26e8d8c674173d91689531718d2d,Merge_failed,707618a1352273ad03305cfa7295f26b8084856b06e8af60d06d3f1463b24cf9,Merge_failed,6441c87dbce37b907c4afc5ecc639d9bbc0b0b0b3e95122ab0d1791dc71c2978,Merge_failed,6441c87dbce37b907c4afc5ecc639d9bbc0b0b0b3e95122ab0d1791dc71c2978,Merge_failed,61ac56f1ab937fbdca10f266e6dc5d0f32087123808e359be3f98bcd7cbe6b32,Merge_failed,8a2264bbd82536471540d0444ecc58d33813e9f23954b1c74a2379245e6bfd5e,Merge_failed,e152dccb52bd99333bdc86d71d4d50d9d107d22a6f5d035d57cce8eda3ea3a9a,0.04119515419006348,0.042608022689819336,0.02714395523071289,0.028490543365478516,0.04684615135192871,0.04653310775756836,0.027832746505737305,0.2538325786590576,0.0521392822265625,1.0318174362182617,1.0328443050384521,0.6859967708587646,10.505682229995728,0.32437825202941895 diff --git a/results/combined/merges_timed/jparsec/jparsec.csv b/results/combined/merges_timed/jparsec/jparsec.csv index ec1bbaa6af..2296fa0856 100644 --- a/results/combined/merges_timed/jparsec/jparsec.csv +++ b/results/combined/merges_timed/jparsec/jparsec.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -39,refs/remotes/origin/5-locatable,ef02642abd641e654abd504ed36a5eb1571ec40c,9b2be3d78619d74c8a1fd38c4b28b8fc775fcef5,b534848cf79d4a1341deb27d25fc3ce48670c806,,True,True,051cb138152af5d962dd02d6ecc3ed55b4e8d41868f57c000bf9154ae716a9d2,Tests_passed,7d65e9fd34405cb14c1788039c0b3075397de4e484096d9a1f801878d34c8025,Tests_passed,True,True,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,d25febc0f0d9f4e8ac50f7f84d312a3d97a0086622c9c91be37f4d24a1a9d589,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,f7854089bc78aa290faaf29ed900f9d33639655ad3ee9dd0caf8043b89ead68a,Merge_failed,f7854089bc78aa290faaf29ed900f9d33639655ad3ee9dd0caf8043b89ead68a,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,93591f74d0167cdf2b24adedb6cd85b23084eb3178dcb3096ca253ae9ae90524,0.04513430595397949,0.017541170120239258,0.012710809707641602,0.03601884841918945,0.04246854782104492,0.02685713768005371,0.02537679672241211,0.15541720390319824,0.03305459022521973,0.07449722290039062,0.08422040939331055,0.0939328670501709,0.9674105644226074,0.20580554008483887 +39,refs/remotes/origin/5-locatable,ef02642abd641e654abd504ed36a5eb1571ec40c,9b2be3d78619d74c8a1fd38c4b28b8fc775fcef5,b534848cf79d4a1341deb27d25fc3ce48670c806,,True,True,051cb138152af5d962dd02d6ecc3ed55b4e8d41868f57c000bf9154ae716a9d2,Tests_passed,7d65e9fd34405cb14c1788039c0b3075397de4e484096d9a1f801878d34c8025,Tests_passed,True,True,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,d25febc0f0d9f4e8ac50f7f84d312a3d97a0086622c9c91be37f4d24a1a9d589,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,f7854089bc78aa290faaf29ed900f9d33639655ad3ee9dd0caf8043b89ead68a,Merge_failed,f7854089bc78aa290faaf29ed900f9d33639655ad3ee9dd0caf8043b89ead68a,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,93591f74d0167cdf2b24adedb6cd85b23084eb3178dcb3096ca253ae9ae90524,0.04513430595397949,0.017541170120239258,0.012710809707641602,0.03601884841918945,0.04246854782104492,0.02685713768005371,0.02537679672241211,0.15541720390319824,0.03305459022521973,0.08449888229370117,0.08423662185668945,0.0939328670501709,0.9674105644226074,0.20580554008483887 diff --git a/results/combined/merges_timed/jpmml/openscoring.csv b/results/combined/merges_timed/jpmml/openscoring.csv index 38d57915c2..721228c591 100644 --- a/results/combined/merges_timed/jpmml/openscoring.csv +++ b/results/combined/merges_timed/jpmml/openscoring.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,9aca0c7a8409f3888295b16cc03a74d8def3ed21,f48b5593a16f6a011c30dbf61f9c083482ffe87e,6342ffd5c7e700aa10844e929e6a3c09f4f38a52,,637eed99e1949b6725d40fa7360000b465447614bebdf565dbb6a509560e1e45,Tests_passed,3d2386a845e132073aa35bbc589bc23f557f62b4a3f753c8ab3746cdc8325ed0,Tests_passed,True,True,True,True,Merge_failed,99d2103863460e5cf1a4113fa153c9f2f113bcbc3c7a491ce1a497cf586c42ac,Merge_failed,0ecf8507f77d2f8c5c2167eb1e93b257c1660a55d43d2e7d1ded737d9d757652,Merge_failed,99d2103863460e5cf1a4113fa153c9f2f113bcbc3c7a491ce1a497cf586c42ac,Merge_failed,fc3b2044c90c62ee67b94da260b68f70569923c909b49538aa0df3c1746db1bf,Merge_failed,148760c8997b3984ef4d11295a5433d60df638635f5469b597599080e51dfe1c,Merge_failed,148760c8997b3984ef4d11295a5433d60df638635f5469b597599080e51dfe1c,Merge_failed,fdf27142665aaaf18c5dabe60cfaf4b66ef569ae760a4ea9eba78eab06270679,Merge_failed,244d0e85c65eac8351885939d7efb4faf96d6784194655d6032e5e3408d9a1f3,Merge_failed,99d2103863460e5cf1a4113fa153c9f2f113bcbc3c7a491ce1a497cf586c42ac,Merge_failed,ebd68d30af186839e10fb1c29799683f00a7c5a1f90354376431368d54c81def,Merge_failed,ebd68d30af186839e10fb1c29799683f00a7c5a1f90354376431368d54c81def,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,21b45635b8f292576b725e53ea4b7ea7d856bb5508ce09ca56810d981aaeb962,Merge_failed,6dc1c87a64f0fa4bfb5e152df4c6ac137a6fa4dcc6e1fe5b0e11cc3840105976,0.012881755828857422,0.013143539428710938,0.01459646224975586,0.01443791389465332,0.014513969421386719,0.014598846435546875,0.014631509780883789,0.10987305641174316,0.027887821197509766,0.258730411529541,0.25801515579223633,0.41577792167663574,2.680182695388794,0.20369434356689453 +1,refs/heads/master,9aca0c7a8409f3888295b16cc03a74d8def3ed21,f48b5593a16f6a011c30dbf61f9c083482ffe87e,6342ffd5c7e700aa10844e929e6a3c09f4f38a52,,637eed99e1949b6725d40fa7360000b465447614bebdf565dbb6a509560e1e45,Tests_passed,3d2386a845e132073aa35bbc589bc23f557f62b4a3f753c8ab3746cdc8325ed0,Tests_passed,True,True,True,True,Merge_failed,99d2103863460e5cf1a4113fa153c9f2f113bcbc3c7a491ce1a497cf586c42ac,Merge_failed,0ecf8507f77d2f8c5c2167eb1e93b257c1660a55d43d2e7d1ded737d9d757652,Merge_failed,99d2103863460e5cf1a4113fa153c9f2f113bcbc3c7a491ce1a497cf586c42ac,Merge_failed,fc3b2044c90c62ee67b94da260b68f70569923c909b49538aa0df3c1746db1bf,Merge_failed,148760c8997b3984ef4d11295a5433d60df638635f5469b597599080e51dfe1c,Merge_failed,148760c8997b3984ef4d11295a5433d60df638635f5469b597599080e51dfe1c,Merge_failed,fdf27142665aaaf18c5dabe60cfaf4b66ef569ae760a4ea9eba78eab06270679,Merge_failed,244d0e85c65eac8351885939d7efb4faf96d6784194655d6032e5e3408d9a1f3,Merge_failed,99d2103863460e5cf1a4113fa153c9f2f113bcbc3c7a491ce1a497cf586c42ac,Merge_failed,ebd68d30af186839e10fb1c29799683f00a7c5a1f90354376431368d54c81def,Merge_failed,ebd68d30af186839e10fb1c29799683f00a7c5a1f90354376431368d54c81def,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,21b45635b8f292576b725e53ea4b7ea7d856bb5508ce09ca56810d981aaeb962,Merge_failed,6dc1c87a64f0fa4bfb5e152df4c6ac137a6fa4dcc6e1fe5b0e11cc3840105976,0.012881755828857422,0.013143539428710938,0.01459646224975586,0.01443791389465332,0.014513969421386719,0.014598846435546875,0.014631509780883789,0.10987305641174316,0.027887821197509766,0.27013111114501953,0.2700932025909424,0.41577792167663574,2.680182695388794,0.20369434356689453 diff --git a/results/combined/merges_timed/jprante/elasticsearch-csv.csv b/results/combined/merges_timed/jprante/elasticsearch-csv.csv index 1297a6f9e3..f443108428 100644 --- a/results/combined/merges_timed/jprante/elasticsearch-csv.csv +++ b/results/combined/merges_timed/jprante/elasticsearch-csv.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,a9ee7a06511f64b14b8c6dee08fe5f5849907926,f3ac07cb6f993e56be141dee1ee46036b7413b1e,e3eda9922e5f1698c37829530ca39e151c98f76c,,4467b8d3d7eb88bce8a1391a53d70e1fb90d9e258eb03605d7762a7532ded7eb,Tests_passed,2315f7074a9a080560e77d53988006bb2f4ee1755762ab80e883725dff41725d,Tests_passed,True,True,True,True,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,eb89ce52e4aece26af1bf284861f85cb705d3006c974479fd36e82232a45e615,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,9c0a8ae2d08dd41b257e6865aa42461011cbeb83b1ff886c1e822dc2571f6dd3,Merge_failed,9c0a8ae2d08dd41b257e6865aa42461011cbeb83b1ff886c1e822dc2571f6dd3,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Merge_failed,8d57df1dd3367f80aebc1fac9f2b3298e75821471cf1dd91bf9505ee90e90a4d,0.038675785064697266,0.036476850509643555,0.036406517028808594,0.03425908088684082,0.03826618194580078,0.03657817840576172,0.03289532661437988,0.22499799728393555,0.0582425594329834,0.06131482124328613,0.06179618835449219,0.17392182350158691,0.5016427040100098,0.18108129501342773 +1,refs/heads/master,a9ee7a06511f64b14b8c6dee08fe5f5849907926,f3ac07cb6f993e56be141dee1ee46036b7413b1e,e3eda9922e5f1698c37829530ca39e151c98f76c,,4467b8d3d7eb88bce8a1391a53d70e1fb90d9e258eb03605d7762a7532ded7eb,Tests_passed,2315f7074a9a080560e77d53988006bb2f4ee1755762ab80e883725dff41725d,Tests_passed,True,True,True,True,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,eb89ce52e4aece26af1bf284861f85cb705d3006c974479fd36e82232a45e615,Merge_failed,b97184cf92af959864fe71782e428e0c4b6bdb6ef8b04e8badd05981a460bfe7,Merge_failed,9c0a8ae2d08dd41b257e6865aa42461011cbeb83b1ff886c1e822dc2571f6dd3,Merge_failed,9c0a8ae2d08dd41b257e6865aa42461011cbeb83b1ff886c1e822dc2571f6dd3,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Merge_failed,8d57df1dd3367f80aebc1fac9f2b3298e75821471cf1dd91bf9505ee90e90a4d,0.038675785064697266,0.036476850509643555,0.036406517028808594,0.03425908088684082,0.03826618194580078,0.03657817840576172,0.03289532661437988,0.22499799728393555,0.0582425594329834,0.061805009841918945,0.06167793273925781,0.17392182350158691,0.5016427040100098,0.18108129501342773 diff --git a/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv b/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv index 4db3aeeb80..66c3a86394 100644 --- a/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv +++ b/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,284907eaffb2061f44cdc7ec3be5cb05209850c9,1b17ddfa476505081e744f1cb1f78cda70c9ceeb,2a44c1c8135d26511a30a1dab51c8c3d3d60a02d,,True,True,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,db043c9457a77ff6b119ec2cd8fc9c489df94721c82d8d0744fe28c460914676,Tests_passed,True,True,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,d41468b842f272e98d531c973579f559f4e609f03f101eee874e398fb32750af,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,fe370deeedc724b6fef1a1f393da1c67d8b63400bafb49405950b43d9fffc432,Merge_failed,fe370deeedc724b6fef1a1f393da1c67d8b63400bafb49405950b43d9fffc432,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_failed,c05c9f04c5417f13812a69edc98e79983929d051e7b3f305afa98a9dd45eff0c,0.03400158882141113,0.037180423736572266,0.03887605667114258,0.05488181114196777,0.03706693649291992,0.0538640022277832,0.045958757400512695,0.160170316696167,0.07866692543029785,0.08455038070678711,0.08516263961791992,0.11691474914550781,0.9762022495269775,0.2470262050628662 +14,refs/heads/master,284907eaffb2061f44cdc7ec3be5cb05209850c9,1b17ddfa476505081e744f1cb1f78cda70c9ceeb,2a44c1c8135d26511a30a1dab51c8c3d3d60a02d,,True,True,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,db043c9457a77ff6b119ec2cd8fc9c489df94721c82d8d0744fe28c460914676,Tests_passed,True,True,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,d41468b842f272e98d531c973579f559f4e609f03f101eee874e398fb32750af,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,fe370deeedc724b6fef1a1f393da1c67d8b63400bafb49405950b43d9fffc432,Merge_failed,fe370deeedc724b6fef1a1f393da1c67d8b63400bafb49405950b43d9fffc432,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_failed,c05c9f04c5417f13812a69edc98e79983929d051e7b3f305afa98a9dd45eff0c,0.03400158882141113,0.037180423736572266,0.03887605667114258,0.05488181114196777,0.03706693649291992,0.0538640022277832,0.045958757400512695,0.160170316696167,0.07866692543029785,0.08404970169067383,0.08423447608947754,0.11691474914550781,0.9762022495269775,0.2470262050628662 diff --git a/results/combined/merges_timed/jqno/equalsverifier.csv b/results/combined/merges_timed/jqno/equalsverifier.csv index c2594f1abf..eb606b689a 100644 --- a/results/combined/merges_timed/jqno/equalsverifier.csv +++ b/results/combined/merges_timed/jqno/equalsverifier.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -173,refs/heads/main,df016c4c5b205bf4bf04d73a41a0e51adeff84b3,164ae921af8c96fb85642317a081b4c6552e0e75,6d6383193921b3deda63c5c8430b59dcdc6a5f54,,True,True,71c6914be3e3140555433ca2d0acf85270cdb46fe6a7f41df206d87c8ecee5b8,Tests_passed,99921378ea305b2a22258bc89d12a83a2c2984224acc545ec253da48ee250312,Tests_passed,True,True,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,77a46c3a55f273abc1a78abc5a4ff00149026987565e7b55bba8e5d7e72a03a5,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,8c0f9e09ee025f5cd5b23ef423daca01be304f49b17e27a93f5310b10f9b58b7,Merge_failed,8c0f9e09ee025f5cd5b23ef423daca01be304f49b17e27a93f5310b10f9b58b7,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Merge_failed,35d052942a8b7f9aeff2816dba489f7dc082bd4095f374b60f95e41a2dbe9dab,0.04820656776428223,0.04416179656982422,0.04273176193237305,0.0409541130065918,0.0398404598236084,0.049901723861694336,0.04004788398742676,0.2083449363708496,0.07470273971557617,0.06608986854553223,0.08075523376464844,0.13154053688049316,0.4497849941253662,0.28649020195007324 +173,refs/heads/main,df016c4c5b205bf4bf04d73a41a0e51adeff84b3,164ae921af8c96fb85642317a081b4c6552e0e75,6d6383193921b3deda63c5c8430b59dcdc6a5f54,,True,True,71c6914be3e3140555433ca2d0acf85270cdb46fe6a7f41df206d87c8ecee5b8,Tests_passed,99921378ea305b2a22258bc89d12a83a2c2984224acc545ec253da48ee250312,Tests_passed,True,True,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,77a46c3a55f273abc1a78abc5a4ff00149026987565e7b55bba8e5d7e72a03a5,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,8c0f9e09ee025f5cd5b23ef423daca01be304f49b17e27a93f5310b10f9b58b7,Merge_failed,8c0f9e09ee025f5cd5b23ef423daca01be304f49b17e27a93f5310b10f9b58b7,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Merge_failed,35d052942a8b7f9aeff2816dba489f7dc082bd4095f374b60f95e41a2dbe9dab,0.04820656776428223,0.04416179656982422,0.04273176193237305,0.0409541130065918,0.0398404598236084,0.049901723861694336,0.04004788398742676,0.2083449363708496,0.07470273971557617,0.07982230186462402,0.07968711853027344,0.13154053688049316,0.4497849941253662,0.28649020195007324 diff --git a/results/combined/merges_timed/jreijn/spring-comparing-template-engines.csv b/results/combined/merges_timed/jreijn/spring-comparing-template-engines.csv index 29d9b96c3b..c56a566b6b 100644 --- a/results/combined/merges_timed/jreijn/spring-comparing-template-engines.csv +++ b/results/combined/merges_timed/jreijn/spring-comparing-template-engines.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -111,refs/remotes/origin/pull/64,89bd8bbc91c308af280811d25d63e2bfed0d2532,06eb1edc6811e45008478a8e30067f6e81621117,19ddeaa2c9d11e77d34ec03a255d8c3ae5c8697f,,True,True,795512627562890affefee1d5722c1225b1dbe335e8787f4b328e1e61abe56a4,Tests_passed,cef906cd3b5033d6a8e803861d5d6282e3aaa188d35b66b5a3d6cb3de15b9c47,Tests_passed,True,True,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,9ae4c103df4a504509c3f2b4c0249fec3d7e8177b4dde5a470dfc83ee0e92663,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,9ae4c103df4a504509c3f2b4c0249fec3d7e8177b4dde5a470dfc83ee0e92663,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,25e8f3d129ffce7325cda44f210634d6378df4b5db40a20d1a0079e9d986e8d2,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,6dedb4eb078e341256023406038f3574e4f195c23b3017e5a6bbd1ad0453163f,Merge_failed,6dedb4eb078e341256023406038f3574e4f195c23b3017e5a6bbd1ad0453163f,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,c7c0c985c420e2d01590fcac07b00379fee2d05b51cb9b38b69b49593b2a4566,Merge_failed,4d64ef7697294fec60e297873d3ba98d92498e99a63f6eb04ed94b051b015066,0.010405302047729492,0.011107444763183594,0.010685920715332031,0.010344266891479492,0.011071443557739258,0.010680675506591797,0.010993719100952148,0.0959007740020752,0.025992631912231445,0.20554447174072266,0.20519113540649414,0.3494868278503418,1.6301817893981934,0.17839860916137695 +111,refs/remotes/origin/pull/64,89bd8bbc91c308af280811d25d63e2bfed0d2532,06eb1edc6811e45008478a8e30067f6e81621117,19ddeaa2c9d11e77d34ec03a255d8c3ae5c8697f,,True,True,795512627562890affefee1d5722c1225b1dbe335e8787f4b328e1e61abe56a4,Tests_passed,cef906cd3b5033d6a8e803861d5d6282e3aaa188d35b66b5a3d6cb3de15b9c47,Tests_passed,True,True,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,9ae4c103df4a504509c3f2b4c0249fec3d7e8177b4dde5a470dfc83ee0e92663,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,9ae4c103df4a504509c3f2b4c0249fec3d7e8177b4dde5a470dfc83ee0e92663,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,25e8f3d129ffce7325cda44f210634d6378df4b5db40a20d1a0079e9d986e8d2,Merge_failed,cacb5caafeabd96603fa3457cc8e80db651c573825f9134ae0c0b88a57b7baeb,Merge_failed,6dedb4eb078e341256023406038f3574e4f195c23b3017e5a6bbd1ad0453163f,Merge_failed,6dedb4eb078e341256023406038f3574e4f195c23b3017e5a6bbd1ad0453163f,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,c7c0c985c420e2d01590fcac07b00379fee2d05b51cb9b38b69b49593b2a4566,Merge_failed,4d64ef7697294fec60e297873d3ba98d92498e99a63f6eb04ed94b051b015066,0.010405302047729492,0.011107444763183594,0.010685920715332031,0.010344266891479492,0.011071443557739258,0.010680675506591797,0.010993719100952148,0.0959007740020752,0.025992631912231445,0.20548439025878906,0.20514941215515137,0.3494868278503418,1.6301817893981934,0.17839860916137695 diff --git a/results/combined/merges_timed/jri/deepamehta.csv b/results/combined/merges_timed/jri/deepamehta.csv index d38773dfa2..0104d44231 100644 --- a/results/combined/merges_timed/jri/deepamehta.csv +++ b/results/combined/merges_timed/jri/deepamehta.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -146,refs/heads/master,8e1c2670375d00738f024274b7273c52ec05c81b,081caa387b5a62846c86ba006c384b5038d3df2e,6857101de9d5664d8ed44d682a083a6024b4961c,,True,True,e40e9f7721447e8fe18c7966e43127a17de520b10b36b8f779bd3bedf6c93068,Tests_passed,6145db7ebc4f6801ae76498d47ef2990563431fdcadacc6c38b064f02a6627ed,Tests_passed,True,True,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,a328f98308f68a7d7b82214f89e3dcf342d96ef3c611298bd2dac98f9b1fbcf9,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,a328f98308f68a7d7b82214f89e3dcf342d96ef3c611298bd2dac98f9b1fbcf9,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,138847d9f2859546cf7ff5f11f5753c4c5f0f18aa5a51e970f825601c89303d5,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,1ac827c415b3a93b06411eeed28cb578aff9bf599b1a38cf81ce756e65c4fa53,Merge_failed,4c2a7327490f19aed14a03a483028d62b6c24c1ae636c73a76bd1a71a186f666,Merge_failed,9fb5909a659f88b6c40044e51c15cf86d9e3d3c66175d57066f12817aa484003,Merge_failed,c4cc5696333344f15ff74329963f7923afd987edd8a2e76df889871042535964,Merge_failed,25fc0e6ceb7bc80a63a6483e739bc7a8d3c8037fd2bb52070304c1afc6e0dc96,0.04775428771972656,0.05586743354797363,0.06080126762390137,0.03938150405883789,0.04080510139465332,0.0436406135559082,0.0660088062286377,0.5792105197906494,0.07197284698486328,0.3603782653808594,0.36594581604003906,0.4381988048553467,2.4923312664031982,0.2787008285522461 +146,refs/heads/master,8e1c2670375d00738f024274b7273c52ec05c81b,081caa387b5a62846c86ba006c384b5038d3df2e,6857101de9d5664d8ed44d682a083a6024b4961c,,True,True,e40e9f7721447e8fe18c7966e43127a17de520b10b36b8f779bd3bedf6c93068,Tests_passed,6145db7ebc4f6801ae76498d47ef2990563431fdcadacc6c38b064f02a6627ed,Tests_passed,True,True,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,a328f98308f68a7d7b82214f89e3dcf342d96ef3c611298bd2dac98f9b1fbcf9,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,a328f98308f68a7d7b82214f89e3dcf342d96ef3c611298bd2dac98f9b1fbcf9,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,138847d9f2859546cf7ff5f11f5753c4c5f0f18aa5a51e970f825601c89303d5,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,1ac827c415b3a93b06411eeed28cb578aff9bf599b1a38cf81ce756e65c4fa53,Merge_failed,4c2a7327490f19aed14a03a483028d62b6c24c1ae636c73a76bd1a71a186f666,Merge_failed,9fb5909a659f88b6c40044e51c15cf86d9e3d3c66175d57066f12817aa484003,Merge_failed,c4cc5696333344f15ff74329963f7923afd987edd8a2e76df889871042535964,Merge_failed,25fc0e6ceb7bc80a63a6483e739bc7a8d3c8037fd2bb52070304c1afc6e0dc96,0.04775428771972656,0.05586743354797363,0.06080126762390137,0.03938150405883789,0.04080510139465332,0.0436406135559082,0.0660088062286377,0.5792105197906494,0.07197284698486328,0.35309720039367676,0.36437535285949707,0.4381988048553467,2.4923312664031982,0.2787008285522461 diff --git a/results/combined/merges_timed/jruby/bytelist.csv b/results/combined/merges_timed/jruby/bytelist.csv index 4186695268..d39bae825f 100644 --- a/results/combined/merges_timed/jruby/bytelist.csv +++ b/results/combined/merges_timed/jruby/bytelist.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,989a36efd082324597ae190e1be02e9c837967e3,df4f174f506935be80d1bc15c984ab09d011e6cd,eaf546b696f5fb1a31584305e7da2e9a9b683bf4,,a1fd5a0ff5ccbf1339ab26a2440bec50e0e8fd8aeaf96159f9af84ac9198b135,Tests_passed,402174b94029655e07ba85f2ddd4c625384a6025571a187bb2482b128b02ab0d,Tests_passed,True,True,True,True,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,0.04558539390563965,0.05162453651428223,0.05025839805603027,0.04525876045227051,0.052640676498413086,0.017968416213989258,0.017399072647094727,0.23881816864013672,0.04531717300415039,0.3358473777770996,0.33963561058044434,0.16987347602844238,2.4577646255493164,0.1811840534210205 +7,refs/heads/master,989a36efd082324597ae190e1be02e9c837967e3,df4f174f506935be80d1bc15c984ab09d011e6cd,eaf546b696f5fb1a31584305e7da2e9a9b683bf4,,a1fd5a0ff5ccbf1339ab26a2440bec50e0e8fd8aeaf96159f9af84ac9198b135,Tests_passed,402174b94029655e07ba85f2ddd4c625384a6025571a187bb2482b128b02ab0d,Tests_passed,True,True,True,True,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,0.04558539390563965,0.05162453651428223,0.05025839805603027,0.04525876045227051,0.052640676498413086,0.017968416213989258,0.017399072647094727,0.23881816864013672,0.04531717300415039,0.334383487701416,0.3333418369293213,0.16987347602844238,2.4577646255493164,0.1811840534210205 diff --git a/results/combined/merges_timed/jruby/jruby-parser.csv b/results/combined/merges_timed/jruby/jruby-parser.csv index f4471b0363..9bbfd772c0 100644 --- a/results/combined/merges_timed/jruby/jruby-parser.csv +++ b/results/combined/merges_timed/jruby/jruby-parser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,e6dae92cd4c87841431cbdfeffa34a4e05f3a2d9,d4c91601649b26088348218596017088bd8f2c5e,9a27caa9a5e5d5075b0559e2b91a138dfcd941f9,,846f17401eeb20b1d6f452673bf0951d791de9a16c7202ba3162259b93bb2b54,Tests_passed,eefd921b5a64084a7e2d5a003b87067fc7a1f9824536e01ff83ae4b6e487ee4d,Tests_passed,True,True,True,True,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,9ecf08fc82252653f585599969c047199e75f0c030eb839c9b6633b80ef6d474,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,210c12acc31a1795681bc24c8b9159eea168c97ca5aaaa9a00a9ed7f917e8fca,Merge_failed,37f57176caa9450076256f068e355466e9adb3033e6bae2174ddd0d0243326cd,Merge_failed,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,d658300fc7b58bdf1d633c5cdedaf15f02cd1bf830d2de170ef9ee3dd59a8c05,Merge_failed,91c0dbecd0ed90cec97b9dc113b377145e48dba8998df2d88a69e7fb245aadaf,0.03134274482727051,0.020692825317382812,0.0355219841003418,0.020848751068115234,0.03538823127746582,0.02114105224609375,0.03534054756164551,0.09032940864562988,0.03691673278808594,0.3005974292755127,0.26457667350769043,0.20423102378845215,2.8125481605529785,0.2504692077636719 +7,refs/heads/master,e6dae92cd4c87841431cbdfeffa34a4e05f3a2d9,d4c91601649b26088348218596017088bd8f2c5e,9a27caa9a5e5d5075b0559e2b91a138dfcd941f9,,846f17401eeb20b1d6f452673bf0951d791de9a16c7202ba3162259b93bb2b54,Tests_passed,eefd921b5a64084a7e2d5a003b87067fc7a1f9824536e01ff83ae4b6e487ee4d,Tests_passed,True,True,True,True,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,9ecf08fc82252653f585599969c047199e75f0c030eb839c9b6633b80ef6d474,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,210c12acc31a1795681bc24c8b9159eea168c97ca5aaaa9a00a9ed7f917e8fca,Merge_failed,37f57176caa9450076256f068e355466e9adb3033e6bae2174ddd0d0243326cd,Merge_failed,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,d658300fc7b58bdf1d633c5cdedaf15f02cd1bf830d2de170ef9ee3dd59a8c05,Merge_failed,91c0dbecd0ed90cec97b9dc113b377145e48dba8998df2d88a69e7fb245aadaf,0.03134274482727051,0.020692825317382812,0.0355219841003418,0.020848751068115234,0.03538823127746582,0.02114105224609375,0.03534054756164551,0.09032940864562988,0.03691673278808594,0.24324893951416016,0.24845075607299805,0.20423102378845215,2.8125481605529785,0.2504692077636719 diff --git a/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv b/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv index 28d0554d18..31e8273200 100644 --- a/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv +++ b/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,7aff5753c70fc8c52cdc949c2a2712dd90bdc30c,c57810b5c2d6e64a483f71582aa75ebbdc808ee7,a30776ffccfaeae3ea3e92cd1e85b030304a4b89,,True,True,65eeae439dd016b1e096416d37fef772dd9363c89b646b61dfc70ecf31a6f429,Tests_passed,0e646ce98ce0f8d059d21cb0609a0324e76acf1cfc0cf1fe5538d6dd47849ab9,Tests_passed,True,True,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,71f500592d2b0a929b651e826f89c8af3080cd4a54052ef183d232eab1fa45d1,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,a5c98b3089d9490f8af9cad9f7422e41174042c893350d91fd0dff4155ce9b12,Merge_failed,a5c98b3089d9490f8af9cad9f7422e41174042c893350d91fd0dff4155ce9b12,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Merge_failed,9177ffec70461143cc15d67ad9506ea6c24552b22411350d06ae5c521038d8a5,0.04422640800476074,0.009732961654663086,0.04170942306518555,0.04268765449523926,0.042290687561035156,0.04277753829956055,0.04006481170654297,0.4219505786895752,0.10155844688415527,0.6339657306671143,0.6071827411651611,0.3519744873046875,3.425719976425171,0.1849815845489502 +1,refs/heads/master,7aff5753c70fc8c52cdc949c2a2712dd90bdc30c,c57810b5c2d6e64a483f71582aa75ebbdc808ee7,a30776ffccfaeae3ea3e92cd1e85b030304a4b89,,True,True,65eeae439dd016b1e096416d37fef772dd9363c89b646b61dfc70ecf31a6f429,Tests_passed,0e646ce98ce0f8d059d21cb0609a0324e76acf1cfc0cf1fe5538d6dd47849ab9,Tests_passed,True,True,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,71f500592d2b0a929b651e826f89c8af3080cd4a54052ef183d232eab1fa45d1,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,a5c98b3089d9490f8af9cad9f7422e41174042c893350d91fd0dff4155ce9b12,Merge_failed,a5c98b3089d9490f8af9cad9f7422e41174042c893350d91fd0dff4155ce9b12,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Merge_failed,9177ffec70461143cc15d67ad9506ea6c24552b22411350d06ae5c521038d8a5,0.04422640800476074,0.009732961654663086,0.04170942306518555,0.04268765449523926,0.042290687561035156,0.04277753829956055,0.04006481170654297,0.4219505786895752,0.10155844688415527,0.612166166305542,0.6201138496398926,0.3519744873046875,3.425719976425171,0.1849815845489502 diff --git a/results/combined/merges_timed/jsevellec/cassandra-unit.csv b/results/combined/merges_timed/jsevellec/cassandra-unit.csv index 49832ff561..5b559ec8fe 100644 --- a/results/combined/merges_timed/jsevellec/cassandra-unit.csv +++ b/results/combined/merges_timed/jsevellec/cassandra-unit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,4e87b46fe206e0acf5cdbd1e8c396be97410a5e4,21dc8a443a78021e0f1afebd4712cfed6ed3fce0,5ffd14659e8a2eee622f785997e0d00f7d7e318f,,True,True,cbf4ccd08becc192d1154c54b7cb6f4e2e21b3afa66d6516f70dd17608f8c506,Tests_passed,60609d824ecb7c1930d6b261a2aff92dddd323a9c89ea03134b55fec87066322,Tests_passed,True,True,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,f381288195375b9788d2eec4b2401679abe69d930c72bd8b56b299ce7ff56901,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,026e4f9767192c88a59bd50585d5ddafcfba2b5d2170349b18a3f5ec815a49b9,Merge_failed,026e4f9767192c88a59bd50585d5ddafcfba2b5d2170349b18a3f5ec815a49b9,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Merge_failed,c521891a1508b867f9e56b8dc6c8a5431cb792d04bee39b15ecbdb821716e282,0.01556849479675293,0.015508890151977539,0.016070842742919922,0.016599655151367188,0.01655101776123047,0.016603946685791016,0.016771554946899414,0.056877851486206055,0.02388739585876465,0.1465907096862793,0.14015769958496094,0.13570380210876465,1.480252742767334,0.19807195663452148 +24,refs/heads/master,4e87b46fe206e0acf5cdbd1e8c396be97410a5e4,21dc8a443a78021e0f1afebd4712cfed6ed3fce0,5ffd14659e8a2eee622f785997e0d00f7d7e318f,,True,True,cbf4ccd08becc192d1154c54b7cb6f4e2e21b3afa66d6516f70dd17608f8c506,Tests_passed,60609d824ecb7c1930d6b261a2aff92dddd323a9c89ea03134b55fec87066322,Tests_passed,True,True,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,f381288195375b9788d2eec4b2401679abe69d930c72bd8b56b299ce7ff56901,Merge_failed,21d8257f9d31e8d3b9bfb36eac27a15905b5ddf77e5c6719274ad6e4559a7ed6,Merge_failed,026e4f9767192c88a59bd50585d5ddafcfba2b5d2170349b18a3f5ec815a49b9,Merge_failed,026e4f9767192c88a59bd50585d5ddafcfba2b5d2170349b18a3f5ec815a49b9,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Merge_failed,c521891a1508b867f9e56b8dc6c8a5431cb792d04bee39b15ecbdb821716e282,0.01556849479675293,0.015508890151977539,0.016070842742919922,0.016599655151367188,0.01655101776123047,0.016603946685791016,0.016771554946899414,0.056877851486206055,0.02388739585876465,0.14031577110290527,0.14223051071166992,0.13570380210876465,1.480252742767334,0.19807195663452148 diff --git a/results/combined/merges_timed/jsimone/webapp-runner.csv b/results/combined/merges_timed/jsimone/webapp-runner.csv index 8a9c6ff12a..8ebbfd89c5 100644 --- a/results/combined/merges_timed/jsimone/webapp-runner.csv +++ b/results/combined/merges_timed/jsimone/webapp-runner.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -120,refs/remotes/origin/pull/231,42bbf1f732331ba7731f6916a307666cef6855b6,0d080041b57c0e9bcf13c4b62291f32390fcf3e1,d9b047d5fb94f24dbefaebb8e79f5deb50fbf87c,,True,True,932d81d4482640dffe55460c32a434e9013a6d06dac447c426d575a40651e895,Tests_passed,0bcc2ec94937f427a6e88bdd758610d739c7a97898281593e3fd25d940c7b668,Tests_passed,True,True,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,0.010222196578979492,0.01038503646850586,0.01084446907043457,0.01065206527709961,0.010523796081542969,0.010411500930786133,0.010351419448852539,0.0345308780670166,0.009749650955200195,0.14780426025390625,0.14818596839904785,0.06463837623596191,0.6002953052520752,0.16103649139404297 +120,refs/remotes/origin/pull/231,42bbf1f732331ba7731f6916a307666cef6855b6,0d080041b57c0e9bcf13c4b62291f32390fcf3e1,d9b047d5fb94f24dbefaebb8e79f5deb50fbf87c,,True,True,932d81d4482640dffe55460c32a434e9013a6d06dac447c426d575a40651e895,Tests_passed,0bcc2ec94937f427a6e88bdd758610d739c7a97898281593e3fd25d940c7b668,Tests_passed,True,True,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,0.010222196578979492,0.01038503646850586,0.01084446907043457,0.01065206527709961,0.010523796081542969,0.010411500930786133,0.010351419448852539,0.0345308780670166,0.009749650955200195,0.14670825004577637,0.14700889587402344,0.06463837623596191,0.6002953052520752,0.16103649139404297 diff --git a/results/combined/merges_timed/jsprit/jsprit.csv b/results/combined/merges_timed/jsprit/jsprit.csv index 0b6620a7fa..9f53d46109 100644 --- a/results/combined/merges_timed/jsprit/jsprit.csv +++ b/results/combined/merges_timed/jsprit/jsprit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -197,refs/heads/master,b37ab653e14739da40750049dc273e58dc19214b,1563610bb01dc5bb2df8d3e6ab0d58042c83a459,e8d3bd03ea9bb5464c7a2fecb6cd634994216861,,15d346de70e16c72312acb27a84f0a81ffe8dd5d066f08bcfdcdb890b981f2aa,Tests_passed,493f96a63746e68da33e93521ace9eea7ed25c1808b608a7a2657d42cc83e810,Tests_passed,True,True,True,True,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,d17a80a2596c4e3a1793d634dc5ced71437b6f6c2a432d84f072bae0f74722e7,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,0.012320518493652344,0.013096332550048828,0.012836933135986328,0.013158798217773438,0.01344442367553711,0.013296127319335938,0.012860774993896484,0.05891251564025879,0.011958599090576172,0.1851499080657959,0.18411850929260254,0.06827139854431152,1.3614187240600586,0.2466127872467041 +197,refs/heads/master,b37ab653e14739da40750049dc273e58dc19214b,1563610bb01dc5bb2df8d3e6ab0d58042c83a459,e8d3bd03ea9bb5464c7a2fecb6cd634994216861,,15d346de70e16c72312acb27a84f0a81ffe8dd5d066f08bcfdcdb890b981f2aa,Tests_passed,493f96a63746e68da33e93521ace9eea7ed25c1808b608a7a2657d42cc83e810,Tests_passed,True,True,True,True,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,d17a80a2596c4e3a1793d634dc5ced71437b6f6c2a432d84f072bae0f74722e7,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,0.012320518493652344,0.013096332550048828,0.012836933135986328,0.013158798217773438,0.01344442367553711,0.013296127319335938,0.012860774993896484,0.05891251564025879,0.011958599090576172,0.21570944786071777,0.18158912658691406,0.06827139854431152,1.3614187240600586,0.2466127872467041 diff --git a/results/combined/merges_timed/jtablesaw/tablesaw.csv b/results/combined/merges_timed/jtablesaw/tablesaw.csv index 151aed57ab..fcbc660f3d 100644 --- a/results/combined/merges_timed/jtablesaw/tablesaw.csv +++ b/results/combined/merges_timed/jtablesaw/tablesaw.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,Tests_passed,True,True,True,True,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,e71ab0b0cd1205338e1c0b3f892be18db428cb5bd54cb32a3be5042f210d8b0d,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,0.047406911849975586,0.04673051834106445,0.059993743896484375,0.04569530487060547,0.05324506759643555,0.041567325592041016,0.046312570571899414,0.28206706047058105,0.12215828895568848,0.08227348327636719,0.08185386657714844,0.18375468254089355,1.5412635803222656,0.4355466365814209 +1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,Tests_passed,True,True,True,True,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,e71ab0b0cd1205338e1c0b3f892be18db428cb5bd54cb32a3be5042f210d8b0d,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,0.047406911849975586,0.04673051834106445,0.059993743896484375,0.04569530487060547,0.05324506759643555,0.041567325592041016,0.046312570571899414,0.28206706047058105,0.12215828895568848,0.08300328254699707,0.08201885223388672,0.18375468254089355,1.5412635803222656,0.4355466365814209 diff --git a/results/combined/merges_timed/julianhyde/linq4j.csv b/results/combined/merges_timed/julianhyde/linq4j.csv index 0a8c23948e..b41b4d50a8 100644 --- a/results/combined/merges_timed/julianhyde/linq4j.csv +++ b/results/combined/merges_timed/julianhyde/linq4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/remotes/origin/pull/26,1f0e4d05f133cbc901e299ae795a86ed47f2425e,a73878006c809f7313e7767d24de9c6cc5ad3102,bd8899bc2485e6fb666ec9bf23c892898e523e2d,,0b0419eceb563e5df39abfbdfb2c43c7855b8079fb926f52359bea37803eb7cd,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,True,True,True,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,0.038027286529541016,0.04677748680114746,0.04836750030517578,0.02844548225402832,0.02777886390686035,0.031162500381469727,0.028319358825683594,0.058786630630493164,0.016316890716552734,0.20682382583618164,0.207658052444458,0.07910275459289551,0.02991199493408203,0.18669891357421875 +13,refs/remotes/origin/pull/26,1f0e4d05f133cbc901e299ae795a86ed47f2425e,a73878006c809f7313e7767d24de9c6cc5ad3102,bd8899bc2485e6fb666ec9bf23c892898e523e2d,,0b0419eceb563e5df39abfbdfb2c43c7855b8079fb926f52359bea37803eb7cd,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,True,True,True,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,0.038027286529541016,0.04677748680114746,0.04836750030517578,0.02844548225402832,0.02777886390686035,0.031162500381469727,0.028319358825683594,0.058786630630493164,0.016316890716552734,0.2011575698852539,0.20582985877990723,0.07910275459289551,0.02991199493408203,0.18669891357421875 diff --git a/results/combined/merges_timed/julianhyde/sqlline.csv b/results/combined/merges_timed/julianhyde/sqlline.csv index 45e02fb05c..2bdcf0f1bb 100644 --- a/results/combined/merges_timed/julianhyde/sqlline.csv +++ b/results/combined/merges_timed/julianhyde/sqlline.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/main,e9e0b9762242feacadca1c39e4d933b69ff39431,9ba222142dfd5bbbf5b051e69f6bc8a779b66d39,52d0509ec2f68c2bef42e4241cd43075dc95e900,,True,True,a7360af2df7f3c7706cbaa67897145f1aefa1f30b3ad36854cbdce95b4b1b4f9,Tests_passed,4cda574ad110b9c9eeaf097ac7c28d131488af3fd1cd2243f5a85c759eac682d,Tests_passed,True,True,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,9ec3bf910c662c0a96f988d4af83ae518d1963f5f2d50d5306385d376e535071,Tests_passed,9ec3bf910c662c0a96f988d4af83ae518d1963f5f2d50d5306385d376e535071,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,4f56feabd78e75da036fb2346ed3bee55964675e115d8632924295653a67de8a,Merge_failed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,0.05740642547607422,0.054050445556640625,0.04953336715698242,0.05985116958618164,0.06862950325012207,0.04510927200317383,0.05371665954589844,0.3268303871154785,0.04682779312133789,0.3915688991546631,0.3881962299346924,0.2314438819885254,5.872184991836548,0.24831128120422363 +8,refs/heads/main,e9e0b9762242feacadca1c39e4d933b69ff39431,9ba222142dfd5bbbf5b051e69f6bc8a779b66d39,52d0509ec2f68c2bef42e4241cd43075dc95e900,,True,True,a7360af2df7f3c7706cbaa67897145f1aefa1f30b3ad36854cbdce95b4b1b4f9,Tests_passed,4cda574ad110b9c9eeaf097ac7c28d131488af3fd1cd2243f5a85c759eac682d,Tests_passed,True,True,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,9ec3bf910c662c0a96f988d4af83ae518d1963f5f2d50d5306385d376e535071,Tests_passed,9ec3bf910c662c0a96f988d4af83ae518d1963f5f2d50d5306385d376e535071,Tests_passed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,Tests_passed,4f56feabd78e75da036fb2346ed3bee55964675e115d8632924295653a67de8a,Merge_failed,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,0.05740642547607422,0.054050445556640625,0.04953336715698242,0.05985116958618164,0.06862950325012207,0.04510927200317383,0.05371665954589844,0.3268303871154785,0.04682779312133789,0.38256359100341797,0.38451337814331055,0.2314438819885254,5.872184991836548,0.24831128120422363 diff --git a/results/combined/merges_timed/julietkilo/canbabel.csv b/results/combined/merges_timed/julietkilo/canbabel.csv index 509be343dd..2d67573aee 100644 --- a/results/combined/merges_timed/julietkilo/canbabel.csv +++ b/results/combined/merges_timed/julietkilo/canbabel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,a2e8646cdce41a58d12879911e6ea6a836dfe7dd,c83fd7d51d708756fcad1c9f80b1cc9546d89a9d,e18507fe9f70894cfd25ee4a4f71fbd6b94a3e4e,,cd40bf207daab30f267b0725bb715567c796ae040fdee3260ad0c97f9e719f12,Tests_passed,c0e502b69441fc741592da3227fbeafebfdb0f0b67a064ff4104aa7bb2ec2b64,Tests_passed,True,True,True,True,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Merge_failed,3a6a2392fd3eeb1fa5a6c103aa1231511cee0546efc930f4e62411ec97ec7917,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Tests_failed,56e3d44e925b6b5fd5b9aad62a2033133630653f7fb628a53fdb0bcacf6d61b8,Tests_failed,56e3d44e925b6b5fd5b9aad62a2033133630653f7fb628a53fdb0bcacf6d61b8,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,ea991f55ba8102f24fa1b50be19ee86e1be259510bbd5d9c5a7b552e6828b4b3,0.03681063652038574,0.05355405807495117,0.03107619285583496,0.050905704498291016,0.03315472602844238,0.03805351257324219,0.046813011169433594,0.142195463180542,0.0661168098449707,0.17308282852172852,0.1730201244354248,0.12589597702026367,1.6158621311187744,0.1813819408416748 +2,refs/heads/master,a2e8646cdce41a58d12879911e6ea6a836dfe7dd,c83fd7d51d708756fcad1c9f80b1cc9546d89a9d,e18507fe9f70894cfd25ee4a4f71fbd6b94a3e4e,,cd40bf207daab30f267b0725bb715567c796ae040fdee3260ad0c97f9e719f12,Tests_passed,c0e502b69441fc741592da3227fbeafebfdb0f0b67a064ff4104aa7bb2ec2b64,Tests_passed,True,True,True,True,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Merge_failed,3a6a2392fd3eeb1fa5a6c103aa1231511cee0546efc930f4e62411ec97ec7917,Merge_failed,58d054391d2454f06b89e77e11e85c8e739d746b26678fc980e55a0975c202a9,Tests_failed,56e3d44e925b6b5fd5b9aad62a2033133630653f7fb628a53fdb0bcacf6d61b8,Tests_failed,56e3d44e925b6b5fd5b9aad62a2033133630653f7fb628a53fdb0bcacf6d61b8,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,ea991f55ba8102f24fa1b50be19ee86e1be259510bbd5d9c5a7b552e6828b4b3,0.03681063652038574,0.05355405807495117,0.03107619285583496,0.050905704498291016,0.03315472602844238,0.03805351257324219,0.046813011169433594,0.142195463180542,0.0661168098449707,0.1710972785949707,0.17078900337219238,0.12589597702026367,1.6158621311187744,0.1813819408416748 diff --git a/results/combined/merges_timed/juniper/netconf-java.csv b/results/combined/merges_timed/juniper/netconf-java.csv index d086e0436f..6d8442d6a6 100644 --- a/results/combined/merges_timed/juniper/netconf-java.csv +++ b/results/combined/merges_timed/juniper/netconf-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,5720d527507c33e5fede2e542dc3d892eb780b5d,0e040c0dd0dde2bc26652a774d965e515f83ff08,ce3d27ffc4c1ad65dae9805d471e1af785361e6a,,2357e7e485918b27fd314cf0c1b36bffbb75b2c7a987a2c8e11a6ae0d59d1409,Tests_passed,44ddf35bea8f92693dd7c85b73685001755c0815a964b89dd7faa7a1bb424291,Tests_passed,True,True,True,True,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,1ef88d9553f889ceb6e3f7eee2bebafe2ca69cc93e3dc68d1991750367a570d9,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,1ef88d9553f889ceb6e3f7eee2bebafe2ca69cc93e3dc68d1991750367a570d9,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,8a205298b3903a38dfb96a93cb77444535838013fe92461e43bd21eac2ff4069,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,d30febcecbc6d25ed3727242e87b771fcebefb4e93a11bcd0df4196cdd5282cb,Merge_failed,40503d7f3786cd4bd26558a61dff0e4e65db7b98203089cdf265158397653a88,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,9e03107636458ee4f883af10d169404b3da58853a5102231da0bcf9ad01fb294,Merge_failed,24340c82ffb0826329c89e1d9b9d1cfdcdddb51e1f847d5c92f57a930fd79e00,0.044814109802246094,0.0532529354095459,0.0481724739074707,0.04156160354614258,0.02827596664428711,0.048272132873535156,0.042092323303222656,0.41298985481262207,0.09795141220092773,0.3169422149658203,0.31603527069091797,0.36112213134765625,1.79482102394104,0.22389650344848633 +1,refs/heads/master,5720d527507c33e5fede2e542dc3d892eb780b5d,0e040c0dd0dde2bc26652a774d965e515f83ff08,ce3d27ffc4c1ad65dae9805d471e1af785361e6a,,2357e7e485918b27fd314cf0c1b36bffbb75b2c7a987a2c8e11a6ae0d59d1409,Tests_passed,44ddf35bea8f92693dd7c85b73685001755c0815a964b89dd7faa7a1bb424291,Tests_passed,True,True,True,True,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,1ef88d9553f889ceb6e3f7eee2bebafe2ca69cc93e3dc68d1991750367a570d9,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,1ef88d9553f889ceb6e3f7eee2bebafe2ca69cc93e3dc68d1991750367a570d9,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,8a205298b3903a38dfb96a93cb77444535838013fe92461e43bd21eac2ff4069,Merge_failed,471d8769245782a39d4b4b1ce6db9b5fecb8f3790a4e220c53f4e55c465b501a,Merge_failed,d30febcecbc6d25ed3727242e87b771fcebefb4e93a11bcd0df4196cdd5282cb,Merge_failed,40503d7f3786cd4bd26558a61dff0e4e65db7b98203089cdf265158397653a88,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,9e03107636458ee4f883af10d169404b3da58853a5102231da0bcf9ad01fb294,Merge_failed,24340c82ffb0826329c89e1d9b9d1cfdcdddb51e1f847d5c92f57a930fd79e00,0.044814109802246094,0.0532529354095459,0.0481724739074707,0.04156160354614258,0.02827596664428711,0.048272132873535156,0.042092323303222656,0.41298985481262207,0.09795141220092773,0.31206774711608887,0.3150618076324463,0.36112213134765625,1.79482102394104,0.22389650344848633 diff --git a/results/combined/merges_timed/junit-team/junit.csv b/results/combined/merges_timed/junit-team/junit.csv index d03caa3347..7596a5b700 100644 --- a/results/combined/merges_timed/junit-team/junit.csv +++ b/results/combined/merges_timed/junit-team/junit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/main,f5dda835d2a3ace89fe1d12e2e769cf1cfad198a,0038617a0a6c70c712cf30b90c849db518f3715f,eb75886b2be7edf709441962bf3272e4319823c5,,c3668db25c6ad2f55226e09d6c2fd65dd9cc7642ae6edf655391bdf505dd9579,Tests_passed,819381e8934e7a5fdf026f5bd003bb88d7ee4d47e2d78e6524ac8894f1e32ad1,Tests_passed,True,True,True,True,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,0.021502017974853516,0.032659292221069336,0.027190685272216797,0.044492483139038086,0.026671409606933594,0.04411482810974121,0.02713179588317871,0.07972455024719238,0.022201061248779297,0.1765766143798828,0.16930270195007324,0.08781552314758301,0.03519558906555176,0.4108083248138428 +10,refs/heads/main,f5dda835d2a3ace89fe1d12e2e769cf1cfad198a,0038617a0a6c70c712cf30b90c849db518f3715f,eb75886b2be7edf709441962bf3272e4319823c5,,c3668db25c6ad2f55226e09d6c2fd65dd9cc7642ae6edf655391bdf505dd9579,Tests_passed,819381e8934e7a5fdf026f5bd003bb88d7ee4d47e2d78e6524ac8894f1e32ad1,Tests_passed,True,True,True,True,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,0.021502017974853516,0.032659292221069336,0.027190685272216797,0.044492483139038086,0.026671409606933594,0.04411482810974121,0.02713179588317871,0.07972455024719238,0.022201061248779297,0.16430926322937012,0.1643059253692627,0.08781552314758301,0.03519558906555176,0.4108083248138428 diff --git a/results/combined/merges_timed/junit-team/junit4.csv b/results/combined/merges_timed/junit-team/junit4.csv index ea0aa442e1..7b705d7c71 100644 --- a/results/combined/merges_timed/junit-team/junit4.csv +++ b/results/combined/merges_timed/junit-team/junit4.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -420,refs/remotes/origin/pull/1130,6e38776326e9a68beb47e8ea491eef4761be511f,8390bc7383758ba04c35477b8bff540d9a2880ca,c85c6147ada5ad1afdd3be10769670d309730132,,True,True,d3d2adef032447722ac12f07f92c3767ca561adb93c61d0211416357a9400b32,Tests_passed,2825855b413abffc23aefafbd4c1d047e7b3034d6513be71af4cd6168acf35e3,Tests_passed,True,True,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,580f0af905537304534237c259d7a9430e823490d63c21b57f497035286a86c2,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,4b82f3e0c95fa0a4e66e1b8ca0214ae0c9299f16cb2a61090fdbf34bae6a8113,Merge_failed,4b82f3e0c95fa0a4e66e1b8ca0214ae0c9299f16cb2a61090fdbf34bae6a8113,Merge_failed,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,0.04582786560058594,0.05977988243103027,0.05821967124938965,0.0646817684173584,0.058869361877441406,0.0662686824798584,0.06243443489074707,0.41800689697265625,0.09454846382141113,0.6368873119354248,0.6298058032989502,0.3407559394836426,0.05164170265197754,0.5256710052490234 +420,refs/remotes/origin/pull/1130,6e38776326e9a68beb47e8ea491eef4761be511f,8390bc7383758ba04c35477b8bff540d9a2880ca,c85c6147ada5ad1afdd3be10769670d309730132,,True,True,d3d2adef032447722ac12f07f92c3767ca561adb93c61d0211416357a9400b32,Tests_passed,2825855b413abffc23aefafbd4c1d047e7b3034d6513be71af4cd6168acf35e3,Tests_passed,True,True,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,580f0af905537304534237c259d7a9430e823490d63c21b57f497035286a86c2,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,4b82f3e0c95fa0a4e66e1b8ca0214ae0c9299f16cb2a61090fdbf34bae6a8113,Merge_failed,4b82f3e0c95fa0a4e66e1b8ca0214ae0c9299f16cb2a61090fdbf34bae6a8113,Merge_failed,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,0.04582786560058594,0.05977988243103027,0.05821967124938965,0.0646817684173584,0.058869361877441406,0.0662686824798584,0.06243443489074707,0.41800689697265625,0.09454846382141113,0.6146814823150635,0.6285340785980225,0.3407559394836426,0.05164170265197754,0.5256710052490234 diff --git a/results/combined/merges_timed/jutzig/github-release-plugin.csv b/results/combined/merges_timed/jutzig/github-release-plugin.csv index 8c3c1914e6..5c4b416e86 100644 --- a/results/combined/merges_timed/jutzig/github-release-plugin.csv +++ b/results/combined/merges_timed/jutzig/github-release-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,e68bccd8f307a6abd453e6de7be20c006516a3f4,8293177f3f8591785bf72e75cd78cfe38c84b8e4,b1a086f4016d3c53737122237c5def5c8982d518,,b689f7ad5a0f965a97609704c06c2f1c7fe3e819716ddac4adc7f190041a3e86,Tests_passed,5a68158ee371555777cb33529794e2d724df9113d1584bd5b13540daea9160e7,Tests_passed,True,True,True,True,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,412378b3a6e0efd568609860297a1daa39a97381e7ffc0cea8f770400b3e7bef,Tests_passed,412378b3a6e0efd568609860297a1daa39a97381e7ffc0cea8f770400b3e7bef,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,0.04489016532897949,0.04491686820983887,0.04454350471496582,0.03685283660888672,0.04581022262573242,0.04670882225036621,0.04024147987365723,0.1550288200378418,0.04594111442565918,0.1636672019958496,0.1642141342163086,0.10662531852722168,0.9208190441131592,0.18383336067199707 +2,refs/heads/master,e68bccd8f307a6abd453e6de7be20c006516a3f4,8293177f3f8591785bf72e75cd78cfe38c84b8e4,b1a086f4016d3c53737122237c5def5c8982d518,,b689f7ad5a0f965a97609704c06c2f1c7fe3e819716ddac4adc7f190041a3e86,Tests_passed,5a68158ee371555777cb33529794e2d724df9113d1584bd5b13540daea9160e7,Tests_passed,True,True,True,True,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,412378b3a6e0efd568609860297a1daa39a97381e7ffc0cea8f770400b3e7bef,Tests_passed,412378b3a6e0efd568609860297a1daa39a97381e7ffc0cea8f770400b3e7bef,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,0.04489016532897949,0.04491686820983887,0.04454350471496582,0.03685283660888672,0.04581022262573242,0.04670882225036621,0.04024147987365723,0.1550288200378418,0.04594111442565918,0.16126155853271484,0.16439437866210938,0.10662531852722168,0.9208190441131592,0.18383336067199707 diff --git a/results/combined/merges_timed/jvirtanen/nassau.csv b/results/combined/merges_timed/jvirtanen/nassau.csv index 66fdae484f..63fd716fe5 100644 --- a/results/combined/merges_timed/jvirtanen/nassau.csv +++ b/results/combined/merges_timed/jvirtanen/nassau.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -97,refs/heads/main,77574c064155c1f9245f5dda74c0531bedc81c9e,622becedb08bc5254885f3738ca1914afee77fb6,741fae1ea49f571984a43ba789d66ba24995834d,,True,True,d53abedc98a5c4cb6acea97901c01ede9ec78765668036290e705297b0d98326,Tests_passed,c8a5f4251ebbf76c089fd51678952e14f8df02fb5045e980e3738b14cc8557fa,Tests_passed,True,True,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,0.011818885803222656,0.04788398742675781,0.013486146926879883,0.03867053985595703,0.04151511192321777,0.04494619369506836,0.046680450439453125,0.17043089866638184,0.04119110107421875,0.16136384010314941,0.15838313102722168,0.10784029960632324,0.8042066097259521,0.21774816513061523 +97,refs/heads/main,77574c064155c1f9245f5dda74c0531bedc81c9e,622becedb08bc5254885f3738ca1914afee77fb6,741fae1ea49f571984a43ba789d66ba24995834d,,True,True,d53abedc98a5c4cb6acea97901c01ede9ec78765668036290e705297b0d98326,Tests_passed,c8a5f4251ebbf76c089fd51678952e14f8df02fb5045e980e3738b14cc8557fa,Tests_passed,True,True,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,0.011818885803222656,0.04788398742675781,0.013486146926879883,0.03867053985595703,0.04151511192321777,0.04494619369506836,0.046680450439453125,0.17043089866638184,0.04119110107421875,0.15666413307189941,0.15723943710327148,0.10784029960632324,0.8042066097259521,0.21774816513061523 diff --git a/results/combined/merges_timed/jvirtanen/parity.csv b/results/combined/merges_timed/jvirtanen/parity.csv index 02c127f95f..c8f4d7d8e5 100644 --- a/results/combined/merges_timed/jvirtanen/parity.csv +++ b/results/combined/merges_timed/jvirtanen/parity.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,a3aaadfbec54010fd2916804a872f09579f7b0fb,672528d11cccbec6b2a28efb6c8c8d14a1dd0c4f,07a94a059dc097c54a3b78bbfc97fba33c3aeda9,,True,True,4520e13fefbf1431ffa2f3d753542e19277f1c1b216b07636f947cb76f1f24c2,Tests_passed,fb40cce2a40a80875af2797b4d65399d10b4410faa8bc89a49513f83b67af023,Tests_passed,True,True,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,5d1026dd7080c17e603b7b193c65c69ce5b0aa31e6594baa3ec7451d95a0487e,Tests_passed,5d1026dd7080c17e603b7b193c65c69ce5b0aa31e6594baa3ec7451d95a0487e,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,0.044388532638549805,0.05256080627441406,0.04267406463623047,0.039830684661865234,0.04100441932678223,0.04860520362854004,0.0402677059173584,0.18320155143737793,0.04500222206115723,0.14908123016357422,0.14955592155456543,0.10764193534851074,0.6150739192962646,0.20294690132141113 +20,refs/heads/master,a3aaadfbec54010fd2916804a872f09579f7b0fb,672528d11cccbec6b2a28efb6c8c8d14a1dd0c4f,07a94a059dc097c54a3b78bbfc97fba33c3aeda9,,True,True,4520e13fefbf1431ffa2f3d753542e19277f1c1b216b07636f947cb76f1f24c2,Tests_passed,fb40cce2a40a80875af2797b4d65399d10b4410faa8bc89a49513f83b67af023,Tests_passed,True,True,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,5d1026dd7080c17e603b7b193c65c69ce5b0aa31e6594baa3ec7451d95a0487e,Tests_passed,5d1026dd7080c17e603b7b193c65c69ce5b0aa31e6594baa3ec7451d95a0487e,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,0.044388532638549805,0.05256080627441406,0.04267406463623047,0.039830684661865234,0.04100441932678223,0.04860520362854004,0.0402677059173584,0.18320155143737793,0.04500222206115723,0.14701414108276367,0.1463453769683838,0.10764193534851074,0.6150739192962646,0.20294690132141113 diff --git a/results/combined/merges_timed/jvm-profiling-tools/async-profiler.csv b/results/combined/merges_timed/jvm-profiling-tools/async-profiler.csv index d32ff52993..fffe558a39 100644 --- a/results/combined/merges_timed/jvm-profiling-tools/async-profiler.csv +++ b/results/combined/merges_timed/jvm-profiling-tools/async-profiler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -69,refs/remotes/origin/pull/485,aebeed5d99ee31497e59c84bfc3d312487391c19,f604f6f4dd3228016571d3fbea4e178372270e1e,4af6b652681d628da7411b55209e887a7247282c,,True,True,488108c8f6a87ca1d91ef5af0dbc08d53ea00f8320b19b7c0414515980f75895,Tests_passed,e1b0769ed10fd9fd33ca334cd32756556f98ad72cc6271b58045c13800641533,Tests_passed,True,True,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,8ddbcc49be31a669686a507c73d8af1cbf9185f76e2798a8941c1f98fd97df01,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,d46d07b04afdfdc4793e6aea4abe49721c4d53f305aa53b6b08e63bc4301a2ea,Merge_failed,d46d07b04afdfdc4793e6aea4abe49721c4d53f305aa53b6b08e63bc4301a2ea,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,0.054670095443725586,0.07010650634765625,0.041452646255493164,0.07022666931152344,0.04964423179626465,0.044382572174072266,0.07164216041564941,0.228529691696167,0.06241774559020996,0.22788381576538086,0.22243332862854004,0.19338178634643555,0.07060837745666504,0.2282416820526123 +69,refs/remotes/origin/pull/485,aebeed5d99ee31497e59c84bfc3d312487391c19,f604f6f4dd3228016571d3fbea4e178372270e1e,4af6b652681d628da7411b55209e887a7247282c,,True,True,488108c8f6a87ca1d91ef5af0dbc08d53ea00f8320b19b7c0414515980f75895,Tests_passed,e1b0769ed10fd9fd33ca334cd32756556f98ad72cc6271b58045c13800641533,Tests_passed,True,True,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,8ddbcc49be31a669686a507c73d8af1cbf9185f76e2798a8941c1f98fd97df01,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,d46d07b04afdfdc4793e6aea4abe49721c4d53f305aa53b6b08e63bc4301a2ea,Merge_failed,d46d07b04afdfdc4793e6aea4abe49721c4d53f305aa53b6b08e63bc4301a2ea,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,0.054670095443725586,0.07010650634765625,0.041452646255493164,0.07022666931152344,0.04964423179626465,0.044382572174072266,0.07164216041564941,0.228529691696167,0.06241774559020996,0.2268691062927246,0.2211780548095703,0.19338178634643555,0.07060837745666504,0.2282416820526123 diff --git a/results/combined/merges_timed/jwcarman/wicketopia.csv b/results/combined/merges_timed/jwcarman/wicketopia.csv index b18527c269..dcb12594dd 100644 --- a/results/combined/merges_timed/jwcarman/wicketopia.csv +++ b/results/combined/merges_timed/jwcarman/wicketopia.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,65dc57a69735d064d0c1c05fa67493b94c05b159,e32b5746cff9606ca0d26560dc48dddbadcf797f,e03bd261c14b567655c0408f25e9849ba93d7126,,True,True,c6a9890728b360c23a505bcede16723ffefb09dc4b37f50d64d1aa03387ec971,Tests_passed,49252840affa51ac739ae2f9abaf66f7e1c8aaf9e8e1737d7d102ac4c3ed8dc7,Tests_passed,True,True,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,653833794d11dd55bed2f09758768485bd388209b4b54a399381511d6a606af5,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,e8d03156cf4ee134ce8300830919831fdc66f46e00b271f710322f4bf51be24e,Merge_failed,e8d03156cf4ee134ce8300830919831fdc66f46e00b271f710322f4bf51be24e,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Merge_failed,3aecb8aa97a02c55f737a0aa4cfb769be5df1f370796a0575e3f7d8d761b8b51,0.01935744285583496,0.019680023193359375,0.021474838256835938,0.021548986434936523,0.02164316177368164,0.021464824676513672,0.021564960479736328,0.15068888664245605,0.028795719146728516,0.7800860404968262,0.7830183506011963,0.5140745639801025,3.9403882026672363,0.2470536231994629 +4,refs/heads/master,65dc57a69735d064d0c1c05fa67493b94c05b159,e32b5746cff9606ca0d26560dc48dddbadcf797f,e03bd261c14b567655c0408f25e9849ba93d7126,,True,True,c6a9890728b360c23a505bcede16723ffefb09dc4b37f50d64d1aa03387ec971,Tests_passed,49252840affa51ac739ae2f9abaf66f7e1c8aaf9e8e1737d7d102ac4c3ed8dc7,Tests_passed,True,True,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,653833794d11dd55bed2f09758768485bd388209b4b54a399381511d6a606af5,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,e8d03156cf4ee134ce8300830919831fdc66f46e00b271f710322f4bf51be24e,Merge_failed,e8d03156cf4ee134ce8300830919831fdc66f46e00b271f710322f4bf51be24e,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Merge_failed,3aecb8aa97a02c55f737a0aa4cfb769be5df1f370796a0575e3f7d8d761b8b51,0.01935744285583496,0.019680023193359375,0.021474838256835938,0.021548986434936523,0.02164316177368164,0.021464824676513672,0.021564960479736328,0.15068888664245605,0.028795719146728516,0.7781391143798828,0.7762918472290039,0.5140745639801025,3.9403882026672363,0.2470536231994629 diff --git a/results/combined/merges_timed/jwtk/jjwt.csv b/results/combined/merges_timed/jwtk/jjwt.csv index 6944426506..95059776d6 100644 --- a/results/combined/merges_timed/jwtk/jjwt.csv +++ b/results/combined/merges_timed/jwtk/jjwt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -142,refs/remotes/origin/pull/293,b864f8820383baf76060579d3a2e9087ecc6eee3,b54c0904f3051c8c6729dd051a7d38ad35fa8e7b,44faaca42205b99503e3d500a7ce3a82d4115819,,True,True,07589569207f93e850db0472a25d3d4e84b4e424a820c9ccbbf79452faef8548,Tests_passed,ff0addc40e3f4c1f7aece1a35011b8880f11e3128e7f817f131549fa7e939d0b,Tests_passed,True,True,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,a47bf405109441487a736cd5f2e327f39304e016d6ac9e12763718722cb1d948,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,6fc5a29774f00c58f1994581c6ed4630c24697397934e4b1f3173fced3f4c907,Merge_failed,6fc5a29774f00c58f1994581c6ed4630c24697397934e4b1f3173fced3f4c907,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,18abc0cbefa19b15b688df2b1b4530c46cae0b15284546ea49d15b481a498951,Merge_failed,0df16ea4f5a7d81e41b3dbae5c412231ad1f597e79ca18b2bc2d8e2bfe531613,0.0465388298034668,0.045534372329711914,0.03653836250305176,0.05128359794616699,0.04006600379943848,0.04875946044921875,0.05227494239807129,0.23126626014709473,0.06807255744934082,0.21431875228881836,0.21430754661560059,0.17490625381469727,1.0916435718536377,0.2187347412109375 +142,refs/remotes/origin/pull/293,b864f8820383baf76060579d3a2e9087ecc6eee3,b54c0904f3051c8c6729dd051a7d38ad35fa8e7b,44faaca42205b99503e3d500a7ce3a82d4115819,,True,True,07589569207f93e850db0472a25d3d4e84b4e424a820c9ccbbf79452faef8548,Tests_passed,ff0addc40e3f4c1f7aece1a35011b8880f11e3128e7f817f131549fa7e939d0b,Tests_passed,True,True,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,a47bf405109441487a736cd5f2e327f39304e016d6ac9e12763718722cb1d948,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,6fc5a29774f00c58f1994581c6ed4630c24697397934e4b1f3173fced3f4c907,Merge_failed,6fc5a29774f00c58f1994581c6ed4630c24697397934e4b1f3173fced3f4c907,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,18abc0cbefa19b15b688df2b1b4530c46cae0b15284546ea49d15b481a498951,Merge_failed,0df16ea4f5a7d81e41b3dbae5c412231ad1f597e79ca18b2bc2d8e2bfe531613,0.0465388298034668,0.045534372329711914,0.03653836250305176,0.05128359794616699,0.04006600379943848,0.04875946044921875,0.05227494239807129,0.23126626014709473,0.06807255744934082,0.21448755264282227,0.21443700790405273,0.17490625381469727,1.0916435718536377,0.2187347412109375 diff --git a/results/combined/merges_timed/k3po/k3po.csv b/results/combined/merges_timed/k3po/k3po.csv index 08b3879493..3de59f63b8 100644 --- a/results/combined/merges_timed/k3po/k3po.csv +++ b/results/combined/merges_timed/k3po/k3po.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,Tests_passed,True,True,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,409a1af93b7cc0f1cdf3651589770c65bb4097eb4326129f67cf63714b586317,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,40242b7918f3a77168a404071f4016408962c6bf4bf5e4243755725378a729a5,Merge_failed,40242b7918f3a77168a404071f4016408962c6bf4bf5e4243755725378a729a5,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Merge_failed,db872b74bd57ccaf2aa4cc40fd12f11025fec968836318b5265ebf08c0ea9a2a,0.032744646072387695,0.0330965518951416,0.038622379302978516,0.03900408744812012,0.038626670837402344,0.040332794189453125,0.04014086723327637,0.10226273536682129,0.05365490913391113,0.3101847171783447,0.30797481536865234,0.1527552604675293,2.2722971439361572,0.6558542251586914 +505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,Tests_passed,True,True,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,409a1af93b7cc0f1cdf3651589770c65bb4097eb4326129f67cf63714b586317,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,40242b7918f3a77168a404071f4016408962c6bf4bf5e4243755725378a729a5,Merge_failed,40242b7918f3a77168a404071f4016408962c6bf4bf5e4243755725378a729a5,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Merge_failed,db872b74bd57ccaf2aa4cc40fd12f11025fec968836318b5265ebf08c0ea9a2a,0.032744646072387695,0.0330965518951416,0.038622379302978516,0.03900408744812012,0.038626670837402344,0.040332794189453125,0.04014086723327637,0.10226273536682129,0.05365490913391113,0.2975623607635498,0.2973942756652832,0.1527552604675293,2.2722971439361572,0.6558542251586914 diff --git a/results/combined/merges_timed/kaazing/k3po.csv b/results/combined/merges_timed/kaazing/k3po.csv index 7693b452bd..77c74a26ed 100644 --- a/results/combined/merges_timed/kaazing/k3po.csv +++ b/results/combined/merges_timed/kaazing/k3po.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,Tests_passed,True,True,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,0.07533717155456543,0.06656217575073242,0.05661273002624512,0.08838915824890137,0.0826873779296875,0.0925440788269043,0.07110738754272461,0.2123734951019287,0.06802988052368164,0.17335057258605957,0.17342638969421387,0.13862895965576172,1.2090485095977783,0.3886446952819824 +193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,Tests_passed,True,True,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,0.07533717155456543,0.06656217575073242,0.05661273002624512,0.08838915824890137,0.0826873779296875,0.0925440788269043,0.07110738754272461,0.2123734951019287,0.06802988052368164,0.17426156997680664,0.17444252967834473,0.13862895965576172,1.2090485095977783,0.3886446952819824 diff --git a/results/combined/merges_timed/kaazing/robot.csv b/results/combined/merges_timed/kaazing/robot.csv index 0c4c5923b6..cdeb55ec87 100644 --- a/results/combined/merges_timed/kaazing/robot.csv +++ b/results/combined/merges_timed/kaazing/robot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,Tests_passed,True,True,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,409a1af93b7cc0f1cdf3651589770c65bb4097eb4326129f67cf63714b586317,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,40242b7918f3a77168a404071f4016408962c6bf4bf5e4243755725378a729a5,Merge_failed,40242b7918f3a77168a404071f4016408962c6bf4bf5e4243755725378a729a5,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Merge_failed,db872b74bd57ccaf2aa4cc40fd12f11025fec968836318b5265ebf08c0ea9a2a,0.06378507614135742,0.07155227661132812,0.06244325637817383,0.07710433006286621,0.07654452323913574,0.0789484977722168,0.06476449966430664,0.2720298767089844,0.11386823654174805,0.2959311008453369,0.29702186584472656,0.20291852951049805,2.176095962524414,0.6788549423217773 +505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,Tests_passed,True,True,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,409a1af93b7cc0f1cdf3651589770c65bb4097eb4326129f67cf63714b586317,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,40242b7918f3a77168a404071f4016408962c6bf4bf5e4243755725378a729a5,Merge_failed,40242b7918f3a77168a404071f4016408962c6bf4bf5e4243755725378a729a5,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Merge_failed,db872b74bd57ccaf2aa4cc40fd12f11025fec968836318b5265ebf08c0ea9a2a,0.06378507614135742,0.07155227661132812,0.06244325637817383,0.07710433006286621,0.07654452323913574,0.0789484977722168,0.06476449966430664,0.2720298767089844,0.11386823654174805,0.2976095676422119,0.2976868152618408,0.20291852951049805,2.176095962524414,0.6788549423217773 diff --git a/results/combined/merges_timed/kamranzafar/jtar.csv b/results/combined/merges_timed/kamranzafar/jtar.csv index af1efc283b..7bbd3ddcdc 100644 --- a/results/combined/merges_timed/kamranzafar/jtar.csv +++ b/results/combined/merges_timed/kamranzafar/jtar.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,8f25838636b85d3c504ec732e04258c61682b3cd,59e3f7a525ada0fc1e62e05de795e57762bcf5fb,46a20204bcb3c16a94371f21f919c2717274cc61,,a841de0c6da0effa57a921b792091f28f9e794e2e69bf3d2b078269544f9dacd,Tests_passed,90c835d4115c583e0e1ddd6615c5f7adb16378073f8a5272fbbbbee1fd0017bf,Tests_passed,True,True,True,True,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,0.043473243713378906,0.039542198181152344,0.04155421257019043,0.03724074363708496,0.04285478591918945,0.040624380111694336,0.043633460998535156,0.16862058639526367,0.042604684829711914,0.15685415267944336,0.15657997131347656,0.10727953910827637,0.7597222328186035,0.18783807754516602 +3,refs/heads/master,8f25838636b85d3c504ec732e04258c61682b3cd,59e3f7a525ada0fc1e62e05de795e57762bcf5fb,46a20204bcb3c16a94371f21f919c2717274cc61,,a841de0c6da0effa57a921b792091f28f9e794e2e69bf3d2b078269544f9dacd,Tests_passed,90c835d4115c583e0e1ddd6615c5f7adb16378073f8a5272fbbbbee1fd0017bf,Tests_passed,True,True,True,True,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,0.043473243713378906,0.039542198181152344,0.04155421257019043,0.03724074363708496,0.04285478591918945,0.040624380111694336,0.043633460998535156,0.16862058639526367,0.042604684829711914,0.1489412784576416,0.1484367847442627,0.10727953910827637,0.7597222328186035,0.18783807754516602 diff --git a/results/combined/merges_timed/kantega/pdf-converter.csv b/results/combined/merges_timed/kantega/pdf-converter.csv index 2dedbac0b6..ea432abb9c 100644 --- a/results/combined/merges_timed/kantega/pdf-converter.csv +++ b/results/combined/merges_timed/kantega/pdf-converter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,Tests_passed,True,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,0.014321565628051758,0.08748602867126465,0.12498259544372559,0.12481904029846191,0.11461663246154785,0.10553407669067383,0.12337636947631836,0.18778014183044434,0.08615636825561523,0.24237394332885742,0.20413756370544434,0.14156818389892578,0.6311066150665283,0.2981400489807129 +12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,Tests_passed,True,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,0.014321565628051758,0.08748602867126465,0.12498259544372559,0.12481904029846191,0.11461663246154785,0.10553407669067383,0.12337636947631836,0.18778014183044434,0.08615636825561523,0.2363147735595703,0.16352248191833496,0.14156818389892578,0.6311066150665283,0.2981400489807129 diff --git a/results/combined/merges_timed/kawasima/websocket-classloader.csv b/results/combined/merges_timed/kawasima/websocket-classloader.csv index 099d0a2b8e..6f3ff343fb 100644 --- a/results/combined/merges_timed/kawasima/websocket-classloader.csv +++ b/results/combined/merges_timed/kawasima/websocket-classloader.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,88366037a581c46cd8de7463b50d29713e2e5c5b,f482eb2bfc2a6a85243adf7e4eaa77d918493868,685399d19d8c960926a6518f0fa8f76091034add,,True,True,a8a898766af5f842af256558889e192aeee5b0c52bb571507bd3ba056d1df960,Tests_passed,f277f6168d47d1e1f8565f5be25621c158b26d37927dbda02d25ce03e84b74f1,Tests_passed,True,True,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,0.008466005325317383,0.008407354354858398,0.009088993072509766,0.00881338119506836,0.008812189102172852,0.009439945220947266,0.009013652801513672,0.03141355514526367,0.008342504501342773,0.14325952529907227,0.14264130592346191,0.06344866752624512,0.6032860279083252,0.16108489036560059 +2,refs/heads/master,88366037a581c46cd8de7463b50d29713e2e5c5b,f482eb2bfc2a6a85243adf7e4eaa77d918493868,685399d19d8c960926a6518f0fa8f76091034add,,True,True,a8a898766af5f842af256558889e192aeee5b0c52bb571507bd3ba056d1df960,Tests_passed,f277f6168d47d1e1f8565f5be25621c158b26d37927dbda02d25ce03e84b74f1,Tests_passed,True,True,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,0.008466005325317383,0.008407354354858398,0.009088993072509766,0.00881338119506836,0.008812189102172852,0.009439945220947266,0.009013652801513672,0.03141355514526367,0.008342504501342773,0.1411881446838379,0.14114594459533691,0.06344866752624512,0.6032860279083252,0.16108489036560059 diff --git a/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv b/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv index 8a58020183..0dc5871b0b 100644 --- a/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv +++ b/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,62d7c2a50fc75040d093e8f6ecc592fce3988da8,43a2d582de17af1c2e128a66ef40cb346e70ce9d,bab2b3182532ccf3cc63df5a00b6bdf47a72b630,,True,True,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Tests_passed,43bd862d980231f4c820a811ee7bc2ad999cb13a1a3fbe6555255bc0dbc58975,Tests_passed,True,True,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Tests_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Tests_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,0.04481172561645508,0.0436863899230957,0.04800128936767578,0.04707765579223633,0.049552202224731445,0.0534818172454834,0.04863238334655762,0.13271784782409668,0.05754280090332031,0.00730443000793457,0.007120609283447266,0.044382333755493164,0.04457688331604004,0.23280048370361328 +6,refs/heads/master,62d7c2a50fc75040d093e8f6ecc592fce3988da8,43a2d582de17af1c2e128a66ef40cb346e70ce9d,bab2b3182532ccf3cc63df5a00b6bdf47a72b630,,True,True,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Tests_passed,43bd862d980231f4c820a811ee7bc2ad999cb13a1a3fbe6555255bc0dbc58975,Tests_passed,True,True,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Tests_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Tests_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,0.04481172561645508,0.0436863899230957,0.04800128936767578,0.04707765579223633,0.049552202224731445,0.0534818172454834,0.04863238334655762,0.13271784782409668,0.05754280090332031,0.006732463836669922,0.006723642349243164,0.044382333755493164,0.04457688331604004,0.23280048370361328 diff --git a/results/combined/merges_timed/keedio/flume-ftp-source.csv b/results/combined/merges_timed/keedio/flume-ftp-source.csv index 17f5f232c8..aba6f862e2 100644 --- a/results/combined/merges_timed/keedio/flume-ftp-source.csv +++ b/results/combined/merges_timed/keedio/flume-ftp-source.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,Tests_passed,True,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,ad8a6d730f6a584843e43a687be0504723e4e0eba31a4ed65a95e58fce3d25f1,Merge_failed,5a9001a5cf8a7fa9336c56354109866ff75e16f986e005cf693eddf2f205db5f,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,0.010106325149536133,0.010611772537231445,0.010630130767822266,0.010610103607177734,0.010619401931762695,0.010767221450805664,0.010831832885742188,0.08529043197631836,0.017160892486572266,0.5155649185180664,0.5159990787506104,0.2842390537261963,3.167464256286621,0.18245553970336914 +3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,Tests_passed,True,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,ad8a6d730f6a584843e43a687be0504723e4e0eba31a4ed65a95e58fce3d25f1,Merge_failed,5a9001a5cf8a7fa9336c56354109866ff75e16f986e005cf693eddf2f205db5f,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,0.010106325149536133,0.010611772537231445,0.010630130767822266,0.010610103607177734,0.010619401931762695,0.010767221450805664,0.010831832885742188,0.08529043197631836,0.017160892486572266,0.5085065364837646,0.5080344676971436,0.2842390537261963,3.167464256286621,0.18245553970336914 diff --git a/results/combined/merges_timed/keedio/flume-ng-sql-source.csv b/results/combined/merges_timed/keedio/flume-ng-sql-source.csv index c81b60ce42..29fc93b320 100644 --- a/results/combined/merges_timed/keedio/flume-ng-sql-source.csv +++ b/results/combined/merges_timed/keedio/flume-ng-sql-source.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -53,refs/remotes/origin/master,2ce9f4bbde8a973ec095ac8a1d3a99dd37e0f58a,8e2e2fb3e09fc90c302c592550aca122d3b9ee90,c0d4caab50a88ef5b0f47b67a4034eca9e7bc3a9,,True,True,0980a9957ce3a31af9c761620dbbffbf34aadfeb87d459f70738753b14ab8a3b,Tests_passed,00ee085c342a24f217d2e13c8316e5a9563132fdb20f9798021d007255d65728,Tests_passed,True,True,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,e64a155e66bc3e874be3056c17db68b17454621149b404e0ba04f605f664d237,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,0.009160518646240234,0.008647441864013672,0.008586406707763672,0.008344888687133789,0.008712530136108398,0.008571624755859375,0.008608341217041016,0.03859663009643555,0.013081789016723633,0.007107973098754883,0.0071926116943359375,0.0681757926940918,0.012252330780029297,0.15438437461853027 +53,refs/remotes/origin/master,2ce9f4bbde8a973ec095ac8a1d3a99dd37e0f58a,8e2e2fb3e09fc90c302c592550aca122d3b9ee90,c0d4caab50a88ef5b0f47b67a4034eca9e7bc3a9,,True,True,0980a9957ce3a31af9c761620dbbffbf34aadfeb87d459f70738753b14ab8a3b,Tests_passed,00ee085c342a24f217d2e13c8316e5a9563132fdb20f9798021d007255d65728,Tests_passed,True,True,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,e64a155e66bc3e874be3056c17db68b17454621149b404e0ba04f605f664d237,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,0.009160518646240234,0.008647441864013672,0.008586406707763672,0.008344888687133789,0.008712530136108398,0.008571624755859375,0.008608341217041016,0.03859663009643555,0.013081789016723633,0.00687861442565918,0.006883144378662109,0.0681757926940918,0.012252330780029297,0.15438437461853027 diff --git a/results/combined/merges_timed/kevin-wayne/algs4.csv b/results/combined/merges_timed/kevin-wayne/algs4.csv index 410c3838d8..84b9e03e49 100644 --- a/results/combined/merges_timed/kevin-wayne/algs4.csv +++ b/results/combined/merges_timed/kevin-wayne/algs4.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,b66548467b304fa8a6e7b939b7c44cd265c0e1e8,8e875f80fefd14897240c10f329d6323e069974e,75395a716f9a6128d69879bee6d09abb3e397082,,True,True,9239c86344ccd63c35764c5a8756ab04ae6490c46700657297d576c7bdccc983,Tests_passed,5394368a3322d9e81d66e78df11439668edf9a0f9e6464c60388ff3a4b05c305,Tests_passed,True,True,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f6a22db34ee0065c3a466ea39ecfed63d6499a9d6d1728d44ea3f7f3cfda6492,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,e183cfdc99c53d079ebde9c84f56b37a4eb5cd0b4d1497de363a75f957ec81b0,Merge_failed,e183cfdc99c53d079ebde9c84f56b37a4eb5cd0b4d1497de363a75f957ec81b0,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,476f4d2a00a84f8b2e50e084e927034c57179db3ae24a83ea3401e37d7734c95,0.023292064666748047,0.02749013900756836,0.013513803482055664,0.01665973663330078,0.02262258529663086,0.017772912979125977,0.04252147674560547,0.14713239669799805,0.0649571418762207,0.0766141414642334,0.0778956413269043,0.08227896690368652,0.8448219299316406,0.23439478874206543 +6,refs/heads/master,b66548467b304fa8a6e7b939b7c44cd265c0e1e8,8e875f80fefd14897240c10f329d6323e069974e,75395a716f9a6128d69879bee6d09abb3e397082,,True,True,9239c86344ccd63c35764c5a8756ab04ae6490c46700657297d576c7bdccc983,Tests_passed,5394368a3322d9e81d66e78df11439668edf9a0f9e6464c60388ff3a4b05c305,Tests_passed,True,True,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f6a22db34ee0065c3a466ea39ecfed63d6499a9d6d1728d44ea3f7f3cfda6492,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,e183cfdc99c53d079ebde9c84f56b37a4eb5cd0b4d1497de363a75f957ec81b0,Merge_failed,e183cfdc99c53d079ebde9c84f56b37a4eb5cd0b4d1497de363a75f957ec81b0,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,476f4d2a00a84f8b2e50e084e927034c57179db3ae24a83ea3401e37d7734c95,0.023292064666748047,0.02749013900756836,0.013513803482055664,0.01665973663330078,0.02262258529663086,0.017772912979125977,0.04252147674560547,0.14713239669799805,0.0649571418762207,0.08693814277648926,0.08715629577636719,0.08227896690368652,0.8448219299316406,0.23439478874206543 diff --git a/results/combined/merges_timed/kevinbayes/vest.csv b/results/combined/merges_timed/kevinbayes/vest.csv index 1f939ad10f..a2bb78802a 100644 --- a/results/combined/merges_timed/kevinbayes/vest.csv +++ b/results/combined/merges_timed/kevinbayes/vest.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/18,3209c8480f0f7a364ff86db4fa1c5762026347a9,0e314832855cbd12a9989ae2d01d27ea825b4c6f,c2c2bbd61ea75d1802b45fa0aba03c8dabfcac5f,,71aed7b4c882099618f2b1d575069985ea520c9dbb6f3dc7e7a7e91aaea1cccd,Tests_passed,73cf9cf91b2db95a30166e86a88c21aa43526465e238963bce11362932a31e2e,Tests_passed,True,True,True,True,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,0.039591073989868164,0.047817230224609375,0.044217824935913086,0.04669189453125,0.05090689659118652,0.04570651054382324,0.03459501266479492,0.22847366333007812,0.04535722732543945,0.15842604637145996,0.15797138214111328,0.1700584888458252,0.9378302097320557,0.19519591331481934 +3,refs/remotes/origin/pull/18,3209c8480f0f7a364ff86db4fa1c5762026347a9,0e314832855cbd12a9989ae2d01d27ea825b4c6f,c2c2bbd61ea75d1802b45fa0aba03c8dabfcac5f,,71aed7b4c882099618f2b1d575069985ea520c9dbb6f3dc7e7a7e91aaea1cccd,Tests_passed,73cf9cf91b2db95a30166e86a88c21aa43526465e238963bce11362932a31e2e,Tests_passed,True,True,True,True,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,0.039591073989868164,0.047817230224609375,0.044217824935913086,0.04669189453125,0.05090689659118652,0.04570651054382324,0.03459501266479492,0.22847366333007812,0.04535722732543945,0.1562952995300293,0.15585041046142578,0.1700584888458252,0.9378302097320557,0.19519591331481934 diff --git a/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv b/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv index 883d4e6661..a2e90f5fee 100644 --- a/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv +++ b/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,99d1681276cd909ef4061373c1584c047d898356,380156fe641eb5b936b5becd9e031c268a12db17,5e50ad9cdac0106e3b43f3172c3b8f97da1dcb9d,,True,True,6cc03b238709c2c719e13e7d2f1aa91ad30e8d8a44ba9be58733c7ffa0031515,Tests_passed,15c9b37931bca59af69ce54b24423e71651be937d5863e0717fac9c7875e36e1,Tests_passed,True,True,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,0.05265021324157715,0.040640830993652344,0.03937268257141113,0.04071998596191406,0.05964469909667969,0.02935791015625,0.04581284523010254,0.18584394454956055,0.04322695732116699,0.16126441955566406,0.16244912147521973,0.12288475036621094,0.8444564342498779,0.18589162826538086 +2,refs/heads/master,99d1681276cd909ef4061373c1584c047d898356,380156fe641eb5b936b5becd9e031c268a12db17,5e50ad9cdac0106e3b43f3172c3b8f97da1dcb9d,,True,True,6cc03b238709c2c719e13e7d2f1aa91ad30e8d8a44ba9be58733c7ffa0031515,Tests_passed,15c9b37931bca59af69ce54b24423e71651be937d5863e0717fac9c7875e36e1,Tests_passed,True,True,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,0.05265021324157715,0.040640830993652344,0.03937268257141113,0.04071998596191406,0.05964469909667969,0.02935791015625,0.04581284523010254,0.18584394454956055,0.04322695732116699,0.15861105918884277,0.15824198722839355,0.12288475036621094,0.8444564342498779,0.18589162826538086 diff --git a/results/combined/merges_timed/khmarbaise/maven-license-verifier-plugin.csv b/results/combined/merges_timed/khmarbaise/maven-license-verifier-plugin.csv index fd3ccc3aea..ace2fc0de6 100644 --- a/results/combined/merges_timed/khmarbaise/maven-license-verifier-plugin.csv +++ b/results/combined/merges_timed/khmarbaise/maven-license-verifier-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,0329bcf4b7d1b8077d22fe8580d37ea103328e79,ce8439dc6634eb06f4cd61edfbff3428375b2bf5,74d5f5be15757b3a648c9ce5242e2e65268f3aa1,,True,True,23d664a3f5daa87048857f20e1128b8c2efe3fc5db64fb2e149e4978e04eece1,Tests_passed,b2ee79543a5df69c698faeb7b18aff30ce87a04ef953bd01c3702312c3ba61c1,Tests_passed,True,True,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,319ae13a4e75fdf8a0fa74d661e527b717a1cd81cae417b6f33cd423148e9790,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_failed,755be46ee4068f653820688f75a7ab3d6fd5d9f30c617b8a2e69c957645bdc86,0.02451634407043457,0.04433774948120117,0.04238486289978027,0.040831565856933594,0.049483537673950195,0.044190406799316406,0.036701202392578125,0.29456472396850586,0.07339906692504883,0.4727659225463867,0.4714512825012207,0.22649478912353516,2.20139479637146,0.2137296199798584 +3,refs/heads/master,0329bcf4b7d1b8077d22fe8580d37ea103328e79,ce8439dc6634eb06f4cd61edfbff3428375b2bf5,74d5f5be15757b3a648c9ce5242e2e65268f3aa1,,True,True,23d664a3f5daa87048857f20e1128b8c2efe3fc5db64fb2e149e4978e04eece1,Tests_passed,b2ee79543a5df69c698faeb7b18aff30ce87a04ef953bd01c3702312c3ba61c1,Tests_passed,True,True,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,319ae13a4e75fdf8a0fa74d661e527b717a1cd81cae417b6f33cd423148e9790,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_failed,755be46ee4068f653820688f75a7ab3d6fd5d9f30c617b8a2e69c957645bdc86,0.02451634407043457,0.04433774948120117,0.04238486289978027,0.040831565856933594,0.049483537673950195,0.044190406799316406,0.036701202392578125,0.29456472396850586,0.07339906692504883,0.4554910659790039,0.455230712890625,0.22649478912353516,2.20139479637146,0.2137296199798584 diff --git a/results/combined/merges_timed/khuxtable/wagon-gitsite.csv b/results/combined/merges_timed/khuxtable/wagon-gitsite.csv index 5a8cf61dff..73f99a95f1 100644 --- a/results/combined/merges_timed/khuxtable/wagon-gitsite.csv +++ b/results/combined/merges_timed/khuxtable/wagon-gitsite.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/18,c94bcd0245b4844ab11ed21275f886cbbf21c9e4,d5aa326489bb43f65303736331247706d7dba123,c24ca067a932b0342131923e2eaa7680368233cc,,b00bf9e8e4dda305f8491325ee402aa038e852ac6b620b96127fa932548916a4,Tests_passed,8202568122501c76010d3a16a78213fce4e5351878d736f1e27fe6f54f4926c9,Tests_passed,True,True,True,True,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,0.04582381248474121,0.04940962791442871,0.047598838806152344,0.045180320739746094,0.05278778076171875,0.04723978042602539,0.056243181228637695,0.23434042930603027,0.047499656677246094,0.17549848556518555,0.16997170448303223,0.15840721130371094,1.0551486015319824,0.2024524211883545 +3,refs/remotes/origin/pull/18,c94bcd0245b4844ab11ed21275f886cbbf21c9e4,d5aa326489bb43f65303736331247706d7dba123,c24ca067a932b0342131923e2eaa7680368233cc,,b00bf9e8e4dda305f8491325ee402aa038e852ac6b620b96127fa932548916a4,Tests_passed,8202568122501c76010d3a16a78213fce4e5351878d736f1e27fe6f54f4926c9,Tests_passed,True,True,True,True,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,0.04582381248474121,0.04940962791442871,0.047598838806152344,0.045180320739746094,0.05278778076171875,0.04723978042602539,0.056243181228637695,0.23434042930603027,0.047499656677246094,0.16737604141235352,0.16792011260986328,0.15840721130371094,1.0551486015319824,0.2024524211883545 diff --git a/results/combined/merges_timed/kifj/jboss-syslog.csv b/results/combined/merges_timed/kifj/jboss-syslog.csv index 45f7e3e0cd..a15142a037 100644 --- a/results/combined/merges_timed/kifj/jboss-syslog.csv +++ b/results/combined/merges_timed/kifj/jboss-syslog.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,b0a5f59bc365dda96b4051495d15fbc46f36cd27,ebedeeed422121087bc3be855ec363c8c0213601,bb26bd84f7ec09f94959c87d4a4fd43af6b3994a,,True,True,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Tests_passed,521cec31d4f89b12dc48e058eca3cfcc81f6bf21d96a916dc3810218ccc1c868,Tests_passed,True,True,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,fd40b8acba5744dc0fef81af9268dee55fc42b74249e9ff4938330a34b8d3667,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,fd40b8acba5744dc0fef81af9268dee55fc42b74249e9ff4938330a34b8d3667,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,dbc37c67435eab16aef7c27119ec9058b191d17b9654abea38f263fb5baa2226,Merge_failed,dbc37c67435eab16aef7c27119ec9058b191d17b9654abea38f263fb5baa2226,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,3e40f5541299ccf0385e14249ce8b7c0ea9aeaa508530e2cf99a092fe1127c2e,0.036710500717163086,0.03805375099182129,0.035662174224853516,0.03448343276977539,0.03706836700439453,0.03135251998901367,0.03580498695373535,0.12230610847473145,0.06173825263977051,0.06508088111877441,0.06490540504455566,0.10551786422729492,0.5099656581878662,0.1999037265777588 +15,refs/heads/master,b0a5f59bc365dda96b4051495d15fbc46f36cd27,ebedeeed422121087bc3be855ec363c8c0213601,bb26bd84f7ec09f94959c87d4a4fd43af6b3994a,,True,True,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Tests_passed,521cec31d4f89b12dc48e058eca3cfcc81f6bf21d96a916dc3810218ccc1c868,Tests_passed,True,True,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,fd40b8acba5744dc0fef81af9268dee55fc42b74249e9ff4938330a34b8d3667,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,fd40b8acba5744dc0fef81af9268dee55fc42b74249e9ff4938330a34b8d3667,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,88c46c30c75a7d9fa79f66daf298ce9816f029ab37bd040f65de906d4cb41eeb,Merge_failed,dbc37c67435eab16aef7c27119ec9058b191d17b9654abea38f263fb5baa2226,Merge_failed,dbc37c67435eab16aef7c27119ec9058b191d17b9654abea38f263fb5baa2226,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,3e40f5541299ccf0385e14249ce8b7c0ea9aeaa508530e2cf99a092fe1127c2e,0.036710500717163086,0.03805375099182129,0.035662174224853516,0.03448343276977539,0.03706836700439453,0.03135251998901367,0.03580498695373535,0.12230610847473145,0.06173825263977051,0.06138348579406738,0.06209063529968262,0.10551786422729492,0.5099656581878662,0.1999037265777588 diff --git a/results/combined/merges_timed/killbilling/recurly-java-library.csv b/results/combined/merges_timed/killbilling/recurly-java-library.csv index 963ff8dcd0..bc7712416e 100644 --- a/results/combined/merges_timed/killbilling/recurly-java-library.csv +++ b/results/combined/merges_timed/killbilling/recurly-java-library.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -222,refs/heads/master,c978e4add5640a493a55339972b2cd4363d42957,af7d25dff245056f1fc458c7b39f29e2de44d533,dcbfbb986a19c58efe3bc0b284724741ee71dc26,,True,True,c250916aaa0801116200b7d417fa4fee4da50ec915837160b4f5e333d51a7198,Tests_passed,49432ab9f96b0cc95b26258d7f928fdfd967df3d5030021d8cff6d6d28459bd3,Tests_passed,True,True,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,3271374299951fcafc031cf97121a8f709fab778522d9b6edb8e02d6772e7768,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,f375ece854011020294b62ee73a13204817dbb5c23fd2373d3abeb268f43becf,Merge_failed,f375ece854011020294b62ee73a13204817dbb5c23fd2373d3abeb268f43becf,Merge_failed,271ec15f6cf7a88667ab956c0e62dbf7f7afa5994d45d1f83f16470a5fe97ea7,Tests_passed,a0605aca09a37e936f90477593f744e8605b1bd882bc0dd0d5b5a766316c1cd1,Merge_failed,b436f4af62df52432ab380471e77f9c41925ff2b9a672cdd03e0b1dc42c4f7c9,0.06166362762451172,0.06327080726623535,0.05523419380187988,0.023288488388061523,0.05037117004394531,0.046871185302734375,0.05251312255859375,0.16933393478393555,0.08778142929077148,0.07278561592102051,0.07323908805847168,0.1109170913696289,0.9718263149261475,0.2766592502593994 +222,refs/heads/master,c978e4add5640a493a55339972b2cd4363d42957,af7d25dff245056f1fc458c7b39f29e2de44d533,dcbfbb986a19c58efe3bc0b284724741ee71dc26,,True,True,c250916aaa0801116200b7d417fa4fee4da50ec915837160b4f5e333d51a7198,Tests_passed,49432ab9f96b0cc95b26258d7f928fdfd967df3d5030021d8cff6d6d28459bd3,Tests_passed,True,True,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,3271374299951fcafc031cf97121a8f709fab778522d9b6edb8e02d6772e7768,Merge_failed,d5e77fc3bd0e0dd10e78a2ceee63e55ad17259650637ef740547f4c954f35d57,Merge_failed,f375ece854011020294b62ee73a13204817dbb5c23fd2373d3abeb268f43becf,Merge_failed,f375ece854011020294b62ee73a13204817dbb5c23fd2373d3abeb268f43becf,Merge_failed,271ec15f6cf7a88667ab956c0e62dbf7f7afa5994d45d1f83f16470a5fe97ea7,Tests_passed,a0605aca09a37e936f90477593f744e8605b1bd882bc0dd0d5b5a766316c1cd1,Merge_failed,b436f4af62df52432ab380471e77f9c41925ff2b9a672cdd03e0b1dc42c4f7c9,0.06166362762451172,0.06327080726623535,0.05523419380187988,0.023288488388061523,0.05037117004394531,0.046871185302734375,0.05251312255859375,0.16933393478393555,0.08778142929077148,0.07085680961608887,0.07120919227600098,0.1109170913696289,0.9718263149261475,0.2766592502593994 diff --git a/results/combined/merges_timed/killme2008/aviator.csv b/results/combined/merges_timed/killme2008/aviator.csv index 3df48c8a87..ccfe7c6cef 100644 --- a/results/combined/merges_timed/killme2008/aviator.csv +++ b/results/combined/merges_timed/killme2008/aviator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,Tests_passed,True,True,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,0.04927468299865723,0.05126309394836426,0.06519412994384766,0.05892634391784668,0.07357287406921387,0.05908322334289551,0.06565332412719727,0.20274853706359863,0.042707204818725586,0.17630290985107422,0.17863750457763672,0.11348104476928711,1.1442959308624268,0.373673677444458 +19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,Tests_passed,True,True,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,0.04927468299865723,0.05126309394836426,0.06519412994384766,0.05892634391784668,0.07357287406921387,0.05908322334289551,0.06565332412719727,0.20274853706359863,0.042707204818725586,0.2157588005065918,0.17020893096923828,0.11348104476928711,1.1442959308624268,0.373673677444458 diff --git a/results/combined/merges_timed/killme2008/xmemcached.csv b/results/combined/merges_timed/killme2008/xmemcached.csv index 5b5f906c49..9cdc72b5b5 100644 --- a/results/combined/merges_timed/killme2008/xmemcached.csv +++ b/results/combined/merges_timed/killme2008/xmemcached.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,b9e0c0c8b216855a15478361d5528b62688b9f4b,9f108c974c8bcc1f17ed0b202df0ea0a669ec65e,eef7bcbe4341da1a9bad3e5b30781bf1e381ec90,,78f5fd833ef4083e296242256078379e4ce043dd2e5f6f2f9e0f07ec5c937e8d,Tests_passed,911ed6fe66d5c9ff285ab292254578c250115a8fe9eca28f75942eaec65fb2e4,Tests_passed,True,True,True,True,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,0.05722308158874512,0.045677900314331055,0.049793243408203125,0.0566408634185791,0.05126309394836426,0.04123353958129883,0.0630636215209961,0.18315792083740234,0.05189657211303711,0.16734552383422852,0.20085430145263672,0.11241269111633301,1.2416026592254639,0.2546379566192627 +18,refs/heads/master,b9e0c0c8b216855a15478361d5528b62688b9f4b,9f108c974c8bcc1f17ed0b202df0ea0a669ec65e,eef7bcbe4341da1a9bad3e5b30781bf1e381ec90,,78f5fd833ef4083e296242256078379e4ce043dd2e5f6f2f9e0f07ec5c937e8d,Tests_passed,911ed6fe66d5c9ff285ab292254578c250115a8fe9eca28f75942eaec65fb2e4,Tests_passed,True,True,True,True,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,0.05722308158874512,0.045677900314331055,0.049793243408203125,0.0566408634185791,0.05126309394836426,0.04123353958129883,0.0630636215209961,0.18315792083740234,0.05189657211303711,0.19927406311035156,0.2000596523284912,0.11241269111633301,1.2416026592254639,0.2546379566192627 diff --git a/results/combined/merges_timed/kimshen/sissi.csv b/results/combined/merges_timed/kimshen/sissi.csv index 67f473bc73..c427e1d218 100644 --- a/results/combined/merges_timed/kimshen/sissi.csv +++ b/results/combined/merges_timed/kimshen/sissi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,c00c2e6554f121dc4bbb4fb2549738e1b1ec639f,73d171b086455c3d56fb7554ef823f875663b4e0,eb55eb9b6f00bc2435d9d65b521ca592f9138e01,,290830813490792a7cf33b82a6df8bdecc6d7cd87d92cf87918f9b5e8e19221c,Tests_passed,3225e85c3d0c3c718f84e1ebb2469ce0deed53e245e01c8161c47842796f0eaf,Tests_passed,True,True,True,True,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,91fddba7d3257f9bb3bcf094b701e80cf156b3e124d3627a1a4db2660176e9c6,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,91fddba7d3257f9bb3bcf094b701e80cf156b3e124d3627a1a4db2660176e9c6,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,25266c9c30829e00b71bd767ee4e05c52e81a68ff50bfacd5180379c0de26701,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,48b66121085690e8d79626ecc6dcf1372a0c6d2c03868dbbc162f0aa60d5fe65,Merge_failed,61003bab89d83925fc3713dba30c266af2a76a444d7758305127ad7fc4b1af91,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,f759f8150b16fff45b8fad620444707010efb021440b02254f025e2fe2539cca,Merge_failed,e19034a478da432bfa81f19fbd63a2e00b0453c1a74fe2aa72f4ff079518914a,0.04781651496887207,0.05108022689819336,0.0421292781829834,0.04125404357910156,0.011893272399902344,0.04361081123352051,0.04788994789123535,0.43448400497436523,0.11118221282958984,0.2739436626434326,0.2822306156158447,0.36437153816223145,1.86000394821167,0.28391528129577637 +4,refs/heads/master,c00c2e6554f121dc4bbb4fb2549738e1b1ec639f,73d171b086455c3d56fb7554ef823f875663b4e0,eb55eb9b6f00bc2435d9d65b521ca592f9138e01,,290830813490792a7cf33b82a6df8bdecc6d7cd87d92cf87918f9b5e8e19221c,Tests_passed,3225e85c3d0c3c718f84e1ebb2469ce0deed53e245e01c8161c47842796f0eaf,Tests_passed,True,True,True,True,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,91fddba7d3257f9bb3bcf094b701e80cf156b3e124d3627a1a4db2660176e9c6,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,91fddba7d3257f9bb3bcf094b701e80cf156b3e124d3627a1a4db2660176e9c6,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,25266c9c30829e00b71bd767ee4e05c52e81a68ff50bfacd5180379c0de26701,Merge_failed,cdab57b68cf0596e27f9627a55c9bca16b3bac77ac3f77b944383225ac0033fe,Merge_failed,48b66121085690e8d79626ecc6dcf1372a0c6d2c03868dbbc162f0aa60d5fe65,Merge_failed,61003bab89d83925fc3713dba30c266af2a76a444d7758305127ad7fc4b1af91,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,f759f8150b16fff45b8fad620444707010efb021440b02254f025e2fe2539cca,Merge_failed,e19034a478da432bfa81f19fbd63a2e00b0453c1a74fe2aa72f4ff079518914a,0.04781651496887207,0.05108022689819336,0.0421292781829834,0.04125404357910156,0.011893272399902344,0.04361081123352051,0.04788994789123535,0.43448400497436523,0.11118221282958984,0.2829010486602783,0.283036470413208,0.36437153816223145,1.86000394821167,0.28391528129577637 diff --git a/results/combined/merges_timed/kinow/testlink-java-api.csv b/results/combined/merges_timed/kinow/testlink-java-api.csv index 013a338511..5f698b2cdb 100644 --- a/results/combined/merges_timed/kinow/testlink-java-api.csv +++ b/results/combined/merges_timed/kinow/testlink-java-api.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/master,c8219ee401dd1f5feac814af4f6294e7d57abe2b,eb9ac19efb822f141aa71fbe3495f428a889ae55,8aeca53cc5da2e39fcd102387343c5d6b40f0213,,c75efdd969445a5e814073b74bb4b2806bf1d2c9c3c29451bbe5c17babc5d863,Tests_passed,bc57d9d0286bb6c4014169bc7bc51d76cafa243431b1ea2ec64543bf9c1693c0,Tests_passed,True,True,True,True,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,ed2df67aedc4ffbb82edb454603361e2712dc6c36793162a78219482e2683426,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,63990dabb7eb612516c72de3706c1f5754f10f8986a009e2c0dc5e79ea6257c4,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,0.016411781311035156,0.0167083740234375,0.019654512405395508,0.019991397857666016,0.019420862197875977,0.019756793975830078,0.018632888793945312,0.04755210876464844,0.016327857971191406,0.18869900703430176,0.18974971771240234,0.07191228866577148,1.0424895286560059,0.19492292404174805 +31,refs/heads/master,c8219ee401dd1f5feac814af4f6294e7d57abe2b,eb9ac19efb822f141aa71fbe3495f428a889ae55,8aeca53cc5da2e39fcd102387343c5d6b40f0213,,c75efdd969445a5e814073b74bb4b2806bf1d2c9c3c29451bbe5c17babc5d863,Tests_passed,bc57d9d0286bb6c4014169bc7bc51d76cafa243431b1ea2ec64543bf9c1693c0,Tests_passed,True,True,True,True,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,ed2df67aedc4ffbb82edb454603361e2712dc6c36793162a78219482e2683426,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,63990dabb7eb612516c72de3706c1f5754f10f8986a009e2c0dc5e79ea6257c4,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,0.016411781311035156,0.0167083740234375,0.019654512405395508,0.019991397857666016,0.019420862197875977,0.019756793975830078,0.018632888793945312,0.04755210876464844,0.016327857971191406,0.18259263038635254,0.18665003776550293,0.07191228866577148,1.0424895286560059,0.19492292404174805 diff --git a/results/combined/merges_timed/kohsuke/access-modifier.csv b/results/combined/merges_timed/kohsuke/access-modifier.csv index 1eb2a7a020..a9a7f7cc32 100644 --- a/results/combined/merges_timed/kohsuke/access-modifier.csv +++ b/results/combined/merges_timed/kohsuke/access-modifier.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/remotes/origin/pull/52,38876ed95a6d2e7c44d433fd0cc347ba6131907a,dc8ec3bf1c16e3ffeb9909f74fc56a124a76ee82,0d849fdb7804e5fdbe23c73fdfedab89c9ca4aa0,,True,True,1bf7715248dbf26db4ce507496002d27d4a403eb73736847e082cf4a386ee068,Tests_passed,57eadde338c7c5b167b02b0571cb005cb8f935462f4fe09edba18d179487510f,Tests_passed,True,True,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,b0a5a231cc11a944ac3b4c50bbf2bbb685398bf4600f99bf6c0578443cf24547,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1a3e82f1f6f58d95181c9aabfd2757e8a967730314b0221fa7f6878298a37255,Merge_failed,1a3e82f1f6f58d95181c9aabfd2757e8a967730314b0221fa7f6878298a37255,Merge_failed,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,f28cccb04b6c10bded8dc449c399f994256fbcd102360c7385394d58075a1476,Merge_failed,6c365e1a7378ebb22328ff93bb668b421b6567e7c8f6fc20d2469bf7a04a6c73,0.054320335388183594,0.045144081115722656,0.052400827407836914,0.04250025749206543,0.0480961799621582,0.046134233474731445,0.04922771453857422,0.3003063201904297,0.08228540420532227,0.23328018188476562,0.2323145866394043,0.2335798740386963,1.7428174018859863,0.22178363800048828 +32,refs/remotes/origin/pull/52,38876ed95a6d2e7c44d433fd0cc347ba6131907a,dc8ec3bf1c16e3ffeb9909f74fc56a124a76ee82,0d849fdb7804e5fdbe23c73fdfedab89c9ca4aa0,,True,True,1bf7715248dbf26db4ce507496002d27d4a403eb73736847e082cf4a386ee068,Tests_passed,57eadde338c7c5b167b02b0571cb005cb8f935462f4fe09edba18d179487510f,Tests_passed,True,True,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,b0a5a231cc11a944ac3b4c50bbf2bbb685398bf4600f99bf6c0578443cf24547,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1a3e82f1f6f58d95181c9aabfd2757e8a967730314b0221fa7f6878298a37255,Merge_failed,1a3e82f1f6f58d95181c9aabfd2757e8a967730314b0221fa7f6878298a37255,Merge_failed,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,f28cccb04b6c10bded8dc449c399f994256fbcd102360c7385394d58075a1476,Merge_failed,6c365e1a7378ebb22328ff93bb668b421b6567e7c8f6fc20d2469bf7a04a6c73,0.054320335388183594,0.045144081115722656,0.052400827407836914,0.04250025749206543,0.0480961799621582,0.046134233474731445,0.04922771453857422,0.3003063201904297,0.08228540420532227,0.22588372230529785,0.22537899017333984,0.2335798740386963,1.7428174018859863,0.22178363800048828 diff --git a/results/combined/merges_timed/kohsuke/file-leak-detector.csv b/results/combined/merges_timed/kohsuke/file-leak-detector.csv index 4f13c60d90..7911f70ab4 100644 --- a/results/combined/merges_timed/kohsuke/file-leak-detector.csv +++ b/results/combined/merges_timed/kohsuke/file-leak-detector.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,d76ad63466cf23012237a78f23d30f6885072c4e,d2c1e07c9626c495fea7c7c9aaee7aa30c2e96d2,24f774257f6c21a70b3ed0d0cb28970370149aa9,,a653ee396855d20affe93ff72068e8c5f3cf09fbf855a7721888ffd492913a3d,Tests_passed,d13c3ebc8f84e90a432b0d7aa35f6159adc45a29efbe3e510b7529055b51ae36,Tests_passed,True,True,True,True,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,24e0f2653fe1fdbcdc7f63d5f736d942c0185eb9d549a878c5eed7b03ea73587,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,248d4574cf64c137ef69aeddca65a3b5c21cd2bcbd1c0d6e0a9e80696bbd78b6,Merge_failed,248d4574cf64c137ef69aeddca65a3b5c21cd2bcbd1c0d6e0a9e80696bbd78b6,Merge_failed,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,16a206466ea98bd84d957ccec31a41f40b07a9b70bcc9785c329873ba4a68525,Merge_failed,d815cc8544166c5f21d97e070672de3439a71a3c2b0eeb3097dae3922acbf427,0.04591536521911621,0.04432392120361328,0.04338550567626953,0.038152217864990234,0.03096747398376465,0.043947458267211914,0.04537844657897949,0.28107142448425293,0.08196544647216797,0.30872678756713867,0.3086109161376953,0.22930526733398438,1.6485943794250488,0.21538925170898438 +6,refs/heads/master,d76ad63466cf23012237a78f23d30f6885072c4e,d2c1e07c9626c495fea7c7c9aaee7aa30c2e96d2,24f774257f6c21a70b3ed0d0cb28970370149aa9,,a653ee396855d20affe93ff72068e8c5f3cf09fbf855a7721888ffd492913a3d,Tests_passed,d13c3ebc8f84e90a432b0d7aa35f6159adc45a29efbe3e510b7529055b51ae36,Tests_passed,True,True,True,True,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,24e0f2653fe1fdbcdc7f63d5f736d942c0185eb9d549a878c5eed7b03ea73587,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,248d4574cf64c137ef69aeddca65a3b5c21cd2bcbd1c0d6e0a9e80696bbd78b6,Merge_failed,248d4574cf64c137ef69aeddca65a3b5c21cd2bcbd1c0d6e0a9e80696bbd78b6,Merge_failed,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,16a206466ea98bd84d957ccec31a41f40b07a9b70bcc9785c329873ba4a68525,Merge_failed,d815cc8544166c5f21d97e070672de3439a71a3c2b0eeb3097dae3922acbf427,0.04591536521911621,0.04432392120361328,0.04338550567626953,0.038152217864990234,0.03096747398376465,0.043947458267211914,0.04537844657897949,0.28107142448425293,0.08196544647216797,0.3036844730377197,0.30390477180480957,0.22930526733398438,1.6485943794250488,0.21538925170898438 diff --git a/results/combined/merges_timed/kohsuke/github-api.csv b/results/combined/merges_timed/kohsuke/github-api.csv index c4363c9b73..04b2ca1d74 100644 --- a/results/combined/merges_timed/kohsuke/github-api.csv +++ b/results/combined/merges_timed/kohsuke/github-api.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/main,ea17ade038c1d67b617afe3943ebf62f22bc08fb,dc0a8fa788f6858f2b04eaf5659ae9124e59ef27,38baf5df845a1397522e1e953b84a80fb57a8799,,True,True,467cf4caf9ae4d4d49ebf23339d479dc2e92116fa2a92aeddd501361bc0af8ef,Tests_passed,3a597c16e497798b3f9729c32f4a3a693476bef980ae96e9b9ca9d0f89264f3a,Tests_passed,True,True,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,b722f387b19522deac6d7c727dbe5e28ff6955d8c8a96fd6f6b79e10e62f82b7,Tests_passed,b722f387b19522deac6d7c727dbe5e28ff6955d8c8a96fd6f6b79e10e62f82b7,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,0.039922475814819336,0.04012465476989746,0.05130577087402344,0.051682233810424805,0.05168867111206055,0.05164790153503418,0.051000118255615234,0.11913061141967773,0.04107260704040527,0.440593957901001,0.43341779708862305,0.15013384819030762,0.04344534873962402,0.5229864120483398 +16,refs/heads/main,ea17ade038c1d67b617afe3943ebf62f22bc08fb,dc0a8fa788f6858f2b04eaf5659ae9124e59ef27,38baf5df845a1397522e1e953b84a80fb57a8799,,True,True,467cf4caf9ae4d4d49ebf23339d479dc2e92116fa2a92aeddd501361bc0af8ef,Tests_passed,3a597c16e497798b3f9729c32f4a3a693476bef980ae96e9b9ca9d0f89264f3a,Tests_passed,True,True,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,b722f387b19522deac6d7c727dbe5e28ff6955d8c8a96fd6f6b79e10e62f82b7,Tests_passed,b722f387b19522deac6d7c727dbe5e28ff6955d8c8a96fd6f6b79e10e62f82b7,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,0.039922475814819336,0.04012465476989746,0.05130577087402344,0.051682233810424805,0.05168867111206055,0.05164790153503418,0.051000118255615234,0.11913061141967773,0.04107260704040527,0.4336850643157959,0.43039512634277344,0.15013384819030762,0.04344534873962402,0.5229864120483398 diff --git a/results/combined/merges_timed/kohsuke/groovy-sandbox.csv b/results/combined/merges_timed/kohsuke/groovy-sandbox.csv index 7034848ed4..8e176f9d78 100644 --- a/results/combined/merges_timed/kohsuke/groovy-sandbox.csv +++ b/results/combined/merges_timed/kohsuke/groovy-sandbox.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,6c8ab911380474724b7b1649c644e02ac55bf599,017bd009294c4fcb56474260f6c0358bbad252e7,b84b9562056b0feec65db9a5201403ea3a4da459,,True,True,0ae83806fa3cad134491cb38880b788ae90d1f11d5db56f676ec4dd447257d5e,Tests_passed,06a143fef81af841cb8430dcce5bd698373848e343d104c8578a0158f6f78cd2,Tests_passed,True,True,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,8cfdcf4a88d9108833defeb9913fc2deef791bee23f42ece31192718dfbedf31,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,f22cd11cc0cb778217504d7cbcd49f503cbf83b010981c2f8e16bd90cdcac0d3,Merge_failed,f22cd11cc0cb778217504d7cbcd49f503cbf83b010981c2f8e16bd90cdcac0d3,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,1bdb73d44389acc51c5b13cd87d75f0412e10c1d2c6133832477dd1d5b498c67,0.010083198547363281,0.010113239288330078,0.01108694076538086,0.010507583618164062,0.01047062873840332,0.01032257080078125,0.0107879638671875,0.03603506088256836,0.015025615692138672,0.13849449157714844,0.11800408363342285,0.06712484359741211,1.4739878177642822,0.1599724292755127 +3,refs/heads/master,6c8ab911380474724b7b1649c644e02ac55bf599,017bd009294c4fcb56474260f6c0358bbad252e7,b84b9562056b0feec65db9a5201403ea3a4da459,,True,True,0ae83806fa3cad134491cb38880b788ae90d1f11d5db56f676ec4dd447257d5e,Tests_passed,06a143fef81af841cb8430dcce5bd698373848e343d104c8578a0158f6f78cd2,Tests_passed,True,True,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,8cfdcf4a88d9108833defeb9913fc2deef791bee23f42ece31192718dfbedf31,Merge_failed,3e0c1cbaa7516bb1f0050d825fa451045dabcd64b6624f5505e45c39d5d5d5a9,Merge_failed,f22cd11cc0cb778217504d7cbcd49f503cbf83b010981c2f8e16bd90cdcac0d3,Merge_failed,f22cd11cc0cb778217504d7cbcd49f503cbf83b010981c2f8e16bd90cdcac0d3,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,1bdb73d44389acc51c5b13cd87d75f0412e10c1d2c6133832477dd1d5b498c67,0.010083198547363281,0.010113239288330078,0.01108694076538086,0.010507583618164062,0.01047062873840332,0.01032257080078125,0.0107879638671875,0.03603506088256836,0.015025615692138672,0.13473892211914062,0.12444281578063965,0.06712484359741211,1.4739878177642822,0.1599724292755127 diff --git a/results/combined/merges_timed/kohsuke/libpam4j.csv b/results/combined/merges_timed/kohsuke/libpam4j.csv index 057c865c0a..5f4396a401 100644 --- a/results/combined/merges_timed/kohsuke/libpam4j.csv +++ b/results/combined/merges_timed/kohsuke/libpam4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,43d35c217451951500d0cb1246602c42494f7a28,02ffdff218283629ba4a902e7fe2fd44646abc21,ef7b1229da5f41c7119e50dcef04befac3e7104f,,81c7b7e54b68fb0dc7b5cad970618eda54cbfb1d543f16a4b509ac894fec1729,Tests_passed,de6b809ef9ff0c032039c7920ef1579b17afd63e0cc2bb58cb1590b2df7b53e9,Tests_passed,True,True,True,True,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,097475a253454f650502dcae3858f4f94003d9c493589516a53c27c26c6045eb,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,74368ea9170faf44f82378276ce9ca0317748f5c84f331a4dcc78b5dd270f5dc,Merge_failed,74368ea9170faf44f82378276ce9ca0317748f5c84f331a4dcc78b5dd270f5dc,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,4227177f380a169dd0a2e1b54131f2838fdaa13bd90b2f1b4bb5e19ab9f4882e,Merge_failed,663cb42656fcca760ed7ffd19d5d029a2a80ede6ab0bf66facfa2262a3eee5ca,0.03841137886047363,0.04195261001586914,0.036437273025512695,0.03880620002746582,0.038878679275512695,0.04119539260864258,0.035227298736572266,0.2265949249267578,0.07470870018005371,0.06416630744934082,0.0642545223236084,0.1753983497619629,0.6626889705657959,0.1863398551940918 +1,refs/heads/master,43d35c217451951500d0cb1246602c42494f7a28,02ffdff218283629ba4a902e7fe2fd44646abc21,ef7b1229da5f41c7119e50dcef04befac3e7104f,,81c7b7e54b68fb0dc7b5cad970618eda54cbfb1d543f16a4b509ac894fec1729,Tests_passed,de6b809ef9ff0c032039c7920ef1579b17afd63e0cc2bb58cb1590b2df7b53e9,Tests_passed,True,True,True,True,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,097475a253454f650502dcae3858f4f94003d9c493589516a53c27c26c6045eb,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,74368ea9170faf44f82378276ce9ca0317748f5c84f331a4dcc78b5dd270f5dc,Merge_failed,74368ea9170faf44f82378276ce9ca0317748f5c84f331a4dcc78b5dd270f5dc,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,4227177f380a169dd0a2e1b54131f2838fdaa13bd90b2f1b4bb5e19ab9f4882e,Merge_failed,663cb42656fcca760ed7ffd19d5d029a2a80ede6ab0bf66facfa2262a3eee5ca,0.03841137886047363,0.04195261001586914,0.036437273025512695,0.03880620002746582,0.038878679275512695,0.04119539260864258,0.035227298736572266,0.2265949249267578,0.07470870018005371,0.06293177604675293,0.06274914741516113,0.1753983497619629,0.6626889705657959,0.1863398551940918 diff --git a/results/combined/merges_timed/kohsuke/winp.csv b/results/combined/merges_timed/kohsuke/winp.csv index feb87d5218..f57d46b31c 100644 --- a/results/combined/merges_timed/kohsuke/winp.csv +++ b/results/combined/merges_timed/kohsuke/winp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,a9e44d3094143e4bf8e892f3d5e4fa5a12dc6016,a95c8dba746547b90c2a273de5d0355624db521e,7a3043b5436d2208b75c64757085397834da92b3,,True,True,72aaa5f2cc0212835074c0d5d2f25bd9cf6354040970a5d06884d3535fd4777a,Tests_passed,e3ef25d1eae44c12f5ce1f0591a95dc739af299d75340f1deaa30982d1054fdd,Tests_passed,True,True,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,1071ef40ff8edb45fc3108615ed73004fdd6a847f0d9f180ef5aa687a0fb6e84,Tests_passed,121daeb51621294bb77f2547f7c1d1bc6e2575698e458ed3a8920e0ee5f168cf,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,0.04798579216003418,0.049063682556152344,0.04556083679199219,0.05375337600708008,0.042247772216796875,0.04674720764160156,0.044332265853881836,0.29398608207702637,0.04653286933898926,0.30558156967163086,0.30477428436279297,0.2271261215209961,1.5001187324523926,0.1971292495727539 +6,refs/heads/master,a9e44d3094143e4bf8e892f3d5e4fa5a12dc6016,a95c8dba746547b90c2a273de5d0355624db521e,7a3043b5436d2208b75c64757085397834da92b3,,True,True,72aaa5f2cc0212835074c0d5d2f25bd9cf6354040970a5d06884d3535fd4777a,Tests_passed,e3ef25d1eae44c12f5ce1f0591a95dc739af299d75340f1deaa30982d1054fdd,Tests_passed,True,True,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,1071ef40ff8edb45fc3108615ed73004fdd6a847f0d9f180ef5aa687a0fb6e84,Tests_passed,121daeb51621294bb77f2547f7c1d1bc6e2575698e458ed3a8920e0ee5f168cf,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,0.04798579216003418,0.049063682556152344,0.04556083679199219,0.05375337600708008,0.042247772216796875,0.04674720764160156,0.044332265853881836,0.29398608207702637,0.04653286933898926,0.2997775077819824,0.3023488521575928,0.2271261215209961,1.5001187324523926,0.1971292495727539 diff --git a/results/combined/merges_timed/kolorobot/spring-mvc-quickstart-archetype.csv b/results/combined/merges_timed/kolorobot/spring-mvc-quickstart-archetype.csv index e5868c841f..b68c73456b 100644 --- a/results/combined/merges_timed/kolorobot/spring-mvc-quickstart-archetype.csv +++ b/results/combined/merges_timed/kolorobot/spring-mvc-quickstart-archetype.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,78c6fba5414281cddde8139a83318aeb0a6dc9ec,d806f03e7a360c67e709c49706911c7dfca7ab98,60c85b75e09af9ef6ba466f20117cb88755bc234,,True,True,7311fcb93550e1e073ea621985d3777de76dc658ad5d91abfd3d0ec5e23bdb0f,Tests_passed,7a4fd0a7abc0e491bb865f0686176b40d2b9f9079fd08e4b0f787e3ee4660503,Tests_passed,True,True,Merge_failed,de102673c190f93c5d2f18ac12f94aabb472ec20f8cf042223433448ed770dd4,Merge_failed,ca9e7e8c43f7eaf7a7b00431a00153ba3e9788bf55855ccdfe7976b26560cef8,Merge_failed,de102673c190f93c5d2f18ac12f94aabb472ec20f8cf042223433448ed770dd4,Merge_failed,ca9e7e8c43f7eaf7a7b00431a00153ba3e9788bf55855ccdfe7976b26560cef8,Merge_failed,c1992833c28d2a18d9e9958e38e78da4a9862c59ab9c9a76dcd153f104c981c5,Merge_failed,c1992833c28d2a18d9e9958e38e78da4a9862c59ab9c9a76dcd153f104c981c5,Merge_failed,de102673c190f93c5d2f18ac12f94aabb472ec20f8cf042223433448ed770dd4,Merge_failed,5763bae2fd08b4b0f210fa432b1a7f39a269098a293f54058ad0204f2b17194b,Merge_failed,de102673c190f93c5d2f18ac12f94aabb472ec20f8cf042223433448ed770dd4,Merge_failed,cf28e3aa5de9a76d4093c20eb3ed539700b67581191ee87fb91bde3a46d00091,Merge_failed,cf28e3aa5de9a76d4093c20eb3ed539700b67581191ee87fb91bde3a46d00091,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,8f9fc3c1cc81a45b91cde1057a3ad68622f5f78c283bf3c318af772d4c3081ea,Merge_failed,351c29d4f4053c3e0ede98aeca5d64a87b28d83dc2962a734447ae00912afb2d,0.036749839782714844,0.03270149230957031,0.03316831588745117,0.022630691528320312,0.039559125900268555,0.027948617935180664,0.03374981880187988,0.309201717376709,0.08767819404602051,0.08272790908813477,0.08256030082702637,0.2893192768096924,0.5068464279174805,0.19373750686645508 +18,refs/heads/master,78c6fba5414281cddde8139a83318aeb0a6dc9ec,d806f03e7a360c67e709c49706911c7dfca7ab98,60c85b75e09af9ef6ba466f20117cb88755bc234,,True,True,7311fcb93550e1e073ea621985d3777de76dc658ad5d91abfd3d0ec5e23bdb0f,Tests_passed,7a4fd0a7abc0e491bb865f0686176b40d2b9f9079fd08e4b0f787e3ee4660503,Tests_passed,True,True,Merge_failed,de102673c190f93c5d2f18ac12f94aabb472ec20f8cf042223433448ed770dd4,Merge_failed,ca9e7e8c43f7eaf7a7b00431a00153ba3e9788bf55855ccdfe7976b26560cef8,Merge_failed,de102673c190f93c5d2f18ac12f94aabb472ec20f8cf042223433448ed770dd4,Merge_failed,ca9e7e8c43f7eaf7a7b00431a00153ba3e9788bf55855ccdfe7976b26560cef8,Merge_failed,c1992833c28d2a18d9e9958e38e78da4a9862c59ab9c9a76dcd153f104c981c5,Merge_failed,c1992833c28d2a18d9e9958e38e78da4a9862c59ab9c9a76dcd153f104c981c5,Merge_failed,de102673c190f93c5d2f18ac12f94aabb472ec20f8cf042223433448ed770dd4,Merge_failed,5763bae2fd08b4b0f210fa432b1a7f39a269098a293f54058ad0204f2b17194b,Merge_failed,de102673c190f93c5d2f18ac12f94aabb472ec20f8cf042223433448ed770dd4,Merge_failed,cf28e3aa5de9a76d4093c20eb3ed539700b67581191ee87fb91bde3a46d00091,Merge_failed,cf28e3aa5de9a76d4093c20eb3ed539700b67581191ee87fb91bde3a46d00091,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,8f9fc3c1cc81a45b91cde1057a3ad68622f5f78c283bf3c318af772d4c3081ea,Merge_failed,351c29d4f4053c3e0ede98aeca5d64a87b28d83dc2962a734447ae00912afb2d,0.036749839782714844,0.03270149230957031,0.03316831588745117,0.022630691528320312,0.039559125900268555,0.027948617935180664,0.03374981880187988,0.309201717376709,0.08767819404602051,0.08279109001159668,0.08260154724121094,0.2893192768096924,0.5068464279174805,0.19373750686645508 diff --git a/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv b/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv index ff7cf70336..477a5c65c3 100644 --- a/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv +++ b/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,b536174c01bb4f98681e9cc8940e0be97436b00a,7d4d9b6378fe436d8a68540cd75c811bc3220392,5a222d4b2483d5ed946d6cc34db5f8aedf15ebc7,,True,True,ce7ddf26a009ac69110f813c2ca8911a1c19a9a26c58a7d0525bf66660e47e46,Tests_passed,ffe71aec2cc0ebd6fa9539eb48341e6480545d1880180937f0276d7aae6068ea,Tests_passed,True,True,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,0.04315304756164551,0.04300189018249512,0.04588913917541504,0.043981313705444336,0.04311037063598633,0.03789401054382324,0.043642520904541016,0.1701362133026123,0.04337334632873535,0.15709543228149414,0.1559896469116211,0.11525964736938477,0.9798083305358887,0.18494272232055664 +5,refs/heads/master,b536174c01bb4f98681e9cc8940e0be97436b00a,7d4d9b6378fe436d8a68540cd75c811bc3220392,5a222d4b2483d5ed946d6cc34db5f8aedf15ebc7,,True,True,ce7ddf26a009ac69110f813c2ca8911a1c19a9a26c58a7d0525bf66660e47e46,Tests_passed,ffe71aec2cc0ebd6fa9539eb48341e6480545d1880180937f0276d7aae6068ea,Tests_passed,True,True,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,0.04315304756164551,0.04300189018249512,0.04588913917541504,0.043981313705444336,0.04311037063598633,0.03789401054382324,0.043642520904541016,0.1701362133026123,0.04337334632873535,0.15532803535461426,0.1549530029296875,0.11525964736938477,0.9798083305358887,0.18494272232055664 diff --git a/results/combined/merges_timed/komoot/photon.csv b/results/combined/merges_timed/komoot/photon.csv index 75bf1c6612..6b949ed4a3 100644 --- a/results/combined/merges_timed/komoot/photon.csv +++ b/results/combined/merges_timed/komoot/photon.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -57,refs/heads/master,e278ace2cb84789adb9af30d186f0f123170901b,e4a024eee0e4f0e9c610a786258a2ad45c1773ec,4c417c57120553f5ec0e0ef18440e80fac0f1d79,,True,True,ccae829e89e397eec0f774bc8ad65456d564cf6fd326ad5f71eb0b1988a27d7e,Tests_passed,137899cd882d0ae5aa68dc9449e0e49328abbc8a6c0875413c2d4a81a0b9a74e,Tests_passed,True,True,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,0.03969693183898926,0.044770002365112305,0.04146122932434082,0.012295007705688477,0.04219794273376465,0.0485837459564209,0.031783342361450195,0.17185330390930176,0.04302406311035156,0.15932583808898926,0.156494140625,0.12437248229980469,0.961965799331665,0.21040058135986328 +57,refs/heads/master,e278ace2cb84789adb9af30d186f0f123170901b,e4a024eee0e4f0e9c610a786258a2ad45c1773ec,4c417c57120553f5ec0e0ef18440e80fac0f1d79,,True,True,ccae829e89e397eec0f774bc8ad65456d564cf6fd326ad5f71eb0b1988a27d7e,Tests_passed,137899cd882d0ae5aa68dc9449e0e49328abbc8a6c0875413c2d4a81a0b9a74e,Tests_passed,True,True,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,0.03969693183898926,0.044770002365112305,0.04146122932434082,0.012295007705688477,0.04219794273376465,0.0485837459564209,0.031783342361450195,0.17185330390930176,0.04302406311035156,0.1599421501159668,0.15297317504882812,0.12437248229980469,0.961965799331665,0.21040058135986328 diff --git a/results/combined/merges_timed/kong/unirest-java.csv b/results/combined/merges_timed/kong/unirest-java.csv index f3c135e87f..7cc57cb304 100644 --- a/results/combined/merges_timed/kong/unirest-java.csv +++ b/results/combined/merges_timed/kong/unirest-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,Tests_passed,True,True,True,True,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,0.037122249603271484,0.043419837951660156,0.04746103286743164,0.05024886131286621,0.04902911186218262,0.04300355911254883,0.04208111763000488,0.16981816291809082,0.04526352882385254,0.15925073623657227,0.15832781791687012,0.10572075843811035,1.1297626495361328,0.203416109085083 +79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,Tests_passed,True,True,True,True,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,0.037122249603271484,0.043419837951660156,0.04746103286743164,0.05024886131286621,0.04902911186218262,0.04300355911254883,0.04208111763000488,0.16981816291809082,0.04526352882385254,0.15718507766723633,0.15737032890319824,0.10572075843811035,1.1297626495361328,0.203416109085083 diff --git a/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv b/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv index 091119b399..e7ff5ba386 100644 --- a/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv +++ b/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -209,refs/heads/master,b660556c9bc78d80956d4ac8822b02e41df004eb,2fdf5a9be085e7fa759f6dc50a9ff9564ade0e51,863a9a07c45b2558ff2b3580235df610c0c02ab7,,12e67b77a2a920ac89fad2a579437585962a7153688a19db47e4a5f7787f6ecf,Tests_passed,59d0150ba30f06e66d8303efb234def7d768ed46980dcd57b138659ffcff9690,Tests_passed,True,True,True,True,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,4a39f48bfcdfcc8ef0ec70c1ad3c12334273dcd4cea271e9708f138859120210,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,0.04343676567077637,0.044973134994506836,0.046799659729003906,0.051688194274902344,0.043250322341918945,0.04862403869628906,0.03549051284790039,0.22507095336914062,0.042380571365356445,0.1458144187927246,0.14636015892028809,0.16758990287780762,0.5186989307403564,0.22381830215454102 +209,refs/heads/master,b660556c9bc78d80956d4ac8822b02e41df004eb,2fdf5a9be085e7fa759f6dc50a9ff9564ade0e51,863a9a07c45b2558ff2b3580235df610c0c02ab7,,12e67b77a2a920ac89fad2a579437585962a7153688a19db47e4a5f7787f6ecf,Tests_passed,59d0150ba30f06e66d8303efb234def7d768ed46980dcd57b138659ffcff9690,Tests_passed,True,True,True,True,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,Tests_passed,4a39f48bfcdfcc8ef0ec70c1ad3c12334273dcd4cea271e9708f138859120210,Tests_passed,d64264680a2e6ed066e19a6daddc05228a0a71021475dfb06805c74679918e88,0.04343676567077637,0.044973134994506836,0.046799659729003906,0.051688194274902344,0.043250322341918945,0.04862403869628906,0.03549051284790039,0.22507095336914062,0.042380571365356445,0.14352869987487793,0.14451909065246582,0.16758990287780762,0.5186989307403564,0.22381830215454102 diff --git a/results/combined/merges_timed/konloch/bytecode-viewer.csv b/results/combined/merges_timed/konloch/bytecode-viewer.csv index 293554793b..d472466963 100644 --- a/results/combined/merges_timed/konloch/bytecode-viewer.csv +++ b/results/combined/merges_timed/konloch/bytecode-viewer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,Tests_passed,True,True,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,4fd9f52a9dac1d2dc4f3f63be32c49ee58e1a3bf1bdb7b50e4843a3c28a806d7,Tests_passed,4fd9f52a9dac1d2dc4f3f63be32c49ee58e1a3bf1bdb7b50e4843a3c28a806d7,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,0.06708502769470215,0.07103109359741211,0.09766840934753418,0.11073470115661621,0.09166812896728516,0.11584758758544922,0.11857247352600098,0.17255091667175293,0.07530403137207031,0.24121785163879395,0.20323872566223145,0.14069533348083496,1.034867286682129,0.8183434009552002 +85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,Tests_passed,True,True,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,4fd9f52a9dac1d2dc4f3f63be32c49ee58e1a3bf1bdb7b50e4843a3c28a806d7,Tests_passed,4fd9f52a9dac1d2dc4f3f63be32c49ee58e1a3bf1bdb7b50e4843a3c28a806d7,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,0.06708502769470215,0.07103109359741211,0.09766840934753418,0.11073470115661621,0.09166812896728516,0.11584758758544922,0.11857247352600098,0.17255091667175293,0.07530403137207031,0.21434688568115234,0.2429671287536621,0.14069533348083496,1.034867286682129,0.8183434009552002 diff --git a/results/combined/merges_timed/koraktor/mavanagaiata.csv b/results/combined/merges_timed/koraktor/mavanagaiata.csv index 462db9044a..29a7b31510 100644 --- a/results/combined/merges_timed/koraktor/mavanagaiata.csv +++ b/results/combined/merges_timed/koraktor/mavanagaiata.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -302,refs/heads/master,3db986aced967917053dd5fad68a469976a6b27a,f563642bf7a24d3986336b775b25f974f2feb668,f40e69b670f030e802a393d7b4fe433bef727048,,True,True,9c44ab4b04d70ae7b0b220c250f3ec3ac8bb2200b7a18d149ec99996b1a48bbf,Tests_passed,90bdfb521679d1c76f68d7af3154fb6ae3a44deb8ba3bb2bb2d8c8eabf44018f,Tests_passed,True,True,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,a9fb09ca234ec6bcd8ba2ad5471ec78f1961302d5182307ab650d50943ab066f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,8617bda1b36309b9de5652621feba9588beb9c60b7d4406c4c24deeec437b843,Merge_failed,8617bda1b36309b9de5652621feba9588beb9c60b7d4406c4c24deeec437b843,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,43f782019eb2d119ae7055076acefdda0f09965be69a43826bf1d4b5129224b9,0.04230332374572754,0.04645514488220215,0.043282270431518555,0.041069746017456055,0.04003119468688965,0.042981863021850586,0.04601168632507324,0.30267786979675293,0.07240009307861328,0.3847920894622803,0.3824632167816162,0.22935795783996582,2.206728219985962,0.20805907249450684 +302,refs/heads/master,3db986aced967917053dd5fad68a469976a6b27a,f563642bf7a24d3986336b775b25f974f2feb668,f40e69b670f030e802a393d7b4fe433bef727048,,True,True,9c44ab4b04d70ae7b0b220c250f3ec3ac8bb2200b7a18d149ec99996b1a48bbf,Tests_passed,90bdfb521679d1c76f68d7af3154fb6ae3a44deb8ba3bb2bb2d8c8eabf44018f,Tests_passed,True,True,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,a9fb09ca234ec6bcd8ba2ad5471ec78f1961302d5182307ab650d50943ab066f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,8617bda1b36309b9de5652621feba9588beb9c60b7d4406c4c24deeec437b843,Merge_failed,8617bda1b36309b9de5652621feba9588beb9c60b7d4406c4c24deeec437b843,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,43f782019eb2d119ae7055076acefdda0f09965be69a43826bf1d4b5129224b9,0.04230332374572754,0.04645514488220215,0.043282270431518555,0.041069746017456055,0.04003119468688965,0.042981863021850586,0.04601168632507324,0.30267786979675293,0.07240009307861328,0.3723745346069336,0.37155771255493164,0.22935795783996582,2.206728219985962,0.20805907249450684 diff --git a/results/combined/merges_timed/koraktor/steam-condenser-java.csv b/results/combined/merges_timed/koraktor/steam-condenser-java.csv index a77a294a7a..3f18e62aef 100644 --- a/results/combined/merges_timed/koraktor/steam-condenser-java.csv +++ b/results/combined/merges_timed/koraktor/steam-condenser-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,7845353108a43162e5ead8a94fdebc8c21cfa0d4,eabb0f338a3d47c5e52dcf013d2c70c64f271fa8,8b8e64b32595b92b41e81ebd8cdbb7ea27e62744,,True,True,62971e708638bb2214a743cc3d10735353583d37c43950d42d2a0a6f2bd2c809,Tests_passed,080569ab758b6e35afe3b1a657f05814af2837487a611712681ed03e44c77b47,Tests_passed,True,True,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,ab95fe99158922fc148375eba73e706b4ecdd4846ccab19a596367e758106e39,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Merge_failed,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Merge_failed,acd9d68b2abcfe9d6f56d8fa41bc599a02914f7bfb80448d1edaaed769434880,0.03427696228027344,0.04236006736755371,0.04978036880493164,0.046817779541015625,0.048789024353027344,0.04136252403259277,0.06044602394104004,0.23542380332946777,0.0735478401184082,0.17888259887695312,0.17426490783691406,0.16191315650939941,1.1355955600738525,0.23304057121276855 +14,refs/heads/master,7845353108a43162e5ead8a94fdebc8c21cfa0d4,eabb0f338a3d47c5e52dcf013d2c70c64f271fa8,8b8e64b32595b92b41e81ebd8cdbb7ea27e62744,,True,True,62971e708638bb2214a743cc3d10735353583d37c43950d42d2a0a6f2bd2c809,Tests_passed,080569ab758b6e35afe3b1a657f05814af2837487a611712681ed03e44c77b47,Tests_passed,True,True,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,ab95fe99158922fc148375eba73e706b4ecdd4846ccab19a596367e758106e39,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Merge_failed,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Merge_failed,acd9d68b2abcfe9d6f56d8fa41bc599a02914f7bfb80448d1edaaed769434880,0.03427696228027344,0.04236006736755371,0.04978036880493164,0.046817779541015625,0.048789024353027344,0.04136252403259277,0.06044602394104004,0.23542380332946777,0.0735478401184082,0.17316794395446777,0.17467880249023438,0.16191315650939941,1.1355955600738525,0.23304057121276855 diff --git a/results/combined/merges_timed/kpelykh/docker-java.csv b/results/combined/merges_timed/kpelykh/docker-java.csv index 7552606022..a8f78e13d6 100644 --- a/results/combined/merges_timed/kpelykh/docker-java.csv +++ b/results/combined/merges_timed/kpelykh/docker-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,44aa4b057604562f10220734507928a05a315526,00ff6ec25af073b30377cb1a860d45f228de3a2e,9cf0799d1aa8c5de44aa7fe8b5336f5b494a9e64,,34788cf84d06f024b167944c7bbd982578b272f9ec9739b6e95a5da9212c468c,Tests_passed,43966615d8feb6d07e6d7f9d119fa1ff45ff0669a9c91f1565d1fb10557c2fa6,Tests_passed,True,True,True,True,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,4954c6e566016081fbfb879940910acec6da259119501ce6e07c85af1e46e0bf,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,4954c6e566016081fbfb879940910acec6da259119501ce6e07c85af1e46e0bf,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,e75e847e96a9a192900e9f801deb41d00a627af7f0fbadef3ed264bfea8de042,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,2470e1b524fa4909cc0e5341dde9fa5123fed31e699ae1c5eaf225257072d9d2,0.009765386581420898,0.009929418563842773,0.010329008102416992,0.009897947311401367,0.00985574722290039,0.00986170768737793,0.009916543960571289,0.03456592559814453,0.014307498931884766,0.18333172798156738,0.18393492698669434,0.06860971450805664,1.3784468173980713,0.1647942066192627 +8,refs/heads/master,44aa4b057604562f10220734507928a05a315526,00ff6ec25af073b30377cb1a860d45f228de3a2e,9cf0799d1aa8c5de44aa7fe8b5336f5b494a9e64,,34788cf84d06f024b167944c7bbd982578b272f9ec9739b6e95a5da9212c468c,Tests_passed,43966615d8feb6d07e6d7f9d119fa1ff45ff0669a9c91f1565d1fb10557c2fa6,Tests_passed,True,True,True,True,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,4954c6e566016081fbfb879940910acec6da259119501ce6e07c85af1e46e0bf,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,4954c6e566016081fbfb879940910acec6da259119501ce6e07c85af1e46e0bf,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Merge_failed,e75e847e96a9a192900e9f801deb41d00a627af7f0fbadef3ed264bfea8de042,Merge_failed,cc9c92ee553884c1fef2946f6657c527b6e1491c76d0fe91597c121af6c595a2,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,2470e1b524fa4909cc0e5341dde9fa5123fed31e699ae1c5eaf225257072d9d2,0.009765386581420898,0.009929418563842773,0.010329008102416992,0.009897947311401367,0.00985574722290039,0.00986170768737793,0.009916543960571289,0.03456592559814453,0.014307498931884766,0.18223881721496582,0.18027019500732422,0.06860971450805664,1.3784468173980713,0.1647942066192627 diff --git a/results/combined/merges_timed/krilivye/jocco.csv b/results/combined/merges_timed/krilivye/jocco.csv index 815c6f5ffb..26de1b651e 100644 --- a/results/combined/merges_timed/krilivye/jocco.csv +++ b/results/combined/merges_timed/krilivye/jocco.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,5994a8ffa7adc1fbe2157b96436ba57f24aa2fa6,60ffba89d1314e432830b72f4e2317437e026a53,a4f324fc56908cce4b83fe50c3c9a873c65f6ea8,,a07bf68c4d038e584872ca8801d93f18d01537ef3223e04bdaccd669ed7b2f02,Tests_passed,48b5eb51e22d9f48cc08f24cee8f8c64813bd909cee17d02615a147878c7ad46,Tests_passed,True,True,True,True,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b7318799ca878001b3b293d664c33b7acdb2bc846f770dbbd5a4f195edefec66,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,a5a3183b98e0a327ebec86a04974dfcb66da71c34481b05cc06271d30ccc81cc,Merge_failed,a5a3183b98e0a327ebec86a04974dfcb66da71c34481b05cc06271d30ccc81cc,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,3c6fcb0da2ce2f7a305ce892c27df90994aea950a4f27803e66c77637ee51c3f,0.044194698333740234,0.03874039649963379,0.03793692588806152,0.03533434867858887,0.04479837417602539,0.03694295883178711,0.043160438537597656,0.14337539672851562,0.06388139724731445,0.06411433219909668,0.06467437744140625,0.12082862854003906,0.7116079330444336,0.19151592254638672 +1,refs/heads/master,5994a8ffa7adc1fbe2157b96436ba57f24aa2fa6,60ffba89d1314e432830b72f4e2317437e026a53,a4f324fc56908cce4b83fe50c3c9a873c65f6ea8,,a07bf68c4d038e584872ca8801d93f18d01537ef3223e04bdaccd669ed7b2f02,Tests_passed,48b5eb51e22d9f48cc08f24cee8f8c64813bd909cee17d02615a147878c7ad46,Tests_passed,True,True,True,True,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b7318799ca878001b3b293d664c33b7acdb2bc846f770dbbd5a4f195edefec66,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,a5a3183b98e0a327ebec86a04974dfcb66da71c34481b05cc06271d30ccc81cc,Merge_failed,a5a3183b98e0a327ebec86a04974dfcb66da71c34481b05cc06271d30ccc81cc,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,3c6fcb0da2ce2f7a305ce892c27df90994aea950a4f27803e66c77637ee51c3f,0.044194698333740234,0.03874039649963379,0.03793692588806152,0.03533434867858887,0.04479837417602539,0.03694295883178711,0.043160438537597656,0.14337539672851562,0.06388139724731445,0.06415057182312012,0.06370878219604492,0.12082862854003906,0.7116079330444336,0.19151592254638672 diff --git a/results/combined/merges_timed/kroimon/bukkit-alphachest.csv b/results/combined/merges_timed/kroimon/bukkit-alphachest.csv index 5876ba4b84..943c6510a9 100644 --- a/results/combined/merges_timed/kroimon/bukkit-alphachest.csv +++ b/results/combined/merges_timed/kroimon/bukkit-alphachest.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,1c06bbbbf3fc168448554fcc274249946e51fd94,efc79103f615ba17590bf69792d62db71cf80945,81fe6cc2b3eecbe7b7bc7fb684f3c24deac0ed5d,,True,True,b3cab0f3dab361400360bfbb00798655603527825cd80f920b7ab13fa0767b02,Tests_passed,0a5facf58326e07d308b75cbb24c1b42b5ef8ff54b7df8b177e94af9d52b47a2,Tests_passed,True,True,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,4e941aec80ff40b52232f60ad81dff25d448b4670ad2e07ec70c1896b31591f8,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,f81672985bad2e53a3321c20fb6eeca2dc9272c9d3951d1b15f4cb6087745ca4,Merge_failed,f81672985bad2e53a3321c20fb6eeca2dc9272c9d3951d1b15f4cb6087745ca4,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Merge_failed,dddfb758798b24d19cdc3b970e9cc2d682040d519173d23117a03cdbd51ead11,0.03632855415344238,0.036281585693359375,0.03887033462524414,0.03686881065368652,0.03792929649353027,0.03360795974731445,0.008396387100219727,0.15924739837646484,0.06222057342529297,0.06454730033874512,0.06485915184020996,0.10961008071899414,0.6278622150421143,0.18670368194580078 +1,refs/heads/master,1c06bbbbf3fc168448554fcc274249946e51fd94,efc79103f615ba17590bf69792d62db71cf80945,81fe6cc2b3eecbe7b7bc7fb684f3c24deac0ed5d,,True,True,b3cab0f3dab361400360bfbb00798655603527825cd80f920b7ab13fa0767b02,Tests_passed,0a5facf58326e07d308b75cbb24c1b42b5ef8ff54b7df8b177e94af9d52b47a2,Tests_passed,True,True,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,4e941aec80ff40b52232f60ad81dff25d448b4670ad2e07ec70c1896b31591f8,Merge_failed,b84ec8ad544d91e8b382a5a3a06eae04ea34328d979289e1483f4d6bce684ce5,Merge_failed,f81672985bad2e53a3321c20fb6eeca2dc9272c9d3951d1b15f4cb6087745ca4,Merge_failed,f81672985bad2e53a3321c20fb6eeca2dc9272c9d3951d1b15f4cb6087745ca4,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Merge_failed,dddfb758798b24d19cdc3b970e9cc2d682040d519173d23117a03cdbd51ead11,0.03632855415344238,0.036281585693359375,0.03887033462524414,0.03686881065368652,0.03792929649353027,0.03360795974731445,0.008396387100219727,0.15924739837646484,0.06222057342529297,0.06149578094482422,0.061835527420043945,0.10961008071899414,0.6278622150421143,0.18670368194580078 diff --git a/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv b/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv index 8026b1e81b..b9e3aa3bda 100644 --- a/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv +++ b/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,31218157e3efd720cd9fc792af1027a6e129dabb,55fa8bff2a05f6bdc8f7d555c566af41d8f7f1e7,c6ec352c54ca0c92a31a0a82805f3feb6e9d8633,,19892ad83d2c86e6fc7caaab7e509cf0279c7ef34cebf16957714717d24922d0,Tests_passed,f95b97f48a36e71c1bb228030ae14a73f07e75d82fc2e94acc247d4cd73b9625,Tests_passed,True,True,True,True,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,d62424b6fabf4ff0d08c441860c72564129add062d159f25738d345149a9e927,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,6d60b232f08f0e49af15570866483a99b312bd40a40cf7b446958b56ff02d830,Merge_failed,6d60b232f08f0e49af15570866483a99b312bd40a40cf7b446958b56ff02d830,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,3dba44ca9ac461b520a81b19b24ca339b1db1b56d33bbf96786648650f57314b,0.008119821548461914,0.00794363021850586,0.007814884185791016,0.007878541946411133,0.0077211856842041016,0.0075681209564208984,0.00789189338684082,0.03163576126098633,0.012984037399291992,0.062255859375,0.06243324279785156,0.06493091583251953,0.6726126670837402,0.15433382987976074 +2,refs/heads/master,31218157e3efd720cd9fc792af1027a6e129dabb,55fa8bff2a05f6bdc8f7d555c566af41d8f7f1e7,c6ec352c54ca0c92a31a0a82805f3feb6e9d8633,,19892ad83d2c86e6fc7caaab7e509cf0279c7ef34cebf16957714717d24922d0,Tests_passed,f95b97f48a36e71c1bb228030ae14a73f07e75d82fc2e94acc247d4cd73b9625,Tests_passed,True,True,True,True,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,d62424b6fabf4ff0d08c441860c72564129add062d159f25738d345149a9e927,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,6d60b232f08f0e49af15570866483a99b312bd40a40cf7b446958b56ff02d830,Merge_failed,6d60b232f08f0e49af15570866483a99b312bd40a40cf7b446958b56ff02d830,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,3dba44ca9ac461b520a81b19b24ca339b1db1b56d33bbf96786648650f57314b,0.008119821548461914,0.00794363021850586,0.007814884185791016,0.007878541946411133,0.0077211856842041016,0.0075681209564208984,0.00789189338684082,0.03163576126098633,0.012984037399291992,0.062161922454833984,0.06222724914550781,0.06493091583251953,0.6726126670837402,0.15433382987976074 diff --git a/results/combined/merges_timed/kstyrc/embedded-redis.csv b/results/combined/merges_timed/kstyrc/embedded-redis.csv index 1c516ef812..f40f9c3c7a 100644 --- a/results/combined/merges_timed/kstyrc/embedded-redis.csv +++ b/results/combined/merges_timed/kstyrc/embedded-redis.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/master,378e7f02666fb1f92c9dd6c75945cec047d22e71,25ab5d2c2c9bf9a8c9986da2418c0a250278facd,84fc8f866cc3231f2f470c7b692f420ff2e8b2a9,,True,True,ff1d5ad2a84fdac8e1cde6917b859eee9f2f0293f27da445c630733854631e63,Tests_passed,b813737b3a3e4451e7a3a14f01079878f40c36beaae1748ebb6b22a8bbefe450,Tests_passed,True,True,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,0.05459928512573242,0.055043697357177734,0.0786890983581543,0.07867932319641113,0.07903099060058594,0.07799029350280762,0.07839345932006836,0.12685441970825195,0.055463552474975586,0.19098663330078125,0.19108104705810547,0.11151480674743652,0.6164476871490479,0.23275160789489746 +26,refs/heads/master,378e7f02666fb1f92c9dd6c75945cec047d22e71,25ab5d2c2c9bf9a8c9986da2418c0a250278facd,84fc8f866cc3231f2f470c7b692f420ff2e8b2a9,,True,True,ff1d5ad2a84fdac8e1cde6917b859eee9f2f0293f27da445c630733854631e63,Tests_passed,b813737b3a3e4451e7a3a14f01079878f40c36beaae1748ebb6b22a8bbefe450,Tests_passed,True,True,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,0.05459928512573242,0.055043697357177734,0.0786890983581543,0.07867932319641113,0.07903099060058594,0.07799029350280762,0.07839345932006836,0.12685441970825195,0.055463552474975586,0.18782329559326172,0.18796658515930176,0.11151480674743652,0.6164476871490479,0.23275160789489746 diff --git a/results/combined/merges_timed/kungfoo/geohash-java.csv b/results/combined/merges_timed/kungfoo/geohash-java.csv index f3620d8078..22e2e52cb2 100644 --- a/results/combined/merges_timed/kungfoo/geohash-java.csv +++ b/results/combined/merges_timed/kungfoo/geohash-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,029fd4411871b99cef71407c432752c570fcfaa2,21ff41630c9dbd40e4674604d8e502b3c58937f1,90a2570b49e559dbe5f96308ae166bca5b3bf78c,,True,True,f650c796a626ec4620a628f8c6ed258b5b390b36e12ade5ee7ea9572119486ab,Tests_passed,c007ff42eb0485334cb1d01ab28248e5973757159bd28d8b33f2513cdaca0f83,Tests_passed,True,True,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,f9de71c4340538eccf9726aef84b126d7688fcaa1d79efe649fe00e6d75aa219,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,96142b3da7b200325691059ab54602781446e3b7f2d07300baa5fc5956b2dc8a,Merge_failed,96142b3da7b200325691059ab54602781446e3b7f2d07300baa5fc5956b2dc8a,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Merge_failed,d1793ff2c388bfee9760b266e2d244967e05f3e1cd7a43d856512ef6eba1babf,0.04041004180908203,0.03872227668762207,0.03928565979003906,0.037358760833740234,0.04120993614196777,0.0361475944519043,0.032424211502075195,0.21016883850097656,0.0628209114074707,0.23546075820922852,0.23154687881469727,0.17875409126281738,2.020763635635376,0.18128061294555664 +12,refs/heads/master,029fd4411871b99cef71407c432752c570fcfaa2,21ff41630c9dbd40e4674604d8e502b3c58937f1,90a2570b49e559dbe5f96308ae166bca5b3bf78c,,True,True,f650c796a626ec4620a628f8c6ed258b5b390b36e12ade5ee7ea9572119486ab,Tests_passed,c007ff42eb0485334cb1d01ab28248e5973757159bd28d8b33f2513cdaca0f83,Tests_passed,True,True,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,f9de71c4340538eccf9726aef84b126d7688fcaa1d79efe649fe00e6d75aa219,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,96142b3da7b200325691059ab54602781446e3b7f2d07300baa5fc5956b2dc8a,Merge_failed,96142b3da7b200325691059ab54602781446e3b7f2d07300baa5fc5956b2dc8a,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Merge_failed,d1793ff2c388bfee9760b266e2d244967e05f3e1cd7a43d856512ef6eba1babf,0.04041004180908203,0.03872227668762207,0.03928565979003906,0.037358760833740234,0.04120993614196777,0.0361475944519043,0.032424211502075195,0.21016883850097656,0.0628209114074707,0.2222435474395752,0.2213423252105713,0.17875409126281738,2.020763635635376,0.18128061294555664 diff --git a/results/combined/merges_timed/kurbatov/firmata4j.csv b/results/combined/merges_timed/kurbatov/firmata4j.csv index ece8c80d29..f548c5a4e6 100644 --- a/results/combined/merges_timed/kurbatov/firmata4j.csv +++ b/results/combined/merges_timed/kurbatov/firmata4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,9722516afce5dc1ea008fb69943435452f0d9711,6dca46a44bcb5e68cd4ed5bdbc7c038a945f8090,8347b46f3a7e5f193fb8204f132edcec14c08759,,True,True,719c27ce57dcf4ec985bc8ee5d7cb8cc24c1096f7e65e547d4f9639941bcf0f6,Tests_passed,0ca0c3883e02c1d044e2b8751c87d26971af452f4c5c97765a04bfcec6a91a31,Tests_passed,True,True,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,0.043005943298339844,0.04506993293762207,0.013389348983764648,0.04519367218017578,0.0523984432220459,0.011439800262451172,0.03736376762390137,0.04983234405517578,0.03650856018066406,0.16123175621032715,0.16114449501037598,0.09946441650390625,1.0930955410003662,0.1889810562133789 +24,refs/heads/master,9722516afce5dc1ea008fb69943435452f0d9711,6dca46a44bcb5e68cd4ed5bdbc7c038a945f8090,8347b46f3a7e5f193fb8204f132edcec14c08759,,True,True,719c27ce57dcf4ec985bc8ee5d7cb8cc24c1096f7e65e547d4f9639941bcf0f6,Tests_passed,0ca0c3883e02c1d044e2b8751c87d26971af452f4c5c97765a04bfcec6a91a31,Tests_passed,True,True,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,0.043005943298339844,0.04506993293762207,0.013389348983764648,0.04519367218017578,0.0523984432220459,0.011439800262451172,0.03736376762390137,0.04983234405517578,0.03650856018066406,0.1631011962890625,0.1623520851135254,0.09946441650390625,1.0930955410003662,0.1889810562133789 diff --git a/results/combined/merges_timed/kvladislav/ticketmanager.csv b/results/combined/merges_timed/kvladislav/ticketmanager.csv index 92da40d7d4..8dae00b7c6 100644 --- a/results/combined/merges_timed/kvladislav/ticketmanager.csv +++ b/results/combined/merges_timed/kvladislav/ticketmanager.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,0ffb612f18bf32b1151d82c321219aa31f901d08,75222d1bfa744f59f417a16bd670579a413b68fd,cc5170a2a39c7439223a358ea30fd1c0136006e6,,True,True,f81997b3a344059a697dc172bcf17edb0405b61aa82cf6076895d88325df6d68,Tests_passed,fc2a4e15996e4f0fb8f610209a90c23c51225563c2a2dee8c5b80b3a731a9933,Tests_passed,True,True,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,0.08465003967285156,0.061246633529663086,0.054303646087646484,0.05151104927062988,0.07663774490356445,0.04426455497741699,0.05216169357299805,0.18009352684020996,0.05439162254333496,0.227250337600708,0.2181839942932129,0.12606573104858398,1.503511667251587,0.2969951629638672 +12,refs/heads/master,0ffb612f18bf32b1151d82c321219aa31f901d08,75222d1bfa744f59f417a16bd670579a413b68fd,cc5170a2a39c7439223a358ea30fd1c0136006e6,,True,True,f81997b3a344059a697dc172bcf17edb0405b61aa82cf6076895d88325df6d68,Tests_passed,fc2a4e15996e4f0fb8f610209a90c23c51225563c2a2dee8c5b80b3a731a9933,Tests_passed,True,True,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,0.08465003967285156,0.061246633529663086,0.054303646087646484,0.05151104927062988,0.07663774490356445,0.04426455497741699,0.05216169357299805,0.18009352684020996,0.05439162254333496,0.21330595016479492,0.20220041275024414,0.12606573104858398,1.503511667251587,0.2969951629638672 diff --git a/results/combined/merges_timed/laforge49/jactor.csv b/results/combined/merges_timed/laforge49/jactor.csv index cf47166d60..faf72dd8f2 100644 --- a/results/combined/merges_timed/laforge49/jactor.csv +++ b/results/combined/merges_timed/laforge49/jactor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,7d728819f4ae8ab3ba288ae10ee8ad69f01cdaa1,075f7d10416824c72519888c61a3488aa5be63b4,c032bd44475cfff2133dbb0ffea73d3ac7dda205,,82c4064bcf7988ff7dcadf04b037899afa99121bf0a1bd201e2d52588b4208ae,Tests_passed,245bf5ad7dfefbcd1b67487c1a6e5ad4caf53e55f1d56a253aafd58d19df63b3,Tests_passed,True,True,True,True,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,0.04442334175109863,0.043888092041015625,0.045567989349365234,0.04126119613647461,0.04208946228027344,0.03536367416381836,0.04481196403503418,0.1636219024658203,0.03852701187133789,0.16651201248168945,0.16830825805664062,0.1097872257232666,0.621612548828125,0.1910691261291504 +1,refs/heads/master,7d728819f4ae8ab3ba288ae10ee8ad69f01cdaa1,075f7d10416824c72519888c61a3488aa5be63b4,c032bd44475cfff2133dbb0ffea73d3ac7dda205,,82c4064bcf7988ff7dcadf04b037899afa99121bf0a1bd201e2d52588b4208ae,Tests_passed,245bf5ad7dfefbcd1b67487c1a6e5ad4caf53e55f1d56a253aafd58d19df63b3,Tests_passed,True,True,True,True,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,0.04442334175109863,0.043888092041015625,0.045567989349365234,0.04126119613647461,0.04208946228027344,0.03536367416381836,0.04481196403503418,0.1636219024658203,0.03852701187133789,0.16501283645629883,0.16469597816467285,0.1097872257232666,0.621612548828125,0.1910691261291504 diff --git a/results/combined/merges_timed/laforge49/jactor2.csv b/results/combined/merges_timed/laforge49/jactor2.csv index bde03eadc0..70cdc25d9b 100644 --- a/results/combined/merges_timed/laforge49/jactor2.csv +++ b/results/combined/merges_timed/laforge49/jactor2.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,3b4eebb16635f02dd3048051e26438d9071c7b92,fec3b93dd0e680380bc11bb029d868e1e2fefde9,9792bcf3370f0b667a09ab6b9bd84e82219738c0,,True,True,6901f8f781ab4dc57d6b2f7f5d29ba23bbc2605c8169c6dc50b72014ae3fbcdc,Tests_passed,869af00b45054df1121746fcf16412c02c214cbcb51eac2729a1d862e78771f4,Tests_passed,True,True,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Merge_failed,14b9bd66adc0c22093e44f4c86da67b573a4eeac6259441bc5965ffe110425eb,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_failed,4568287d7c04e4d7a4c13acc3e68424fc41353ec4e119354fd029e922bd29e3f,0.03725004196166992,0.04851984977722168,0.038925886154174805,0.044777631759643555,0.032631635665893555,0.03399348258972168,0.04030346870422363,0.25691699981689453,0.08461642265319824,0.3030576705932617,0.30208516120910645,0.17222166061401367,1.1422743797302246,0.26490306854248047 +9,refs/heads/master,3b4eebb16635f02dd3048051e26438d9071c7b92,fec3b93dd0e680380bc11bb029d868e1e2fefde9,9792bcf3370f0b667a09ab6b9bd84e82219738c0,,True,True,6901f8f781ab4dc57d6b2f7f5d29ba23bbc2605c8169c6dc50b72014ae3fbcdc,Tests_passed,869af00b45054df1121746fcf16412c02c214cbcb51eac2729a1d862e78771f4,Tests_passed,True,True,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Merge_failed,14b9bd66adc0c22093e44f4c86da67b573a4eeac6259441bc5965ffe110425eb,Merge_failed,5ecc1fb11067d71a6367d8853f7261db7d4a9d1b6edcc002a943d954e7014940,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_failed,4568287d7c04e4d7a4c13acc3e68424fc41353ec4e119354fd029e922bd29e3f,0.03725004196166992,0.04851984977722168,0.038925886154174805,0.044777631759643555,0.032631635665893555,0.03399348258972168,0.04030346870422363,0.25691699981689453,0.08461642265319824,0.2976646423339844,0.29784512519836426,0.17222166061401367,1.1422743797302246,0.26490306854248047 diff --git a/results/combined/merges_timed/larsga/duke.csv b/results/combined/merges_timed/larsga/duke.csv index 528ea9b7a0..c2da15a855 100644 --- a/results/combined/merges_timed/larsga/duke.csv +++ b/results/combined/merges_timed/larsga/duke.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,b5def8195d1e36fabcf3159c29a05b8998c2edf2,99eddc63255db9ad74aaff0a0a08174a950c9175,1ba93c26741ec856fc2304c722f8fc6c3c949040,,aaad12b3d4ff0c0c7a8c7ac3032557079ae70a00b62321e0308e1d975d96d09d,Tests_passed,8b20d1c6e073cbad254f36d0b963b48faf273070ed6bae38c61442013dcc3f94,Tests_passed,True,True,True,True,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,0.04549241065979004,0.04026079177856445,0.046247243881225586,0.03186345100402832,0.01846456527709961,0.04452395439147949,0.04460310935974121,0.17837119102478027,0.04927563667297363,0.16602277755737305,0.19324517250061035,0.1130075454711914,0.6915702819824219,0.24694371223449707 +13,refs/heads/master,b5def8195d1e36fabcf3159c29a05b8998c2edf2,99eddc63255db9ad74aaff0a0a08174a950c9175,1ba93c26741ec856fc2304c722f8fc6c3c949040,,aaad12b3d4ff0c0c7a8c7ac3032557079ae70a00b62321e0308e1d975d96d09d,Tests_passed,8b20d1c6e073cbad254f36d0b963b48faf273070ed6bae38c61442013dcc3f94,Tests_passed,True,True,True,True,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,0.04549241065979004,0.04026079177856445,0.046247243881225586,0.03186345100402832,0.01846456527709961,0.04452395439147949,0.04460310935974121,0.17837119102478027,0.04927563667297363,0.20503664016723633,0.20131444931030273,0.1130075454711914,0.6915702819824219,0.24694371223449707 diff --git a/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv b/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv index c720380fb5..62b2a1c216 100644 --- a/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv +++ b/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,Tests_passed,True,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,ad8a6d730f6a584843e43a687be0504723e4e0eba31a4ed65a95e58fce3d25f1,Merge_failed,5a9001a5cf8a7fa9336c56354109866ff75e16f986e005cf693eddf2f205db5f,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,0.04962968826293945,0.03596329689025879,0.04900050163269043,0.04125809669494629,0.03921031951904297,0.040515899658203125,0.04734969139099121,0.4349236488342285,0.03435516357421875,0.5095131397247314,0.5164909362792969,0.35172319412231445,3.3680779933929443,0.22255778312683105 +3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,Tests_passed,True,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,ad8a6d730f6a584843e43a687be0504723e4e0eba31a4ed65a95e58fce3d25f1,Merge_failed,5a9001a5cf8a7fa9336c56354109866ff75e16f986e005cf693eddf2f205db5f,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,0.04962968826293945,0.03596329689025879,0.04900050163269043,0.04125809669494629,0.03921031951904297,0.040515899658203125,0.04734969139099121,0.4349236488342285,0.03435516357421875,0.5072004795074463,0.5188298225402832,0.35172319412231445,3.3680779933929443,0.22255778312683105 diff --git a/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv b/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv index 76bdf40646..b0590ee4c1 100644 --- a/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv +++ b/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,147fc13e7c56047ffba691a9f7cb157c3b37e835,fff2a86e05b3bff17289ca2980394033d15f3afd,79b889c0a0e43e47e79f4dcc7468a479d9b5b209,,568ee0ffea1a6ae7efab3ca3968e0b991bf811e1ed61d97147c2ee614962544e,Tests_passed,652309c7bf4d663792082ff894d0b047a9261769f56ec7478d637a095fd6832a,Tests_passed,True,True,True,True,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Merge_failed,d9c7498832254f84dd9542be56f19d82811d2b97a94cd0b29588cad3c0b0e1ed,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Merge_failed,b519c7151250ccbb137e92b035b76322d754e2745019917e05428e17d4a9b5fa,0.03850531578063965,0.03855276107788086,0.043771982192993164,0.03499412536621094,0.04559803009033203,0.03747677803039551,0.04018449783325195,0.2372589111328125,0.06696152687072754,0.28678154945373535,0.28711438179016113,0.17659735679626465,1.0992512702941895,0.2084345817565918 +4,refs/heads/master,147fc13e7c56047ffba691a9f7cb157c3b37e835,fff2a86e05b3bff17289ca2980394033d15f3afd,79b889c0a0e43e47e79f4dcc7468a479d9b5b209,,568ee0ffea1a6ae7efab3ca3968e0b991bf811e1ed61d97147c2ee614962544e,Tests_passed,652309c7bf4d663792082ff894d0b047a9261769f56ec7478d637a095fd6832a,Tests_passed,True,True,True,True,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Merge_failed,d9c7498832254f84dd9542be56f19d82811d2b97a94cd0b29588cad3c0b0e1ed,Merge_failed,7371dc0d7874c50fdebf423b0127cf10d497ec0b92b95fffaa238826ca9aec51,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Merge_failed,b519c7151250ccbb137e92b035b76322d754e2745019917e05428e17d4a9b5fa,0.03850531578063965,0.03855276107788086,0.043771982192993164,0.03499412536621094,0.04559803009033203,0.03747677803039551,0.04018449783325195,0.2372589111328125,0.06696152687072754,0.2835242748260498,0.28389596939086914,0.17659735679626465,1.0992512702941895,0.2084345817565918 diff --git a/results/combined/merges_timed/lbroudoux/es-amazon-s3-river.csv b/results/combined/merges_timed/lbroudoux/es-amazon-s3-river.csv index 4364a61b79..8503150887 100644 --- a/results/combined/merges_timed/lbroudoux/es-amazon-s3-river.csv +++ b/results/combined/merges_timed/lbroudoux/es-amazon-s3-river.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,2aa45336dcc877155d7df5063071f37a86368271,41e6ad6850eeab69700979c1b972f8bd771aba67,b36560bc1985367325345e5244383c223b948a38,,True,True,70a4b2be6ec8bcade189d2322ab21a7703c0f32c82c0797d5e41eb656809a15f,Tests_passed,48af516ec7212a877ccf2a5ee2d6216d03fd3342a7d8f7d18693276ac9487431,Tests_passed,True,True,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e916a1a1f66febc4c200c730083c9c9fb53d468f8ac0d61c23d2e8c919f14ae5,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,a80f6a0be75be0f73daaee09b403473fdf69c7c8fd72c718098d833416972c87,Merge_failed,eaff20344f2fd521978803cc23ef3fbd57537f39362dcedfdafa353f82214547,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,adea0ce69921bf6c5f6a3f41b8515eea1b1cbb9bf07f54ed8aa127c9b53cfa10,0.010426521301269531,0.03499627113342285,0.009773492813110352,0.01041722297668457,0.0433506965637207,0.034964561462402344,0.03647470474243164,0.04981350898742676,0.015180349349975586,0.0760345458984375,0.07681393623352051,0.16113877296447754,1.3190176486968994,0.20682120323181152 +1,refs/heads/master,2aa45336dcc877155d7df5063071f37a86368271,41e6ad6850eeab69700979c1b972f8bd771aba67,b36560bc1985367325345e5244383c223b948a38,,True,True,70a4b2be6ec8bcade189d2322ab21a7703c0f32c82c0797d5e41eb656809a15f,Tests_passed,48af516ec7212a877ccf2a5ee2d6216d03fd3342a7d8f7d18693276ac9487431,Tests_passed,True,True,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e916a1a1f66febc4c200c730083c9c9fb53d468f8ac0d61c23d2e8c919f14ae5,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,a80f6a0be75be0f73daaee09b403473fdf69c7c8fd72c718098d833416972c87,Merge_failed,eaff20344f2fd521978803cc23ef3fbd57537f39362dcedfdafa353f82214547,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,adea0ce69921bf6c5f6a3f41b8515eea1b1cbb9bf07f54ed8aa127c9b53cfa10,0.010426521301269531,0.03499627113342285,0.009773492813110352,0.01041722297668457,0.0433506965637207,0.034964561462402344,0.03647470474243164,0.04981350898742676,0.015180349349975586,0.07632827758789062,0.07691359519958496,0.16113877296447754,1.3190176486968994,0.20682120323181152 diff --git a/results/combined/merges_timed/learning-layers/socialsemanticserver.csv b/results/combined/merges_timed/learning-layers/socialsemanticserver.csv index 3716a18b8b..2a0f282bd9 100644 --- a/results/combined/merges_timed/learning-layers/socialsemanticserver.csv +++ b/results/combined/merges_timed/learning-layers/socialsemanticserver.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,6a7dca76f4993e256c13ab95b0e38d9b40847fe1,e157f975436908a1549d415cd3c0737252a6a3ca,6fd7ecaee5436da1772a43577ddf209a559c638b,,True,True,0fdc2b5d64148e7e627ce70acdfdf13af73f96400765e5de21553aead1bf5d22,Tests_passed,a88d0f618915901dcf0fd5eacaf320a2f63319ecda72842120da3730ed9e6d3b,Tests_passed,True,True,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,c95f77a7c28b27adcc4def2562aeb16c5efefa325b4883a89be21b4512744efc,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,4fd442ca8bfa344a98b5a0784e7d4141c0eeb8a8ad5ec113e409147269f9902a,Merge_failed,4fd442ca8bfa344a98b5a0784e7d4141c0eeb8a8ad5ec113e409147269f9902a,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,c6948269d794d25fa289b9538f7e6542859ef77cc9a195f70af0f1a7f92fba55,0.04172086715698242,0.04273509979248047,0.04770517349243164,0.0470278263092041,0.047437191009521484,0.047283172607421875,0.04734349250793457,0.12096071243286133,0.08796238899230957,0.16514897346496582,0.1544656753540039,0.0985260009765625,0.5605406761169434,1.0383591651916504 +9,refs/heads/master,6a7dca76f4993e256c13ab95b0e38d9b40847fe1,e157f975436908a1549d415cd3c0737252a6a3ca,6fd7ecaee5436da1772a43577ddf209a559c638b,,True,True,0fdc2b5d64148e7e627ce70acdfdf13af73f96400765e5de21553aead1bf5d22,Tests_passed,a88d0f618915901dcf0fd5eacaf320a2f63319ecda72842120da3730ed9e6d3b,Tests_passed,True,True,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,c95f77a7c28b27adcc4def2562aeb16c5efefa325b4883a89be21b4512744efc,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,4fd442ca8bfa344a98b5a0784e7d4141c0eeb8a8ad5ec113e409147269f9902a,Merge_failed,4fd442ca8bfa344a98b5a0784e7d4141c0eeb8a8ad5ec113e409147269f9902a,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,c6948269d794d25fa289b9538f7e6542859ef77cc9a195f70af0f1a7f92fba55,0.04172086715698242,0.04273509979248047,0.04770517349243164,0.0470278263092041,0.047437191009521484,0.047283172607421875,0.04734349250793457,0.12096071243286133,0.08796238899230957,0.15431928634643555,0.15908432006835938,0.0985260009765625,0.5605406761169434,1.0383591651916504 diff --git a/results/combined/merges_timed/learnlib/learnlib.csv b/results/combined/merges_timed/learnlib/learnlib.csv index 5f988f8121..2a47f5da4c 100644 --- a/results/combined/merges_timed/learnlib/learnlib.csv +++ b/results/combined/merges_timed/learnlib/learnlib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/develop,cd89d29fb60db46bc9908025a3bac8a4f253646c,d930e2c5a91eabccee450f80485b4c3c1c842b96,162dc4f957254055b04003d39af4a20dee5de8e3,,True,True,9a85af09753d9a59b787eb63d093f7c121e4d67ae2751f95b33445f9b394cfb4,Tests_passed,9ae2202e3577e34c5824e90d9490186d713606d17d761778c2144ff5ffb6c6fe,Tests_passed,True,True,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Merge_failed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Merge_failed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,0.07172513008117676,0.049697160720825195,0.0421295166015625,0.06614875793457031,0.06630849838256836,0.05513882637023926,0.050566673278808594,0.19201254844665527,0.05842423439025879,0.08467555046081543,0.08539628982543945,0.13240408897399902,1.030048131942749,0.27755165100097656 +26,refs/heads/develop,cd89d29fb60db46bc9908025a3bac8a4f253646c,d930e2c5a91eabccee450f80485b4c3c1c842b96,162dc4f957254055b04003d39af4a20dee5de8e3,,True,True,9a85af09753d9a59b787eb63d093f7c121e4d67ae2751f95b33445f9b394cfb4,Tests_passed,9ae2202e3577e34c5824e90d9490186d713606d17d761778c2144ff5ffb6c6fe,Tests_passed,True,True,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Merge_failed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Merge_failed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,0.07172513008117676,0.049697160720825195,0.0421295166015625,0.06614875793457031,0.06630849838256836,0.05513882637023926,0.050566673278808594,0.19201254844665527,0.05842423439025879,0.08433318138122559,0.08416509628295898,0.13240408897399902,1.030048131942749,0.27755165100097656 diff --git a/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv b/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv index a48a45e474..05670a3f13 100644 --- a/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv +++ b/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,0fe21428a65e166b0f69d4c533427043a443ead3,989b186f8f1eb0f34a44e9531131055a7956b253,2bf2964b787ca526f0271c387286bbc59d806fd6,,c80191169baa07a1484204f4390111c23128862ad134644336cc5aac07910a2f,Tests_passed,56c598b4bafaeed4da68944dd3eddf97ac676f67e5afaebd999f804708743b5f,Tests_passed,True,True,True,True,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,0.04007863998413086,0.04116630554199219,0.041780948638916016,0.03985929489135742,0.0411226749420166,0.04192066192626953,0.043111324310302734,0.16118335723876953,0.04069948196411133,0.15917158126831055,0.15832185745239258,0.11271953582763672,0.8872554302215576,0.18590402603149414 +2,refs/heads/master,0fe21428a65e166b0f69d4c533427043a443ead3,989b186f8f1eb0f34a44e9531131055a7956b253,2bf2964b787ca526f0271c387286bbc59d806fd6,,c80191169baa07a1484204f4390111c23128862ad134644336cc5aac07910a2f,Tests_passed,56c598b4bafaeed4da68944dd3eddf97ac676f67e5afaebd999f804708743b5f,Tests_passed,True,True,True,True,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,0.04007863998413086,0.04116630554199219,0.041780948638916016,0.03985929489135742,0.0411226749420166,0.04192066192626953,0.043111324310302734,0.16118335723876953,0.04069948196411133,0.1553034782409668,0.15580463409423828,0.11271953582763672,0.8872554302215576,0.18590402603149414 diff --git a/results/combined/merges_timed/lemire/externalsortinginjava.csv b/results/combined/merges_timed/lemire/externalsortinginjava.csv index 8c0de2383e..c6459a6599 100644 --- a/results/combined/merges_timed/lemire/externalsortinginjava.csv +++ b/results/combined/merges_timed/lemire/externalsortinginjava.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/heads/master,f6d54664fa3728e2303749b4e09fbca4d362b339,689d56f5f24b0a6a00f3fbdab2c96424f4c25c15,90587af600670f741c1a38134dee2ea7f6598743,,08e4d523f5eb4a03a50a26328af879917d4146b903676db7376d61c590c3aebc,Tests_passed,0c6e9b82836630a7c2e3bb545824d65f828770f1d0f49e34739a40e3d36398fa,Tests_passed,True,True,True,True,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Merge_failed,34c742dfb3787ac79f3707f37cba7650e30c4873de61e6dabfae51b2b0755f44,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,527ab42c4e8e805b425643bef30b5308e021483c3d8cd6981a96b86a39302a48,0.0433504581451416,0.04420757293701172,0.03700423240661621,0.04413866996765137,0.040822744369506836,0.0417475700378418,0.03659772872924805,0.1664748191833496,0.06789636611938477,0.18277859687805176,0.18153858184814453,0.10921001434326172,1.2440025806427002,0.20038795471191406 +23,refs/heads/master,f6d54664fa3728e2303749b4e09fbca4d362b339,689d56f5f24b0a6a00f3fbdab2c96424f4c25c15,90587af600670f741c1a38134dee2ea7f6598743,,08e4d523f5eb4a03a50a26328af879917d4146b903676db7376d61c590c3aebc,Tests_passed,0c6e9b82836630a7c2e3bb545824d65f828770f1d0f49e34739a40e3d36398fa,Tests_passed,True,True,True,True,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Merge_failed,34c742dfb3787ac79f3707f37cba7650e30c4873de61e6dabfae51b2b0755f44,Merge_failed,b0ab3b20891f2705b364742614921e1d74bb1ac15f6c443231b8cb0cce213939,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,527ab42c4e8e805b425643bef30b5308e021483c3d8cd6981a96b86a39302a48,0.0433504581451416,0.04420757293701172,0.03700423240661621,0.04413866996765137,0.040822744369506836,0.0417475700378418,0.03659772872924805,0.1664748191833496,0.06789636611938477,0.17991256713867188,0.18021631240844727,0.10921001434326172,1.2440025806427002,0.20038795471191406 diff --git a/results/combined/merges_timed/lemire/javaewah.csv b/results/combined/merges_timed/lemire/javaewah.csv index 063a9d7afd..bcbaaf0348 100644 --- a/results/combined/merges_timed/lemire/javaewah.csv +++ b/results/combined/merges_timed/lemire/javaewah.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -60,refs/heads/master,5829fc009b15699da618ec8fb4db9fe1662f20bd,b3d4c01db3a3f995dbe891cd8b1cb7b7ca518f49,735652d1068fa30e634d80de86ac9617f6182a57,,True,True,388ace8eeeebd3061aa3153722574954a9895660b77076e729f3bc167370a1aa,Tests_passed,79ff8ac147b42b8fb5ec46d79cce9e471854fc3797fceb73c290052607ad667e,Tests_passed,True,True,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,4d5e86e6da2f9f9c641a94e6769762fb5c66bb38b19b44c021f504f5fac45dcd,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,0.047254323959350586,0.0487518310546875,0.044136762619018555,0.04156136512756348,0.06313037872314453,0.058278799057006836,0.05597209930419922,0.19536614418029785,0.043929100036621094,0.16073393821716309,0.16216087341308594,0.10270237922668457,0.967036247253418,0.2416090965270996 +60,refs/heads/master,5829fc009b15699da618ec8fb4db9fe1662f20bd,b3d4c01db3a3f995dbe891cd8b1cb7b7ca518f49,735652d1068fa30e634d80de86ac9617f6182a57,,True,True,388ace8eeeebd3061aa3153722574954a9895660b77076e729f3bc167370a1aa,Tests_passed,79ff8ac147b42b8fb5ec46d79cce9e471854fc3797fceb73c290052607ad667e,Tests_passed,True,True,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,4d5e86e6da2f9f9c641a94e6769762fb5c66bb38b19b44c021f504f5fac45dcd,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,0.047254323959350586,0.0487518310546875,0.044136762619018555,0.04156136512756348,0.06313037872314453,0.058278799057006836,0.05597209930419922,0.19536614418029785,0.043929100036621094,0.16068243980407715,0.1612107753753662,0.10270237922668457,0.967036247253418,0.2416090965270996 diff --git a/results/combined/merges_timed/leonlee/flume-ng-mongodb-sink.csv b/results/combined/merges_timed/leonlee/flume-ng-mongodb-sink.csv index ffdfeb69b8..cf091737a0 100644 --- a/results/combined/merges_timed/leonlee/flume-ng-mongodb-sink.csv +++ b/results/combined/merges_timed/leonlee/flume-ng-mongodb-sink.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,6e95fc2cbcb962d885349d74fdc5a51bab767964,c7bbbbc61771590b83a5fd19fec74a6f917404ab,fba1f22175d1da0f00dbc1a146b3754503d4d8e4,,19990caf97b5a366543e127703f1c1358d8c24d85dc6b3636ac49ea570fe0ffd,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,True,True,True,True,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,657082fb3e14a125d948a56f4ddf0da5cda5a98d1aa3ef0f849409b1067e494d,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,09b2e3fbfa4587cef3fecc400d5d5d462c0c0ae8f0376c2f518fc45a2f7757d1,Merge_failed,09b2e3fbfa4587cef3fecc400d5d5d462c0c0ae8f0376c2f518fc45a2f7757d1,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,2b3464f870314f0c389773a4f4a1d37adf87ab26f51631a6751a76770c57e354,0.008632183074951172,0.008667945861816406,0.008685111999511719,0.008541584014892578,0.00852513313293457,0.008783340454101562,0.008538246154785156,0.036141395568847656,0.016749143600463867,0.07692575454711914,0.07854723930358887,0.07352519035339355,1.2483654022216797,0.16556382179260254 +5,refs/heads/master,6e95fc2cbcb962d885349d74fdc5a51bab767964,c7bbbbc61771590b83a5fd19fec74a6f917404ab,fba1f22175d1da0f00dbc1a146b3754503d4d8e4,,19990caf97b5a366543e127703f1c1358d8c24d85dc6b3636ac49ea570fe0ffd,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,True,True,True,True,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,657082fb3e14a125d948a56f4ddf0da5cda5a98d1aa3ef0f849409b1067e494d,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,09b2e3fbfa4587cef3fecc400d5d5d462c0c0ae8f0376c2f518fc45a2f7757d1,Merge_failed,09b2e3fbfa4587cef3fecc400d5d5d462c0c0ae8f0376c2f518fc45a2f7757d1,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,2b3464f870314f0c389773a4f4a1d37adf87ab26f51631a6751a76770c57e354,0.008632183074951172,0.008667945861816406,0.008685111999511719,0.008541584014892578,0.00852513313293457,0.008783340454101562,0.008538246154785156,0.036141395568847656,0.016749143600463867,0.07532620429992676,0.07562685012817383,0.07352519035339355,1.2483654022216797,0.16556382179260254 diff --git a/results/combined/merges_timed/lettuce-io/lettuce-core.csv b/results/combined/merges_timed/lettuce-io/lettuce-core.csv index b09567c8af..a023067373 100644 --- a/results/combined/merges_timed/lettuce-io/lettuce-core.csv +++ b/results/combined/merges_timed/lettuce-io/lettuce-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/main,dd997ac4b36fbe5b5cc6c3fe693ba9c524960d05,ace28afc371c993d35b471c2277ab522ceb7b631,caa06f44929bf41a1f73bdcf09eb8db5885c7001,,True,True,28fd8f90c6636b22add23662e41398c474584baf86bab9a316408247dd46689d,Tests_passed,6918532642f8665614890dbde4286a829c797c39916a82c902261f8e634b0af6,Tests_passed,True,True,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,dba68d84911e49e3f2146623a41bf6f7cb35a8ae11108f156aa73e0a2b6fe785,Tests_passed,dba68d84911e49e3f2146623a41bf6f7cb35a8ae11108f156aa73e0a2b6fe785,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,b9f51d66b985046efc15b5696da644209f02572033695c3bef55b046a79aca75,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,0.05300426483154297,0.049329280853271484,0.036774635314941406,0.053617000579833984,0.047768354415893555,0.05322599411010742,0.03701353073120117,0.1949765682220459,0.05163240432739258,0.18115687370300293,0.18004083633422852,0.12177395820617676,1.007312536239624,0.31505846977233887 +31,refs/heads/main,dd997ac4b36fbe5b5cc6c3fe693ba9c524960d05,ace28afc371c993d35b471c2277ab522ceb7b631,caa06f44929bf41a1f73bdcf09eb8db5885c7001,,True,True,28fd8f90c6636b22add23662e41398c474584baf86bab9a316408247dd46689d,Tests_passed,6918532642f8665614890dbde4286a829c797c39916a82c902261f8e634b0af6,Tests_passed,True,True,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,dba68d84911e49e3f2146623a41bf6f7cb35a8ae11108f156aa73e0a2b6fe785,Tests_passed,dba68d84911e49e3f2146623a41bf6f7cb35a8ae11108f156aa73e0a2b6fe785,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,b9f51d66b985046efc15b5696da644209f02572033695c3bef55b046a79aca75,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,0.05300426483154297,0.049329280853271484,0.036774635314941406,0.053617000579833984,0.047768354415893555,0.05322599411010742,0.03701353073120117,0.1949765682220459,0.05163240432739258,0.17795205116271973,0.1781630516052246,0.12177395820617676,1.007312536239624,0.31505846977233887 diff --git a/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv b/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv index 24b589a076..cada8ba451 100644 --- a/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv +++ b/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,db0acd81d124fd8af863c20728e0afcf3adbbb0e,cd0b409006035fcb9e48bb075b58aac1cf6d4192,d6723a2397460e5ba08e2d9ee45bb78a816100ae,,True,True,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Tests_passed,f2491f5f279546d648cbdffe352a5249c60d8d923f52b0a3a31c79ade7207d5a,Tests_passed,True,True,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,c62ea37ac6c9e2743cb490b52b1850626cb7d0b181e29c538dd548ede7a8e2ff,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,4e80b9c6e3c0f97e3c717a7ebc2b03130beb92236e74ec2612e4bce27787bd6e,Merge_failed,4e80b9c6e3c0f97e3c717a7ebc2b03130beb92236e74ec2612e4bce27787bd6e,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,f3803935988be5db69ca9e3a96bb4f11796d95e61290b2ca345bb0c3420681c4,0.04309582710266113,0.05026364326477051,0.04044079780578613,0.03849482536315918,0.04684710502624512,0.03870201110839844,0.041641950607299805,0.16371655464172363,0.07638001441955566,0.06508731842041016,0.0650174617767334,0.1273632049560547,0.6868512630462646,0.2431347370147705 +3,refs/heads/master,db0acd81d124fd8af863c20728e0afcf3adbbb0e,cd0b409006035fcb9e48bb075b58aac1cf6d4192,d6723a2397460e5ba08e2d9ee45bb78a816100ae,,True,True,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Tests_passed,f2491f5f279546d648cbdffe352a5249c60d8d923f52b0a3a31c79ade7207d5a,Tests_passed,True,True,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,c62ea37ac6c9e2743cb490b52b1850626cb7d0b181e29c538dd548ede7a8e2ff,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,4e80b9c6e3c0f97e3c717a7ebc2b03130beb92236e74ec2612e4bce27787bd6e,Merge_failed,4e80b9c6e3c0f97e3c717a7ebc2b03130beb92236e74ec2612e4bce27787bd6e,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,f3803935988be5db69ca9e3a96bb4f11796d95e61290b2ca345bb0c3420681c4,0.04309582710266113,0.05026364326477051,0.04044079780578613,0.03849482536315918,0.04684710502624512,0.03870201110839844,0.041641950607299805,0.16371655464172363,0.07638001441955566,0.06373882293701172,0.06461906433105469,0.1273632049560547,0.6868512630462646,0.2431347370147705 diff --git a/results/combined/merges_timed/librato/metrics-librato.csv b/results/combined/merges_timed/librato/metrics-librato.csv index 6d1f8e4d3d..473c92e5cc 100644 --- a/results/combined/merges_timed/librato/metrics-librato.csv +++ b/results/combined/merges_timed/librato/metrics-librato.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,0720f6dce4f8da338bbfcfa9e2c0009de7772709,a0891f0785d08d8abaaf3dc84009bd8769d4ca8a,5afe7a103adde58eab777f26fcc616f06601207d,,8bfc3fd9e58392e008801f2a7ecac6df5095545d1b829d0d16b0c289206194a4,Tests_passed,8e27d6b8f17a98c1b5d2dc4ea8e66e06e99ffd05081dcd909ca669c52d342b37,Tests_passed,True,True,True,True,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,0.04018378257751465,0.04546380043029785,0.04538583755493164,0.045890092849731445,0.015216350555419922,0.011353492736816406,0.011136054992675781,0.16006040573120117,0.04425692558288574,0.16158080101013184,0.16166377067565918,0.11980175971984863,0.9072237014770508,0.1967301368713379 +14,refs/heads/master,0720f6dce4f8da338bbfcfa9e2c0009de7772709,a0891f0785d08d8abaaf3dc84009bd8769d4ca8a,5afe7a103adde58eab777f26fcc616f06601207d,,8bfc3fd9e58392e008801f2a7ecac6df5095545d1b829d0d16b0c289206194a4,Tests_passed,8e27d6b8f17a98c1b5d2dc4ea8e66e06e99ffd05081dcd909ca669c52d342b37,Tests_passed,True,True,True,True,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,0.04018378257751465,0.04546380043029785,0.04538583755493164,0.045890092849731445,0.015216350555419922,0.011353492736816406,0.011136054992675781,0.16006040573120117,0.04425692558288574,0.15950393676757812,0.15915679931640625,0.11980175971984863,0.9072237014770508,0.1967301368713379 diff --git a/results/combined/merges_timed/linkedin/camus.csv b/results/combined/merges_timed/linkedin/camus.csv index 50eae90e3f..beccad7730 100644 --- a/results/combined/merges_timed/linkedin/camus.csv +++ b/results/combined/merges_timed/linkedin/camus.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,05c0ceebfa45c20f5e1b584888fa5a9a5ae8c6d2,3f3ab0a3888ab9bbde8670a15f81404b5094ad91,e5694615ec635a2a10b6b8e52045b461ed9838b6,,True,True,b87be47c4b81bebdaeb7e1e19e0d1a498723b7cd3a05e3e73d0a19f3aed47b28,Tests_passed,67e6913684581a54b4e6d211718756324deaff08231c368e10ae9db988045c02,Tests_passed,True,True,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,0.03269696235656738,0.033345937728881836,0.04568600654602051,0.04501152038574219,0.04571127891540527,0.04559636116027832,0.04497075080871582,0.08199763298034668,0.03272533416748047,0.18660378456115723,0.18133330345153809,0.08738255500793457,1.317577600479126,0.21935009956359863 +7,refs/heads/master,05c0ceebfa45c20f5e1b584888fa5a9a5ae8c6d2,3f3ab0a3888ab9bbde8670a15f81404b5094ad91,e5694615ec635a2a10b6b8e52045b461ed9838b6,,True,True,b87be47c4b81bebdaeb7e1e19e0d1a498723b7cd3a05e3e73d0a19f3aed47b28,Tests_passed,67e6913684581a54b4e6d211718756324deaff08231c368e10ae9db988045c02,Tests_passed,True,True,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,0.03269696235656738,0.033345937728881836,0.04568600654602051,0.04501152038574219,0.04571127891540527,0.04559636116027832,0.04497075080871582,0.08199763298034668,0.03272533416748047,0.18022656440734863,0.15764451026916504,0.08738255500793457,1.317577600479126,0.21935009956359863 diff --git a/results/combined/merges_timed/linlinjava/litemall.csv b/results/combined/merges_timed/linlinjava/litemall.csv index ac730ef0ce..e5dcf8ddf4 100644 --- a/results/combined/merges_timed/linlinjava/litemall.csv +++ b/results/combined/merges_timed/linlinjava/litemall.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -123,refs/remotes/origin/pull/101,2623ec262305e76dc212afd10d0311cbc85fe81b,794aa4273eb6b746255b75a5e98805f57b5aea9c,570fff521b73bcdd0d4ec16906f7fc55e385946d,,True,True,4f50ed8b3507b9acccc1d2d02a3da27311ca04f4f278a345b1d55e2cc6e0b708,Tests_passed,e814eb628324b4f1e56b351940fa93219f1a7d6eed29913d539fd83086689a5b,Tests_passed,True,True,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,73e391bd598013a62313c35b394ab16cde8b2010805979c86e0f1094ae4810df,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,73e391bd598013a62313c35b394ab16cde8b2010805979c86e0f1094ae4810df,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,b5d2bd8efd97b59e1e6858e52ff58c1d52cba951599de5695b86dc7cfd9dd83c,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,5f42ff408d2cffd68df1eaa43da210354c3504c0878a9eceb9864ce610c53ee2,Merge_failed,bfddae9ba61fe811794d285e8db9fcfa9bced9b4412cc326d7bafe77122e251c,Merge_failed,c13bf330d70872f29a71d8cb393fcb376b1cf8ec0eb59ae142b82305d98938a5,Merge_failed,4c526b0e2f6ce764e882e57e8be261f65328c15c3373a2d04d3f85d3fa205b60,Merge_failed,b7dc61bfdd826e75b7b3c3c3da1b389c6d68a3cb43635cb50eda2c56ac334c35,0.11330986022949219,0.1005549430847168,0.09755229949951172,0.11331534385681152,0.11189818382263184,0.10906863212585449,0.0946352481842041,0.4250493049621582,0.14351654052734375,0.24374604225158691,0.24379777908325195,0.4702432155609131,0.7077407836914062,0.49303102493286133 +123,refs/remotes/origin/pull/101,2623ec262305e76dc212afd10d0311cbc85fe81b,794aa4273eb6b746255b75a5e98805f57b5aea9c,570fff521b73bcdd0d4ec16906f7fc55e385946d,,True,True,4f50ed8b3507b9acccc1d2d02a3da27311ca04f4f278a345b1d55e2cc6e0b708,Tests_passed,e814eb628324b4f1e56b351940fa93219f1a7d6eed29913d539fd83086689a5b,Tests_passed,True,True,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,73e391bd598013a62313c35b394ab16cde8b2010805979c86e0f1094ae4810df,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,73e391bd598013a62313c35b394ab16cde8b2010805979c86e0f1094ae4810df,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,b5d2bd8efd97b59e1e6858e52ff58c1d52cba951599de5695b86dc7cfd9dd83c,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,5f42ff408d2cffd68df1eaa43da210354c3504c0878a9eceb9864ce610c53ee2,Merge_failed,bfddae9ba61fe811794d285e8db9fcfa9bced9b4412cc326d7bafe77122e251c,Merge_failed,c13bf330d70872f29a71d8cb393fcb376b1cf8ec0eb59ae142b82305d98938a5,Merge_failed,4c526b0e2f6ce764e882e57e8be261f65328c15c3373a2d04d3f85d3fa205b60,Merge_failed,b7dc61bfdd826e75b7b3c3c3da1b389c6d68a3cb43635cb50eda2c56ac334c35,0.11330986022949219,0.1005549430847168,0.09755229949951172,0.11331534385681152,0.11189818382263184,0.10906863212585449,0.0946352481842041,0.4250493049621582,0.14351654052734375,0.24110817909240723,0.24082303047180176,0.4702432155609131,0.7077407836914062,0.49303102493286133 diff --git a/results/combined/merges_timed/linsolas/casperjs-runner-maven-plugin.csv b/results/combined/merges_timed/linsolas/casperjs-runner-maven-plugin.csv index c9a1ed5f47..6905b3862c 100644 --- a/results/combined/merges_timed/linsolas/casperjs-runner-maven-plugin.csv +++ b/results/combined/merges_timed/linsolas/casperjs-runner-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,98fccc0f940917225388733e66237404f374cdfc,bc49d4bec72a513a71898b54a82f7b58fd31bd75,3596606660beafd4e9f86deefb33adc264146b1c,,True,True,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,97cbd5b06e0dde7adff256e50dbd2bc99fb11308c11727d7e7ddb8f7a32ae6f1,Tests_passed,True,True,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_failed,524dcee3322925f2b0208af5c0a99020d089baf682d7e3d6544729c1b0ce912e,Tests_failed,524dcee3322925f2b0208af5c0a99020d089baf682d7e3d6544729c1b0ce912e,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,0.04230976104736328,0.049169301986694336,0.041414737701416016,0.04933023452758789,0.04165315628051758,0.0445706844329834,0.046222686767578125,0.1654796600341797,0.043569087982177734,0.16221189498901367,0.16310334205627441,0.1234736442565918,1.0100643634796143,0.18649697303771973 +3,refs/heads/master,98fccc0f940917225388733e66237404f374cdfc,bc49d4bec72a513a71898b54a82f7b58fd31bd75,3596606660beafd4e9f86deefb33adc264146b1c,,True,True,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,97cbd5b06e0dde7adff256e50dbd2bc99fb11308c11727d7e7ddb8f7a32ae6f1,Tests_passed,True,True,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_failed,524dcee3322925f2b0208af5c0a99020d089baf682d7e3d6544729c1b0ce912e,Tests_failed,524dcee3322925f2b0208af5c0a99020d089baf682d7e3d6544729c1b0ce912e,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,0.04230976104736328,0.049169301986694336,0.041414737701416016,0.04933023452758789,0.04165315628051758,0.0445706844329834,0.046222686767578125,0.1654796600341797,0.043569087982177734,0.1595005989074707,0.16159296035766602,0.1234736442565918,1.0100643634796143,0.18649697303771973 diff --git a/results/combined/merges_timed/lintool/clueweb.csv b/results/combined/merges_timed/lintool/clueweb.csv index dce42a5940..3ea2933294 100644 --- a/results/combined/merges_timed/lintool/clueweb.csv +++ b/results/combined/merges_timed/lintool/clueweb.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/remotes/origin/pull/2,f9181ca9b2aaa753c6ad6682c104ff86b3ad61ca,aa26f1b3650bb1f473ce4f7da5ead01e6a3b7a6e,9903285c0c486d0cb92e662a16fb338061c32cd7,,36b130f3322f6322729db4e99b129b597027e4a340248c309d581a485da296e4,Tests_passed,dfe00cde5ee8a26404891cf942f4796a75fe1098c4c6921a5078bb128a39bdac,Tests_passed,True,True,True,True,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,097874d253ae2b46505cd6f042772daede1177c0e71ae2bc5949293daef62a6f,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,f4bfb2e406d3b7e3a3cce3d6419fea1b6203daa8073f1257e1dc8779b391f7c4,Merge_failed,f4bfb2e406d3b7e3a3cce3d6419fea1b6203daa8073f1257e1dc8779b391f7c4,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,11b4a6ab6c9ae9f3d6b25238f22a45ea88a6f0a5ba88eaddb60b3298959eaa0f,0.04852461814880371,0.05529189109802246,0.06383395195007324,0.05458569526672363,0.06364154815673828,0.06183457374572754,0.06898283958435059,0.3765068054199219,0.10502743721008301,0.5774929523468018,0.5749728679656982,0.28128528594970703,3.8125829696655273,0.2806558609008789 +9,refs/remotes/origin/pull/2,f9181ca9b2aaa753c6ad6682c104ff86b3ad61ca,aa26f1b3650bb1f473ce4f7da5ead01e6a3b7a6e,9903285c0c486d0cb92e662a16fb338061c32cd7,,36b130f3322f6322729db4e99b129b597027e4a340248c309d581a485da296e4,Tests_passed,dfe00cde5ee8a26404891cf942f4796a75fe1098c4c6921a5078bb128a39bdac,Tests_passed,True,True,True,True,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,097874d253ae2b46505cd6f042772daede1177c0e71ae2bc5949293daef62a6f,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,f4bfb2e406d3b7e3a3cce3d6419fea1b6203daa8073f1257e1dc8779b391f7c4,Merge_failed,f4bfb2e406d3b7e3a3cce3d6419fea1b6203daa8073f1257e1dc8779b391f7c4,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,11b4a6ab6c9ae9f3d6b25238f22a45ea88a6f0a5ba88eaddb60b3298959eaa0f,0.04852461814880371,0.05529189109802246,0.06383395195007324,0.05458569526672363,0.06364154815673828,0.06183457374572754,0.06898283958435059,0.3765068054199219,0.10502743721008301,0.5493955612182617,0.5582842826843262,0.28128528594970703,3.8125829696655273,0.2806558609008789 diff --git a/results/combined/merges_timed/lionsoul2014/jcseg.csv b/results/combined/merges_timed/lionsoul2014/jcseg.csv index 6f1c74bfc7..067306658b 100644 --- a/results/combined/merges_timed/lionsoul2014/jcseg.csv +++ b/results/combined/merges_timed/lionsoul2014/jcseg.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/heads/master,a86200ceb8b239ff7c3dfbceb5bcd4df8ea0cf96,0e7ba00efa11c9a060b19f9951bdc6daadd6049c,1dec9143e14c98f774d64cb71c7f63938d420d28,,True,True,f6188fd8729fb13be98adf439de0fcc58537c479e00fd3a37cf05c8c2358e5fe,Tests_passed,a906d0492828079b957e3a285c5b3799cf2c4043f56784c9af9f85d7f8852f4b,Tests_passed,True,True,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,0.04664802551269531,0.046477317810058594,0.06439399719238281,0.06397366523742676,0.06470799446105957,0.05585670471191406,0.06449246406555176,0.15077662467956543,0.045896291732788086,0.49561285972595215,0.49184465408325195,0.20714783668518066,2.0143930912017822,0.2746267318725586 +27,refs/heads/master,a86200ceb8b239ff7c3dfbceb5bcd4df8ea0cf96,0e7ba00efa11c9a060b19f9951bdc6daadd6049c,1dec9143e14c98f774d64cb71c7f63938d420d28,,True,True,f6188fd8729fb13be98adf439de0fcc58537c479e00fd3a37cf05c8c2358e5fe,Tests_passed,a906d0492828079b957e3a285c5b3799cf2c4043f56784c9af9f85d7f8852f4b,Tests_passed,True,True,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,0.04664802551269531,0.046477317810058594,0.06439399719238281,0.06397366523742676,0.06470799446105957,0.05585670471191406,0.06449246406555176,0.15077662467956543,0.045896291732788086,0.4891507625579834,0.49173998832702637,0.20714783668518066,2.0143930912017822,0.2746267318725586 diff --git a/results/combined/merges_timed/liyiorg/weixin-popular.csv b/results/combined/merges_timed/liyiorg/weixin-popular.csv index 76f9bac4c5..cc74d7759a 100644 --- a/results/combined/merges_timed/liyiorg/weixin-popular.csv +++ b/results/combined/merges_timed/liyiorg/weixin-popular.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,Tests_passed,True,True,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,38478bf23ee25409ea7839203734413d68a2600c9d3aef9ab5144ade065e91c1,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,38478bf23ee25409ea7839203734413d68a2600c9d3aef9ab5144ade065e91c1,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,a0f96248af9a66dcdf21f3fc3a6f7acbad31dcfcbf1e49e909afe42d90718a90,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Merge_failed,8d60cf248696b6d9b13216ae5a260b8a66741d3bbf6838ffe1fba2f269b5040b,0.04822850227355957,0.04094409942626953,0.0430302619934082,0.04453873634338379,0.050733327865600586,0.05132246017456055,0.05858111381530762,0.17635488510131836,0.08981704711914062,0.1499016284942627,0.1485896110534668,0.12128210067749023,0.45008349418640137,0.27417826652526855 +64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,Tests_passed,True,True,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,38478bf23ee25409ea7839203734413d68a2600c9d3aef9ab5144ade065e91c1,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,38478bf23ee25409ea7839203734413d68a2600c9d3aef9ab5144ade065e91c1,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,a0f96248af9a66dcdf21f3fc3a6f7acbad31dcfcbf1e49e909afe42d90718a90,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Merge_failed,8d60cf248696b6d9b13216ae5a260b8a66741d3bbf6838ffe1fba2f269b5040b,0.04822850227355957,0.04094409942626953,0.0430302619934082,0.04453873634338379,0.050733327865600586,0.05132246017456055,0.05858111381530762,0.17635488510131836,0.08981704711914062,0.16011285781860352,0.1477375030517578,0.12128210067749023,0.45008349418640137,0.27417826652526855 diff --git a/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv b/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv index 5cb5810893..b6ffaee825 100644 --- a/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv +++ b/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/remotes/origin/fasterxml,ee90110799a7b6f905dbda921690e43cdb8b7b08,dd57077b747f5e849172d48e96a48fe6fc538e0a,f84aca0ec9e49f60c64d7fde80f8d8b1acc3847a,,True,True,cb3f99299108e0a3a01edeef8f27e66587f470dd039275ecfe0f386d2ae464c7,Tests_passed,4060031dbf743f20d701089480376adcdfcf4c437d24e0b0f34ad46f165e6e0d,Tests_passed,True,True,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,637e5ac5dbba75574bf5f9e33434d92ac8fa499178f41c695d3df3c858e0ede8,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,92645a4cdb2abcc8e6b6e0afaaf2d8853bd99cf2b818be6144380f9b9ba40525,Merge_failed,92645a4cdb2abcc8e6b6e0afaaf2d8853bd99cf2b818be6144380f9b9ba40525,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,c9ab9521ec5af787988c4b30b5b3658798fa043742fec6c1b12e7ff816dbb4de,0.0380861759185791,0.041742563247680664,0.0353083610534668,0.036516427993774414,0.04074859619140625,0.04034876823425293,0.039720773696899414,0.2871897220611572,0.018766403198242188,0.19592666625976562,0.1972644329071045,0.2534513473510742,1.4109880924224854,0.1948251724243164 +12,refs/remotes/origin/fasterxml,ee90110799a7b6f905dbda921690e43cdb8b7b08,dd57077b747f5e849172d48e96a48fe6fc538e0a,f84aca0ec9e49f60c64d7fde80f8d8b1acc3847a,,True,True,cb3f99299108e0a3a01edeef8f27e66587f470dd039275ecfe0f386d2ae464c7,Tests_passed,4060031dbf743f20d701089480376adcdfcf4c437d24e0b0f34ad46f165e6e0d,Tests_passed,True,True,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,637e5ac5dbba75574bf5f9e33434d92ac8fa499178f41c695d3df3c858e0ede8,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,92645a4cdb2abcc8e6b6e0afaaf2d8853bd99cf2b818be6144380f9b9ba40525,Merge_failed,92645a4cdb2abcc8e6b6e0afaaf2d8853bd99cf2b818be6144380f9b9ba40525,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,c9ab9521ec5af787988c4b30b5b3658798fa043742fec6c1b12e7ff816dbb4de,0.0380861759185791,0.041742563247680664,0.0353083610534668,0.036516427993774414,0.04074859619140625,0.04034876823425293,0.039720773696899414,0.2871897220611572,0.018766403198242188,0.19523406028747559,0.195326566696167,0.2534513473510742,1.4109880924224854,0.1948251724243164 diff --git a/results/combined/merges_timed/logstash/logstash-logback-encoder.csv b/results/combined/merges_timed/logstash/logstash-logback-encoder.csv index a001118a37..89f37547b9 100644 --- a/results/combined/merges_timed/logstash/logstash-logback-encoder.csv +++ b/results/combined/merges_timed/logstash/logstash-logback-encoder.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -253,refs/remotes/origin/pull/649,e8d87859b576c378a49d72d807bc5b0a96c44bc9,69ab39bb3d358438cb047fdd10f9ff440f840609,c87a732681f82eae948ff0d62d9df91087a875fe,,True,True,ba5edbc5e2848f3b7a4d73e2fe6d8921808b7daa07c0edc566416e623e581cbe,Tests_passed,29993c5f9a7b1e3b343d3539ac066104f4ef0bf3a97c937ea9442cd16249d027,Tests_passed,True,True,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_passed,eb2bd1fa544aa3ba8c89a4424d3df7b4b5dc0d4cb14d9879b11699af289dd626,Tests_passed,eb2bd1fa544aa3ba8c89a4424d3df7b4b5dc0d4cb14d9879b11699af289dd626,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,0.0427398681640625,0.04806017875671387,0.05511617660522461,0.0682518482208252,0.06818628311157227,0.0661153793334961,0.06399106979370117,0.2393791675567627,0.07101321220397949,0.36746954917907715,0.3774735927581787,0.1630089282989502,0.05350661277770996,0.3183302879333496 +253,refs/remotes/origin/pull/649,e8d87859b576c378a49d72d807bc5b0a96c44bc9,69ab39bb3d358438cb047fdd10f9ff440f840609,c87a732681f82eae948ff0d62d9df91087a875fe,,True,True,ba5edbc5e2848f3b7a4d73e2fe6d8921808b7daa07c0edc566416e623e581cbe,Tests_passed,29993c5f9a7b1e3b343d3539ac066104f4ef0bf3a97c937ea9442cd16249d027,Tests_passed,True,True,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_passed,eb2bd1fa544aa3ba8c89a4424d3df7b4b5dc0d4cb14d9879b11699af289dd626,Tests_passed,eb2bd1fa544aa3ba8c89a4424d3df7b4b5dc0d4cb14d9879b11699af289dd626,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,0.0427398681640625,0.04806017875671387,0.05511617660522461,0.0682518482208252,0.06818628311157227,0.0661153793334961,0.06399106979370117,0.2393791675567627,0.07101321220397949,0.3697831630706787,0.3711543083190918,0.1630089282989502,0.05350661277770996,0.3183302879333496 diff --git a/results/combined/merges_timed/lookfirst/sardine.csv b/results/combined/merges_timed/lookfirst/sardine.csv index 3622173f32..f051bc353c 100644 --- a/results/combined/merges_timed/lookfirst/sardine.csv +++ b/results/combined/merges_timed/lookfirst/sardine.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -50,refs/heads/master,d8abcbba75a4c96f3cca249d3c06d9818030318c,8d256c63babee5c3117fe1535d39035d0eafc68b,243b88556f5fb3aa45cc5ea6d00e2dce6e61c862,,True,True,60ed52e2b39693e5369478b5f540c0d9f31814727d200b4703625bc8225ebc80,Tests_passed,10dafbeb5a38be85664c5aa6fc08a7cb5699e7c0e78c896a83a5a265545ad133,Tests_passed,True,True,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,0.04456901550292969,0.04390263557434082,0.04284381866455078,0.04481697082519531,0.0423581600189209,0.04619121551513672,0.04362297058105469,0.16859650611877441,0.04180026054382324,0.18302130699157715,0.1864337921142578,0.09911894798278809,1.536536455154419,0.21924567222595215 +50,refs/heads/master,d8abcbba75a4c96f3cca249d3c06d9818030318c,8d256c63babee5c3117fe1535d39035d0eafc68b,243b88556f5fb3aa45cc5ea6d00e2dce6e61c862,,True,True,60ed52e2b39693e5369478b5f540c0d9f31814727d200b4703625bc8225ebc80,Tests_passed,10dafbeb5a38be85664c5aa6fc08a7cb5699e7c0e78c896a83a5a265545ad133,Tests_passed,True,True,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,0.04456901550292969,0.04390263557434082,0.04284381866455078,0.04481697082519531,0.0423581600189209,0.04619121551513672,0.04362297058105469,0.16859650611877441,0.04180026054382324,0.18219518661499023,0.1861402988433838,0.09911894798278809,1.536536455154419,0.21924567222595215 diff --git a/results/combined/merges_timed/lukas-krecan/json2xml.csv b/results/combined/merges_timed/lukas-krecan/json2xml.csv index eead1015f2..5416692899 100644 --- a/results/combined/merges_timed/lukas-krecan/json2xml.csv +++ b/results/combined/merges_timed/lukas-krecan/json2xml.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -50,refs/heads/master,3716f42238f1a1f0754f1ec2755b4a88cbdecb4b,dbe1af5e3aa815d9ffb8a0154ae5da21703c102d,c0dd9688d2e602d50ef4183e6d7a55f71cada211,,True,True,5802cfbdbe4e38451e00a5db2afd2d1291deaf773e1b6270b1c6fb6cf15ac9ba,Tests_passed,a031b8e7f38d59255e43ba27c63f546cea243ac055be580b7289b80988b06338,Tests_passed,True,True,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,0.04297327995300293,0.03908562660217285,0.04451870918273926,0.04285860061645508,0.041947126388549805,0.039423227310180664,0.03841066360473633,0.23326611518859863,0.04306292533874512,0.308086633682251,0.31171607971191406,0.1629347801208496,1.2023577690124512,0.18973851203918457 +50,refs/heads/master,3716f42238f1a1f0754f1ec2755b4a88cbdecb4b,dbe1af5e3aa815d9ffb8a0154ae5da21703c102d,c0dd9688d2e602d50ef4183e6d7a55f71cada211,,True,True,5802cfbdbe4e38451e00a5db2afd2d1291deaf773e1b6270b1c6fb6cf15ac9ba,Tests_passed,a031b8e7f38d59255e43ba27c63f546cea243ac055be580b7289b80988b06338,Tests_passed,True,True,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,0.04297327995300293,0.03908562660217285,0.04451870918273926,0.04285860061645508,0.041947126388549805,0.039423227310180664,0.03841066360473633,0.23326611518859863,0.04306292533874512,0.29128360748291016,0.2920551300048828,0.1629347801208496,1.2023577690124512,0.18973851203918457 diff --git a/results/combined/merges_timed/lukas-krecan/jsonunit.csv b/results/combined/merges_timed/lukas-krecan/jsonunit.csv index 2eafc54052..f40fd32eea 100644 --- a/results/combined/merges_timed/lukas-krecan/jsonunit.csv +++ b/results/combined/merges_timed/lukas-krecan/jsonunit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -376,refs/remotes/origin/jackson-1.x,7a61777fca87b6c906be80940781f2ae80f36d82,c90ae65409409c029aed9a4f95969dbc2e41ea84,eda93eaa04a531de2708c32ce2c63e1a66754685,,True,True,d8a6c5da9f1d2830cffa9690d70a91d3c93dc83aa91a106dd889ace4098f36bb,Tests_passed,1d552a224c717e6295cfed4d78ae6dcca290dbe0908144f6b94c531f55c4069f,Tests_passed,True,True,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,ddc993693d98f2fc4f81f907d0e2f51e47e1eda6566f676688978f150f3b5219,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,ccfb789367ed0885d5249d98f5b42ab79634ea88c770454c78a49a4ca5902734,Merge_failed,ccfb789367ed0885d5249d98f5b42ab79634ea88c770454c78a49a4ca5902734,Tests_passed,773fb305d89906a431249b11848e306626316b2349359b6a0f4427410dcdd881,Merge_failed,62bc03afb42bea8ac00e8e2163d494c1771e09bd3def111b1fdc17201ae4f3e1,Merge_failed,ccfb789367ed0885d5249d98f5b42ab79634ea88c770454c78a49a4ca5902734,0.03705763816833496,0.04350924491882324,0.043884992599487305,0.04209494590759277,0.04614448547363281,0.04389238357543945,0.04522132873535156,0.4717438220977783,0.08257651329040527,0.30564069747924805,0.3080284595489502,0.40268921852111816,1.801511287689209,0.2086172103881836 +376,refs/remotes/origin/jackson-1.x,7a61777fca87b6c906be80940781f2ae80f36d82,c90ae65409409c029aed9a4f95969dbc2e41ea84,eda93eaa04a531de2708c32ce2c63e1a66754685,,True,True,d8a6c5da9f1d2830cffa9690d70a91d3c93dc83aa91a106dd889ace4098f36bb,Tests_passed,1d552a224c717e6295cfed4d78ae6dcca290dbe0908144f6b94c531f55c4069f,Tests_passed,True,True,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,ddc993693d98f2fc4f81f907d0e2f51e47e1eda6566f676688978f150f3b5219,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,ccfb789367ed0885d5249d98f5b42ab79634ea88c770454c78a49a4ca5902734,Merge_failed,ccfb789367ed0885d5249d98f5b42ab79634ea88c770454c78a49a4ca5902734,Tests_passed,773fb305d89906a431249b11848e306626316b2349359b6a0f4427410dcdd881,Merge_failed,62bc03afb42bea8ac00e8e2163d494c1771e09bd3def111b1fdc17201ae4f3e1,Merge_failed,ccfb789367ed0885d5249d98f5b42ab79634ea88c770454c78a49a4ca5902734,0.03705763816833496,0.04350924491882324,0.043884992599487305,0.04209494590759277,0.04614448547363281,0.04389238357543945,0.04522132873535156,0.4717438220977783,0.08257651329040527,0.3035929203033447,0.3047192096710205,0.40268921852111816,1.801511287689209,0.2086172103881836 diff --git a/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv b/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv index 3460e404d7..e01c03f238 100644 --- a/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv +++ b/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -48,refs/heads/master,a9c285647e87efe1b79f807945bddb313ec48dff,66147fee70536c1f3b85c8842345e6558a3e6013,9ddf13a742aac251f4ad6357ca06155db7e54d14,,True,True,84ebe7b9d66b61849e42e9170a4108b55a340be9c488e34e70a2f0872f03f67a,Tests_passed,90e5a10938146e86bdd3f55e737668ff046d0bfacaa707156b1fdf9201d4daaa,Tests_passed,True,True,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,0.04282855987548828,0.04440593719482422,0.04861021041870117,0.0491178035736084,0.05360674858093262,0.035639286041259766,0.04233098030090332,0.23371100425720215,0.045861005783081055,0.17669057846069336,0.1758253574371338,0.16594266891479492,1.4362125396728516,0.1905961036682129 +48,refs/heads/master,a9c285647e87efe1b79f807945bddb313ec48dff,66147fee70536c1f3b85c8842345e6558a3e6013,9ddf13a742aac251f4ad6357ca06155db7e54d14,,True,True,84ebe7b9d66b61849e42e9170a4108b55a340be9c488e34e70a2f0872f03f67a,Tests_passed,90e5a10938146e86bdd3f55e737668ff046d0bfacaa707156b1fdf9201d4daaa,Tests_passed,True,True,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,0.04282855987548828,0.04440593719482422,0.04861021041870117,0.0491178035736084,0.05360674858093262,0.035639286041259766,0.04233098030090332,0.23371100425720215,0.045861005783081055,0.17200207710266113,0.17344045639038086,0.16594266891479492,1.4362125396728516,0.1905961036682129 diff --git a/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv b/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv index aded238a0b..3e13fa29f7 100644 --- a/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv +++ b/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,8537d4687a51ced12400731b2a25204cfaa349ab,e4f609de937186203eb1d108ac03d1c39f7b99da,77325e31358997b2687f8cdc8e2e2c5f56907315,,f7f179000ead4f09c3205ceaf768a90bc0b37ebf229afbea63a1568ac476f0a9,Tests_passed,be2ac16673efd736957fc0a4881271162f1918837aa44e03c7d56348bc1ff04c,Tests_passed,True,True,True,True,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,626832339ac5d69645c2b3c0dcb03dcf5f251d50e49090508553f956e7916ac5,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,acd7f869cfa4f3fd1b1c50cabe9374611a896396ad41ec851eefe08a1994d223,Merge_failed,acd7f869cfa4f3fd1b1c50cabe9374611a896396ad41ec851eefe08a1994d223,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,c7b9fc1e03c65f37aed369876617b7243275c214b3eef7c281bdd9c932bc1f39,0.03909707069396973,0.03859543800354004,0.03127169609069824,0.03438711166381836,0.03657698631286621,0.03479456901550293,0.0355374813079834,0.1611189842224121,0.05897855758666992,0.07619714736938477,0.07601356506347656,0.08686661720275879,0.6514694690704346,0.1743922233581543 +5,refs/heads/master,8537d4687a51ced12400731b2a25204cfaa349ab,e4f609de937186203eb1d108ac03d1c39f7b99da,77325e31358997b2687f8cdc8e2e2c5f56907315,,f7f179000ead4f09c3205ceaf768a90bc0b37ebf229afbea63a1568ac476f0a9,Tests_passed,be2ac16673efd736957fc0a4881271162f1918837aa44e03c7d56348bc1ff04c,Tests_passed,True,True,True,True,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,626832339ac5d69645c2b3c0dcb03dcf5f251d50e49090508553f956e7916ac5,Merge_failed,692f24932bf93c2e04c086ed5346f4f1df07fe0d6b771305dcaf5c961a80c539,Merge_failed,acd7f869cfa4f3fd1b1c50cabe9374611a896396ad41ec851eefe08a1994d223,Merge_failed,acd7f869cfa4f3fd1b1c50cabe9374611a896396ad41ec851eefe08a1994d223,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,c7b9fc1e03c65f37aed369876617b7243275c214b3eef7c281bdd9c932bc1f39,0.03909707069396973,0.03859543800354004,0.03127169609069824,0.03438711166381836,0.03657698631286621,0.03479456901550293,0.0355374813079834,0.1611189842224121,0.05897855758666992,0.07583999633789062,0.07573103904724121,0.08686661720275879,0.6514694690704346,0.1743922233581543 diff --git a/results/combined/merges_timed/lusito/gamedevweek.csv b/results/combined/merges_timed/lusito/gamedevweek.csv index c99c76b366..903ee5d548 100644 --- a/results/combined/merges_timed/lusito/gamedevweek.csv +++ b/results/combined/merges_timed/lusito/gamedevweek.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1268,refs/remotes/origin/pull/11,bb4703104114664a8800674df2159429666c1863,ff80b1ebcd9bc61ee238da107f7baf770bca5251,8e399ff6a7b196f84ba3781b7d691eb5aaeba6d9,,True,True,accfbb20f0bf76789a82cca2a9556f1b625794272ebb0068fca02cc3b1fcc5ea,Tests_passed,18c5d3fe8edbba0e1dd4d46954a106f566e251c803ee17cf3f6f19a2e048aea1,Tests_passed,True,True,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,b7e1351df49a1459205627a905173fa09cc735e5dca2418fcf50b0f210de0396,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,2412b0f268154b5a5db9db279682b3f173301d0c3d8d6f567959d6362bd8ae69,Merge_failed,2412b0f268154b5a5db9db279682b3f173301d0c3d8d6f567959d6362bd8ae69,Merge_failed,d440b5099d6add98b9ad9b6359428d35e3223a47b44f7a1af24ec2b76fc616b8,Merge_failed,61f99111cf0f1d1cfebbdcb009d05e4db7a142889033a3dbcc09c639a2b0a0f0,Merge_failed,40a1a65ce77b46d6708153dbff4dd4479b0b3888ae61a2038887b651903720bd,0.05675959587097168,0.06282329559326172,0.06595087051391602,0.07547116279602051,0.05982851982116699,0.0624842643737793,0.06011247634887695,0.18968749046325684,0.3228263854980469,0.08183407783508301,0.08133339881896973,0.1399698257446289,0.6380906105041504,0.35050439834594727 +1268,refs/remotes/origin/pull/11,bb4703104114664a8800674df2159429666c1863,ff80b1ebcd9bc61ee238da107f7baf770bca5251,8e399ff6a7b196f84ba3781b7d691eb5aaeba6d9,,True,True,accfbb20f0bf76789a82cca2a9556f1b625794272ebb0068fca02cc3b1fcc5ea,Tests_passed,18c5d3fe8edbba0e1dd4d46954a106f566e251c803ee17cf3f6f19a2e048aea1,Tests_passed,True,True,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,b7e1351df49a1459205627a905173fa09cc735e5dca2418fcf50b0f210de0396,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,2412b0f268154b5a5db9db279682b3f173301d0c3d8d6f567959d6362bd8ae69,Merge_failed,2412b0f268154b5a5db9db279682b3f173301d0c3d8d6f567959d6362bd8ae69,Merge_failed,d440b5099d6add98b9ad9b6359428d35e3223a47b44f7a1af24ec2b76fc616b8,Merge_failed,61f99111cf0f1d1cfebbdcb009d05e4db7a142889033a3dbcc09c639a2b0a0f0,Merge_failed,40a1a65ce77b46d6708153dbff4dd4479b0b3888ae61a2038887b651903720bd,0.05675959587097168,0.06282329559326172,0.06595087051391602,0.07547116279602051,0.05982851982116699,0.0624842643737793,0.06011247634887695,0.18968749046325684,0.3228263854980469,0.08264517784118652,0.08111929893493652,0.1399698257446289,0.6380906105041504,0.35050439834594727 diff --git a/results/combined/merges_timed/lwhite1/tablesaw.csv b/results/combined/merges_timed/lwhite1/tablesaw.csv index 3e5e5796ef..1806adbe7b 100644 --- a/results/combined/merges_timed/lwhite1/tablesaw.csv +++ b/results/combined/merges_timed/lwhite1/tablesaw.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,Tests_passed,True,True,True,True,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,e71ab0b0cd1205338e1c0b3f892be18db428cb5bd54cb32a3be5042f210d8b0d,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,0.048371315002441406,0.04628753662109375,0.05490756034851074,0.05130600929260254,0.05663299560546875,0.056870222091674805,0.03991222381591797,0.29100465774536133,0.133436918258667,0.07276463508605957,0.07960629463195801,0.17363810539245605,1.5877776145935059,0.42774033546447754 +1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,Tests_passed,True,True,True,True,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,e71ab0b0cd1205338e1c0b3f892be18db428cb5bd54cb32a3be5042f210d8b0d,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,0.048371315002441406,0.04628753662109375,0.05490756034851074,0.05130600929260254,0.05663299560546875,0.056870222091674805,0.03991222381591797,0.29100465774536133,0.133436918258667,0.06987881660461426,0.07134270668029785,0.17363810539245605,1.5877776145935059,0.42774033546447754 diff --git a/results/combined/merges_timed/lyncode/xoai.csv b/results/combined/merges_timed/lyncode/xoai.csv index 6afe41b45d..3020283eed 100644 --- a/results/combined/merges_timed/lyncode/xoai.csv +++ b/results/combined/merges_timed/lyncode/xoai.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/3.x,5679c2e9385c07c78a5b50d34c0ddab31a0e1745,37472820e6a9725ac72f2c0df6fd161f16729f8a,2c79b4b8d3f8975b7a222d0205c681425cda22ad,,True,True,5bb6e28c6bc1669d13a397a4a88a9f68b2fee28ca6264c70503d926199e77f6f,Tests_passed,d398acea29e7643af903b975a94bcfc3af663d939072ac52b0945b61d02bc56e,Tests_passed,True,True,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,0.018093585968017578,0.04619288444519043,0.05799221992492676,0.05537748336791992,0.04969906806945801,0.03796195983886719,0.06113314628601074,0.25501251220703125,0.05934715270996094,0.3252296447753906,0.32358431816101074,0.18203163146972656,0.04405951499938965,0.3008716106414795 +1,refs/heads/3.x,5679c2e9385c07c78a5b50d34c0ddab31a0e1745,37472820e6a9725ac72f2c0df6fd161f16729f8a,2c79b4b8d3f8975b7a222d0205c681425cda22ad,,True,True,5bb6e28c6bc1669d13a397a4a88a9f68b2fee28ca6264c70503d926199e77f6f,Tests_passed,d398acea29e7643af903b975a94bcfc3af663d939072ac52b0945b61d02bc56e,Tests_passed,True,True,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,0.018093585968017578,0.04619288444519043,0.05799221992492676,0.05537748336791992,0.04969906806945801,0.03796195983886719,0.06113314628601074,0.25501251220703125,0.05934715270996094,0.3044109344482422,0.31804823875427246,0.18203163146972656,0.04405951499938965,0.3008716106414795 diff --git a/results/combined/merges_timed/lyogavin/pistachio.csv b/results/combined/merges_timed/lyogavin/pistachio.csv index 0fd92df7ca..a43db866d3 100644 --- a/results/combined/merges_timed/lyogavin/pistachio.csv +++ b/results/combined/merges_timed/lyogavin/pistachio.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,ff601b3619a0dbfb8867aba4b4c27227bef5bbf9,f4e73ff847ae74d7b17e0968adf729b348fce8e7,a5d70922b6c8a43679c3212b3d77ceaccb96a919,,5ae694e25384883aaf6d256385e99ee2082d2a0e1698a921d2e48199fa45e110,Tests_passed,dc468c3da8474229fb8662de79441d1437e60bfe1eb6b8aa57908f3d54eb7d68,Tests_passed,True,True,True,True,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,0.03882908821105957,0.035115957260131836,0.04642009735107422,0.07220911979675293,0.04412984848022461,0.04879045486450195,0.04467344284057617,0.15660738945007324,0.021355152130126953,0.19508600234985352,0.19230413436889648,0.11403727531433105,1.228060245513916,0.24762964248657227 +2,refs/heads/master,ff601b3619a0dbfb8867aba4b4c27227bef5bbf9,f4e73ff847ae74d7b17e0968adf729b348fce8e7,a5d70922b6c8a43679c3212b3d77ceaccb96a919,,5ae694e25384883aaf6d256385e99ee2082d2a0e1698a921d2e48199fa45e110,Tests_passed,dc468c3da8474229fb8662de79441d1437e60bfe1eb6b8aa57908f3d54eb7d68,Tests_passed,True,True,True,True,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,0.03882908821105957,0.035115957260131836,0.04642009735107422,0.07220911979675293,0.04412984848022461,0.04879045486450195,0.04467344284057617,0.15660738945007324,0.021355152130126953,0.19350719451904297,0.1928110122680664,0.11403727531433105,1.228060245513916,0.24762964248657227 diff --git a/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv b/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv index 4d3f5f6bec..bdc76d25cb 100644 --- a/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv +++ b/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,333c0d3cd9cca7b7361c77e6d7cd6f274d3f19a3,fbfede3054cf04fc2c68df1c62bdab45d7139a35,29577ff717de7ddd32a8b667cdd9631d82bdf0f3,,True,True,1220db2ce7dc885dce822850a05ddac790457ae1430ad6ebda964631a889145b,Tests_passed,9a970b129d3266cf25c0b67681d0e5b188b40e4701ac7f461047e7470587ee15,Tests_passed,True,True,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,dea694a4fceb427124899a1d29cdb30f701237b700db49f1dd8e26c60fbf0364,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,dea694a4fceb427124899a1d29cdb30f701237b700db49f1dd8e26c60fbf0364,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,ae1c4f6980baf959ab9bb2e512bfa77e1cb2f373601e767e0849d2f10fa78389,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,971a8cecc587473749842a0fb2a6b795ada67d49abb5fb1bc0fa673d61af5906,Merge_failed,971a8cecc587473749842a0fb2a6b795ada67d49abb5fb1bc0fa673d61af5906,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,90a5ec1048759e6537807a01fe4793b678c1a56b7348e1d82f96f34fec7ac575,0.04538273811340332,0.04154062271118164,0.040235280990600586,0.0338749885559082,0.037619590759277344,0.04114222526550293,0.04457736015319824,0.15456867218017578,0.05660104751586914,0.07230758666992188,0.06782031059265137,0.11895298957824707,0.688096284866333,0.1799631118774414 +5,refs/heads/master,333c0d3cd9cca7b7361c77e6d7cd6f274d3f19a3,fbfede3054cf04fc2c68df1c62bdab45d7139a35,29577ff717de7ddd32a8b667cdd9631d82bdf0f3,,True,True,1220db2ce7dc885dce822850a05ddac790457ae1430ad6ebda964631a889145b,Tests_passed,9a970b129d3266cf25c0b67681d0e5b188b40e4701ac7f461047e7470587ee15,Tests_passed,True,True,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,dea694a4fceb427124899a1d29cdb30f701237b700db49f1dd8e26c60fbf0364,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,dea694a4fceb427124899a1d29cdb30f701237b700db49f1dd8e26c60fbf0364,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,ae1c4f6980baf959ab9bb2e512bfa77e1cb2f373601e767e0849d2f10fa78389,Merge_failed,e9089ffba36ff070d98da8ba56866dd0920b8f20b94cebdc11ac088c789d53c6,Merge_failed,971a8cecc587473749842a0fb2a6b795ada67d49abb5fb1bc0fa673d61af5906,Merge_failed,971a8cecc587473749842a0fb2a6b795ada67d49abb5fb1bc0fa673d61af5906,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,90a5ec1048759e6537807a01fe4793b678c1a56b7348e1d82f96f34fec7ac575,0.04538273811340332,0.04154062271118164,0.040235280990600586,0.0338749885559082,0.037619590759277344,0.04114222526550293,0.04457736015319824,0.15456867218017578,0.05660104751586914,0.06540918350219727,0.06463766098022461,0.11895298957824707,0.688096284866333,0.1799631118774414 diff --git a/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv b/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv index 14d0f8dba7..06fbf798b2 100644 --- a/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv +++ b/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,bb5c4358ae5fc9c767cc7fe32e99969126f1e5df,928fbabd7c7292ea41610b9df0b96bb56eff82a6,5039fb9c869e1e2eb7aee718d786ab54763e44bd,,True,True,5d078a1abb2dc38b5eac03cd51e092eb0f497b7364c198e22f8ff0eef4c1a703,Tests_passed,e159b749eb7574aee691b271ab55ff23196d4677dc2beeaf6f7da32eb649bb89,Tests_passed,True,True,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_failed,95e3072c3dedb263ae7f33e1f2fe8c02c2d5c55602fe8280c7cf40ea481a62f0,Tests_failed,95e3072c3dedb263ae7f33e1f2fe8c02c2d5c55602fe8280c7cf40ea481a62f0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,0.04467344284057617,0.04408454895019531,0.046869754791259766,0.04674220085144043,0.049620628356933594,0.048217058181762695,0.04172515869140625,0.22690582275390625,0.0431368350982666,0.3105611801147461,0.31168484687805176,0.17677879333496094,1.977637529373169,0.18552017211914062 +1,refs/heads/master,bb5c4358ae5fc9c767cc7fe32e99969126f1e5df,928fbabd7c7292ea41610b9df0b96bb56eff82a6,5039fb9c869e1e2eb7aee718d786ab54763e44bd,,True,True,5d078a1abb2dc38b5eac03cd51e092eb0f497b7364c198e22f8ff0eef4c1a703,Tests_passed,e159b749eb7574aee691b271ab55ff23196d4677dc2beeaf6f7da32eb649bb89,Tests_passed,True,True,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_failed,95e3072c3dedb263ae7f33e1f2fe8c02c2d5c55602fe8280c7cf40ea481a62f0,Tests_failed,95e3072c3dedb263ae7f33e1f2fe8c02c2d5c55602fe8280c7cf40ea481a62f0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,0.04467344284057617,0.04408454895019531,0.046869754791259766,0.04674220085144043,0.049620628356933594,0.048217058181762695,0.04172515869140625,0.22690582275390625,0.0431368350982666,0.30629563331604004,0.3094642162322998,0.17677879333496094,1.977637529373169,0.18552017211914062 diff --git a/results/combined/merges_timed/magro/kryo-serializers.csv b/results/combined/merges_timed/magro/kryo-serializers.csv index 71f456d41c..502bbf763f 100644 --- a/results/combined/merges_timed/magro/kryo-serializers.csv +++ b/results/combined/merges_timed/magro/kryo-serializers.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,a2d16aa4330cc067402178119dfb967842efc17a,c29d105ef21670d59450c0709d3f8e190dc4c5c8,eeb8393425b557c013719052fad3b842db850835,,True,True,c1bd50dced53135fb544c76a2bfd574a7137495513da023867db3a1afc3c9a5b,Tests_passed,72034e238a12007f7d4e8e32a2140d41345f3f5322c1409491980d255f4523ec,Tests_passed,True,True,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,0.05600309371948242,0.04401969909667969,0.03910112380981445,0.06347823143005371,0.046304941177368164,0.06713700294494629,0.049036264419555664,0.17649102210998535,0.04177427291870117,0.1540076732635498,0.15379047393798828,0.12017488479614258,0.6558918952941895,0.2021479606628418 +18,refs/heads/master,a2d16aa4330cc067402178119dfb967842efc17a,c29d105ef21670d59450c0709d3f8e190dc4c5c8,eeb8393425b557c013719052fad3b842db850835,,True,True,c1bd50dced53135fb544c76a2bfd574a7137495513da023867db3a1afc3c9a5b,Tests_passed,72034e238a12007f7d4e8e32a2140d41345f3f5322c1409491980d255f4523ec,Tests_passed,True,True,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,0.05600309371948242,0.04401969909667969,0.03910112380981445,0.06347823143005371,0.046304941177368164,0.06713700294494629,0.049036264419555664,0.17649102210998535,0.04177427291870117,0.15117335319519043,0.1510171890258789,0.12017488479614258,0.6558918952941895,0.2021479606628418 diff --git a/results/combined/merges_timed/mahoney/slf4j-test.csv b/results/combined/merges_timed/mahoney/slf4j-test.csv index 5dbb71321b..6c14a0b026 100644 --- a/results/combined/merges_timed/mahoney/slf4j-test.csv +++ b/results/combined/merges_timed/mahoney/slf4j-test.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/1.0-RELEASE-jdk1.6,896b4a6a0d490aae9515e449244d1012bfb3d87b,f2858da07e04c8bbcad4183c7e003c192ce9f625,29d7e6d843162d4c522e532cfd6b9cc68906d17c,,77681d7b3da4e5404bfded7729664f2e6d32174b3a8d49edb5deaa76c5bc8bc0,Tests_passed,e4f1320f6625ac0e6284253164dd55970eb397b857b1cc6ad9c616e558d30f95,Tests_passed,True,True,True,True,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,a7c39fe3968efb7db6a971303cccae58e940d785f4b055781c545638908473ca,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,2ce55593c65b34f0224ea9781068780e52939bd5d2808b92f6ad6faddcc83c5f,Merge_failed,2ce55593c65b34f0224ea9781068780e52939bd5d2808b92f6ad6faddcc83c5f,Merge_failed,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,697eb084212e80dddcbb61dddeb2e8423f3a044bfe4ed01d22ca993a0d448d30,Merge_failed,99eb509fe3f066a575cef7183da71aa2aec19728483b8ab0ed75e735c20592ec,0.04391622543334961,0.02944159507751465,0.02807784080505371,0.0276639461517334,0.026648283004760742,0.03947257995605469,0.03449368476867676,0.315645694732666,0.04212760925292969,0.6060941219329834,0.6082186698913574,0.33276987075805664,5.046327829360962,0.2091083526611328 +4,refs/remotes/origin/1.0-RELEASE-jdk1.6,896b4a6a0d490aae9515e449244d1012bfb3d87b,f2858da07e04c8bbcad4183c7e003c192ce9f625,29d7e6d843162d4c522e532cfd6b9cc68906d17c,,77681d7b3da4e5404bfded7729664f2e6d32174b3a8d49edb5deaa76c5bc8bc0,Tests_passed,e4f1320f6625ac0e6284253164dd55970eb397b857b1cc6ad9c616e558d30f95,Tests_passed,True,True,True,True,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,a7c39fe3968efb7db6a971303cccae58e940d785f4b055781c545638908473ca,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,2ce55593c65b34f0224ea9781068780e52939bd5d2808b92f6ad6faddcc83c5f,Merge_failed,2ce55593c65b34f0224ea9781068780e52939bd5d2808b92f6ad6faddcc83c5f,Merge_failed,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,697eb084212e80dddcbb61dddeb2e8423f3a044bfe4ed01d22ca993a0d448d30,Merge_failed,99eb509fe3f066a575cef7183da71aa2aec19728483b8ab0ed75e735c20592ec,0.04391622543334961,0.02944159507751465,0.02807784080505371,0.0276639461517334,0.026648283004760742,0.03947257995605469,0.03449368476867676,0.315645694732666,0.04212760925292969,0.5997006893157959,0.6002764701843262,0.33276987075805664,5.046327829360962,0.2091083526611328 diff --git a/results/combined/merges_timed/mambu-gmbh/mambu-apis-java.csv b/results/combined/merges_timed/mambu-gmbh/mambu-apis-java.csv index 95d3faa678..8dc8fdafef 100644 --- a/results/combined/merges_timed/mambu-gmbh/mambu-apis-java.csv +++ b/results/combined/merges_timed/mambu-gmbh/mambu-apis-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/heads/master,1da0e26ad55b2f4a1738ef3e7f57ac5ca6ca0ae7,a14a20e30055f71086d497513af21f5f5d6f6f2d,c6afe3ed0a26ebb6bab9a5ccd81a9990902c894e,,True,True,a4edd5760c2b7ead9d4c555095d228c14e51c5ca2c6893690bd98a29ff9bba27,Tests_passed,4b8e90f869382c8db30e32d7a928d36d6d8c29c46607f723f951d7ba1688448b,Tests_passed,True,True,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,da4ef095da5cb6a90fb300009d8e80593fabfc75182cfaac04691cb31df34149,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,c8e3b367113f30e10acf9138dbe1e82a733f8d7b1a656ed15acd44dd3ec47612,Merge_failed,c8e3b367113f30e10acf9138dbe1e82a733f8d7b1a656ed15acd44dd3ec47612,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Merge_failed,d85a00ff6fe86eccc112e5f2319af5b4b5ad6f14661b910ed1dd058adba2f3f3,0.0607905387878418,0.05879640579223633,0.07421278953552246,0.04468727111816406,0.012754440307617188,0.06969380378723145,0.0705568790435791,0.21179986000061035,0.11902046203613281,0.10615086555480957,0.1192476749420166,0.08249711990356445,1.3066048622131348,0.35101962089538574 +23,refs/heads/master,1da0e26ad55b2f4a1738ef3e7f57ac5ca6ca0ae7,a14a20e30055f71086d497513af21f5f5d6f6f2d,c6afe3ed0a26ebb6bab9a5ccd81a9990902c894e,,True,True,a4edd5760c2b7ead9d4c555095d228c14e51c5ca2c6893690bd98a29ff9bba27,Tests_passed,4b8e90f869382c8db30e32d7a928d36d6d8c29c46607f723f951d7ba1688448b,Tests_passed,True,True,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,da4ef095da5cb6a90fb300009d8e80593fabfc75182cfaac04691cb31df34149,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,c8e3b367113f30e10acf9138dbe1e82a733f8d7b1a656ed15acd44dd3ec47612,Merge_failed,c8e3b367113f30e10acf9138dbe1e82a733f8d7b1a656ed15acd44dd3ec47612,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Merge_failed,d85a00ff6fe86eccc112e5f2319af5b4b5ad6f14661b910ed1dd058adba2f3f3,0.0607905387878418,0.05879640579223633,0.07421278953552246,0.04468727111816406,0.012754440307617188,0.06969380378723145,0.0705568790435791,0.21179986000061035,0.11902046203613281,0.11871695518493652,0.11879873275756836,0.08249711990356445,1.3066048622131348,0.35101962089538574 diff --git a/results/combined/merges_timed/mangstadt/ez-vcard.csv b/results/combined/merges_timed/mangstadt/ez-vcard.csv index f53852be7a..dd7a342762 100644 --- a/results/combined/merges_timed/mangstadt/ez-vcard.csv +++ b/results/combined/merges_timed/mangstadt/ez-vcard.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,0.04158449172973633,0.04814767837524414,0.05866360664367676,0.04657316207885742,0.0658559799194336,0.07129144668579102,0.07176733016967773,0.7076160907745361,0.04355621337890625,1.1982927322387695,1.2077281475067139,0.541736364364624,6.070753812789917,0.7238368988037109 +6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,0.04158449172973633,0.04814767837524414,0.05866360664367676,0.04657316207885742,0.0658559799194336,0.07129144668579102,0.07176733016967773,0.7076160907745361,0.04355621337890625,1.2053446769714355,1.215362787246704,0.541736364364624,6.070753812789917,0.7238368988037109 diff --git a/results/combined/merges_timed/maoo/maven-tiles.csv b/results/combined/merges_timed/maoo/maven-tiles.csv index dde398602d..f7524517d6 100644 --- a/results/combined/merges_timed/maoo/maven-tiles.csv +++ b/results/combined/merges_timed/maoo/maven-tiles.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,515cbbb77720e2ad118b4ab9017a3e99e8fcb885,01ee12244e800c1980b5811f1abdabc19496c256,680ba8647d6b9c9a604064543b5d3aeff2bcabda,,True,True,f4f39390b1c4f6a4bf7c7e30bcae46481f75f7e0b1232f6212edfb64fefd60a7,Tests_passed,2d4c0f3a7a5f305a980070e31838f46fb1e0f2d33b32a7fe20506071d217407d,Tests_passed,True,True,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_failed,97800e09250d37cf0b0713933bf65382c95ca9b27cbc81b9059f28f6548788e4,Tests_failed,97800e09250d37cf0b0713933bf65382c95ca9b27cbc81b9059f28f6548788e4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,0.010893106460571289,0.010938882827758789,0.01184701919555664,0.011476516723632812,0.011806249618530273,0.011827707290649414,0.011629819869995117,0.036752939224243164,0.010871171951293945,0.14596295356750488,0.14645123481750488,0.0689089298248291,0.6472947597503662,0.17025160789489746 +5,refs/heads/master,515cbbb77720e2ad118b4ab9017a3e99e8fcb885,01ee12244e800c1980b5811f1abdabc19496c256,680ba8647d6b9c9a604064543b5d3aeff2bcabda,,True,True,f4f39390b1c4f6a4bf7c7e30bcae46481f75f7e0b1232f6212edfb64fefd60a7,Tests_passed,2d4c0f3a7a5f305a980070e31838f46fb1e0f2d33b32a7fe20506071d217407d,Tests_passed,True,True,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_failed,97800e09250d37cf0b0713933bf65382c95ca9b27cbc81b9059f28f6548788e4,Tests_failed,97800e09250d37cf0b0713933bf65382c95ca9b27cbc81b9059f28f6548788e4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,0.010893106460571289,0.010938882827758789,0.01184701919555664,0.011476516723632812,0.011806249618530273,0.011827707290649414,0.011629819869995117,0.036752939224243164,0.010871171951293945,0.14477109909057617,0.14441633224487305,0.0689089298248291,0.6472947597503662,0.17025160789489746 diff --git a/results/combined/merges_timed/marginallyclever/makelangelo.csv b/results/combined/merges_timed/marginallyclever/makelangelo.csv index 097d1ef6db..853d91a045 100644 --- a/results/combined/merges_timed/marginallyclever/makelangelo.csv +++ b/results/combined/merges_timed/marginallyclever/makelangelo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,f96ea74ffaf63c820dae4ed5e33941dfd9230a7c,8c91c249baee9d3a72e876c42f3dc387953e9bff,f8be12ef2f4810fbebac0340bd28cf2443980e6b,,True,True,fe6f454312255f2c40449c6c91317b1d27d621779beb3f250545457e00e3b85f,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Tests_passed,True,True,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,d219c0315a713ec6178cda2b7e6e0a5dabd9aef83234afadb299b8b8ddcc311e,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,237815a1220fe817f86eb8193fc05af175731701b9e126f92a2a8b408a927cf1,Merge_failed,237815a1220fe817f86eb8193fc05af175731701b9e126f92a2a8b408a927cf1,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,0.16118693351745605,0.16203022003173828,0.19755220413208008,0.19390344619750977,0.19617056846618652,0.19744300842285156,0.19742035865783691,0.38646984100341797,0.2450568675994873,0.4094111919403076,0.4084799289703369,0.3678762912750244,0.16341614723205566,0.6972992420196533 +4,refs/heads/master,f96ea74ffaf63c820dae4ed5e33941dfd9230a7c,8c91c249baee9d3a72e876c42f3dc387953e9bff,f8be12ef2f4810fbebac0340bd28cf2443980e6b,,True,True,fe6f454312255f2c40449c6c91317b1d27d621779beb3f250545457e00e3b85f,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Tests_passed,True,True,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,d219c0315a713ec6178cda2b7e6e0a5dabd9aef83234afadb299b8b8ddcc311e,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,237815a1220fe817f86eb8193fc05af175731701b9e126f92a2a8b408a927cf1,Merge_failed,237815a1220fe817f86eb8193fc05af175731701b9e126f92a2a8b408a927cf1,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,0.16118693351745605,0.16203022003173828,0.19755220413208008,0.19390344619750977,0.19617056846618652,0.19744300842285156,0.19742035865783691,0.38646984100341797,0.2450568675994873,0.4000060558319092,0.40027928352355957,0.3678762912750244,0.16341614723205566,0.6972992420196533 diff --git a/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv b/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv index 8117d62051..652552e968 100644 --- a/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv +++ b/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,e1a3624d06c1979b6fcf2d4f059c0a0e563451e1,66fd6488824b7aa0f15b7172466d4f9f465db644,13915de94d70a4d8e53cba4c0056c5b4af2cdfde,,True,True,d714b13ae10bb963007331bf6b5e6c553b23d5a883702289c777437cb4bcdbd1,Tests_passed,4c40dc2ebac3ed9ef5cdd75797c83c666a75c998b4597e3ef6892bced615acc0,Tests_passed,True,True,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,0.013731718063354492,0.038069725036621094,0.04551553726196289,0.03260302543640137,0.018593549728393555,0.014763116836547852,0.05637550354003906,0.1608738899230957,0.040431976318359375,0.16280031204223633,0.16224241256713867,0.11301279067993164,0.756047248840332,0.17866778373718262 +4,refs/heads/master,e1a3624d06c1979b6fcf2d4f059c0a0e563451e1,66fd6488824b7aa0f15b7172466d4f9f465db644,13915de94d70a4d8e53cba4c0056c5b4af2cdfde,,True,True,d714b13ae10bb963007331bf6b5e6c553b23d5a883702289c777437cb4bcdbd1,Tests_passed,4c40dc2ebac3ed9ef5cdd75797c83c666a75c998b4597e3ef6892bced615acc0,Tests_passed,True,True,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,0.013731718063354492,0.038069725036621094,0.04551553726196289,0.03260302543640137,0.018593549728393555,0.014763116836547852,0.05637550354003906,0.1608738899230957,0.040431976318359375,0.15999341011047363,0.1607356071472168,0.11301279067993164,0.756047248840332,0.17866778373718262 diff --git a/results/combined/merges_timed/marschall/memoryfilesystem.csv b/results/combined/merges_timed/marschall/memoryfilesystem.csv index 1b50f74e3a..1be66f9bf1 100644 --- a/results/combined/merges_timed/marschall/memoryfilesystem.csv +++ b/results/combined/merges_timed/marschall/memoryfilesystem.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/heads/master,fda60ab1b9a42f2e4ab6249852b3d2f0a40c9b56,f63459184f11f1681a38d7f0dccc30426ded34ae,0f2c367a1172610941024e8fcc319242db890219,,True,True,96271c10f4d01634504f284e3581f37a0917ed3cb463d6d9113db50c18b4490a,Tests_passed,470dabe5eb8b75e6601bc8d346ad3ccd4bd539c44059938f18837837ba0a19e0,Tests_passed,True,True,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,0.014387130737304688,0.014564275741577148,0.016237735748291016,0.016002178192138672,0.016165494918823242,0.016065597534179688,0.01610541343688965,0.054817914962768555,0.013945579528808594,0.379274845123291,0.36887264251708984,0.12262868881225586,4.513042211532593,0.18160152435302734 +32,refs/heads/master,fda60ab1b9a42f2e4ab6249852b3d2f0a40c9b56,f63459184f11f1681a38d7f0dccc30426ded34ae,0f2c367a1172610941024e8fcc319242db890219,,True,True,96271c10f4d01634504f284e3581f37a0917ed3cb463d6d9113db50c18b4490a,Tests_passed,470dabe5eb8b75e6601bc8d346ad3ccd4bd539c44059938f18837837ba0a19e0,Tests_passed,True,True,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,0.014387130737304688,0.014564275741577148,0.016237735748291016,0.016002178192138672,0.016165494918823242,0.016065597534179688,0.01610541343688965,0.054817914962768555,0.013945579528808594,0.36440205574035645,0.3637239933013916,0.12262868881225586,4.513042211532593,0.18160152435302734 diff --git a/results/combined/merges_timed/martinpaljak/globalplatformpro.csv b/results/combined/merges_timed/martinpaljak/globalplatformpro.csv index 80ed45983b..6c2d5e522d 100644 --- a/results/combined/merges_timed/martinpaljak/globalplatformpro.csv +++ b/results/combined/merges_timed/martinpaljak/globalplatformpro.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/remotes/origin/pull/264,6a5d74685625e3deb07447a3b4bf29d01ef17d6f,678b25980013b7708e9ccf155939016ee027c00e,a0096642ac72a49d487e9a4b69169d95b2b0c87b,,True,True,02ce8c12a7b4e2a5efc2cca4994a8d81e04fe6785fab859a47b5364638ebc046,Tests_passed,f68f35521db577d4ab64fe41097904360b45d4feb76b687d179521b01060fd5c,Tests_passed,True,True,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,11c2dd09feb0e4df6e22e74a3da9c36598ef1842cdcf8667218c50ac5d200faf,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,f78cc61c5d1004fd30a20d41be66102a3a60a346b28bc1e133e0797b905fbfe1,Merge_failed,f78cc61c5d1004fd30a20d41be66102a3a60a346b28bc1e133e0797b905fbfe1,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Merge_failed,237771207639ba0a3d800943d924bc737b189c422756a2d3a215629dc9dcba73,0.0726621150970459,0.0724024772644043,0.08779096603393555,0.0876626968383789,0.08854389190673828,0.08743143081665039,0.08709883689880371,0.16604161262512207,0.08710265159606934,0.22739505767822266,0.28484487533569336,0.18637633323669434,2.2943496704101562,0.26923584938049316 +16,refs/remotes/origin/pull/264,6a5d74685625e3deb07447a3b4bf29d01ef17d6f,678b25980013b7708e9ccf155939016ee027c00e,a0096642ac72a49d487e9a4b69169d95b2b0c87b,,True,True,02ce8c12a7b4e2a5efc2cca4994a8d81e04fe6785fab859a47b5364638ebc046,Tests_passed,f68f35521db577d4ab64fe41097904360b45d4feb76b687d179521b01060fd5c,Tests_passed,True,True,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,11c2dd09feb0e4df6e22e74a3da9c36598ef1842cdcf8667218c50ac5d200faf,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,f78cc61c5d1004fd30a20d41be66102a3a60a346b28bc1e133e0797b905fbfe1,Merge_failed,f78cc61c5d1004fd30a20d41be66102a3a60a346b28bc1e133e0797b905fbfe1,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Merge_failed,237771207639ba0a3d800943d924bc737b189c422756a2d3a215629dc9dcba73,0.0726621150970459,0.0724024772644043,0.08779096603393555,0.0876626968383789,0.08854389190673828,0.08743143081665039,0.08709883689880371,0.16604161262512207,0.08710265159606934,0.25600218772888184,0.2859528064727783,0.18637633323669434,2.2943496704101562,0.26923584938049316 diff --git a/results/combined/merges_timed/martylamb/nailgun.csv b/results/combined/merges_timed/martylamb/nailgun.csv index 153a41e89f..542025955c 100644 --- a/results/combined/merges_timed/martylamb/nailgun.csv +++ b/results/combined/merges_timed/martylamb/nailgun.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -60,refs/heads/main,7f1e1bc712bec6ad375f7d0e6cdc46323126b448,6f39efa91e60c1e0aa9ae11477c27e3b5f90c5a0,e20aaa3618f88209f1c343233c0fcf5c15ecef70,,True,True,14ca52e6a17a9dc27808e6ad7f46e234a43897759abae64b71a546e10f74d67f,Tests_passed,40a35cfa263bfbf52b96fe83ad80c91531b344aa526dd13c41ada070cfb3c8ba,Tests_passed,True,True,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,0.04232430458068848,0.04249167442321777,0.0425877571105957,0.041326045989990234,0.042207956314086914,0.03857088088989258,0.044997453689575195,0.16165518760681152,0.03920698165893555,0.15935897827148438,0.16066288948059082,0.10852479934692383,0.8570370674133301,0.2069087028503418 +60,refs/heads/main,7f1e1bc712bec6ad375f7d0e6cdc46323126b448,6f39efa91e60c1e0aa9ae11477c27e3b5f90c5a0,e20aaa3618f88209f1c343233c0fcf5c15ecef70,,True,True,14ca52e6a17a9dc27808e6ad7f46e234a43897759abae64b71a546e10f74d67f,Tests_passed,40a35cfa263bfbf52b96fe83ad80c91531b344aa526dd13c41ada070cfb3c8ba,Tests_passed,True,True,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,0.04232430458068848,0.04249167442321777,0.0425877571105957,0.041326045989990234,0.042207956314086914,0.03857088088989258,0.044997453689575195,0.16165518760681152,0.03920698165893555,0.15734648704528809,0.15855646133422852,0.10852479934692383,0.8570370674133301,0.2069087028503418 diff --git a/results/combined/merges_timed/mashape/unirest-java.csv b/results/combined/merges_timed/mashape/unirest-java.csv index c33803ac30..884985e5f9 100644 --- a/results/combined/merges_timed/mashape/unirest-java.csv +++ b/results/combined/merges_timed/mashape/unirest-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,True,True,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,Tests_passed,True,True,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,0.04461789131164551,0.04957842826843262,0.04445624351501465,0.0460667610168457,0.04918169975280762,0.046738624572753906,0.04153919219970703,0.17164087295532227,0.047705888748168945,0.15787243843078613,0.15985941886901855,0.11038875579833984,1.0721900463104248,0.21371793746948242 +79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,True,True,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,Tests_passed,True,True,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,0.04461789131164551,0.04957842826843262,0.04445624351501465,0.0460667610168457,0.04918169975280762,0.046738624572753906,0.04153919219970703,0.17164087295532227,0.047705888748168945,0.15738511085510254,0.1593334674835205,0.11038875579833984,1.0721900463104248,0.21371793746948242 diff --git a/results/combined/merges_timed/masterthought/cucumber-reporting.csv b/results/combined/merges_timed/masterthought/cucumber-reporting.csv index a24e8e5b1a..81d5bea802 100644 --- a/results/combined/merges_timed/masterthought/cucumber-reporting.csv +++ b/results/combined/merges_timed/masterthought/cucumber-reporting.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -87,refs/heads/master,c802cd0adbaa29205317b5c2ee784fc4d4370eee,a84fba80c5118fe61c391a8a1c54443384c9c41e,c0cb60d570e3ca1f07fbf85c7c24ec78be48c3af,,True,True,8e1d308464d6073c7af06f0a916c3c166651d129ace0778805ef75f32bd71223,Tests_passed,4d372614fccdfb19ae68845434319419fa14d443d9e4fc4e05f52ba8182214a1,Tests_passed,True,True,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Merge_failed,44e65f36b528691f9aacac6617dc264a6688d95f9c452d568fab84385b142c7e,Merge_failed,44e65f36b528691f9aacac6617dc264a6688d95f9c452d568fab84385b142c7e,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,0.01889801025390625,0.020113229751586914,0.0406343936920166,0.02993941307067871,0.05425572395324707,0.02560877799987793,0.03447985649108887,0.1975998878479004,0.046683311462402344,0.24217867851257324,0.23912787437438965,0.16142559051513672,1.2479982376098633,0.28583455085754395 +87,refs/heads/master,c802cd0adbaa29205317b5c2ee784fc4d4370eee,a84fba80c5118fe61c391a8a1c54443384c9c41e,c0cb60d570e3ca1f07fbf85c7c24ec78be48c3af,,True,True,8e1d308464d6073c7af06f0a916c3c166651d129ace0778805ef75f32bd71223,Tests_passed,4d372614fccdfb19ae68845434319419fa14d443d9e4fc4e05f52ba8182214a1,Tests_passed,True,True,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Merge_failed,44e65f36b528691f9aacac6617dc264a6688d95f9c452d568fab84385b142c7e,Merge_failed,44e65f36b528691f9aacac6617dc264a6688d95f9c452d568fab84385b142c7e,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,0.01889801025390625,0.020113229751586914,0.0406343936920166,0.02993941307067871,0.05425572395324707,0.02560877799987793,0.03447985649108887,0.1975998878479004,0.046683311462402344,0.21973299980163574,0.2324352264404297,0.16142559051513672,1.2479982376098633,0.28583455085754395 diff --git a/results/combined/merges_timed/matthias247/jawampa.csv b/results/combined/merges_timed/matthias247/jawampa.csv index 4cead3b5e8..52c44ddebd 100644 --- a/results/combined/merges_timed/matthias247/jawampa.csv +++ b/results/combined/merges_timed/matthias247/jawampa.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/heads/master,f956e0584ab3323680744ef58438b1b09f11846a,cdb22b91593b13b98b53ca21965c6cbfd58a3954,90ac8af923bd105c3defbcdd74aa0e9679f06447,,True,True,98a6f144331eebf5bd1ce2b27e90201da3ef8bbaf9c7fc14fe552d713fc56cfb,Tests_passed,7d5a8debb7a164133a61ce384ec695eea2888e55479f2b55b0da11acff07a70e,Tests_passed,True,True,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,86d51c9a1077cfba5defabd94c5193d87e9bccd633d18a8e8d40c6aa468381b0,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,bd8232b6b35ac7f435dde97b8f8577cb61393bff00d9b34334af11c400b3c748,Merge_failed,bd8232b6b35ac7f435dde97b8f8577cb61393bff00d9b34334af11c400b3c748,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Merge_failed,4daedf5be747d8e3357e4da2061c0a18d6b6b899f598c5b61401e128fa1b9bfb,0.04606318473815918,0.012862682342529297,0.051427364349365234,0.05177474021911621,0.04097270965576172,0.04440164566040039,0.053426265716552734,0.24523472785949707,0.07314944267272949,0.25729966163635254,0.2570924758911133,0.1783289909362793,3.3546664714813232,0.2018277645111084 +25,refs/heads/master,f956e0584ab3323680744ef58438b1b09f11846a,cdb22b91593b13b98b53ca21965c6cbfd58a3954,90ac8af923bd105c3defbcdd74aa0e9679f06447,,True,True,98a6f144331eebf5bd1ce2b27e90201da3ef8bbaf9c7fc14fe552d713fc56cfb,Tests_passed,7d5a8debb7a164133a61ce384ec695eea2888e55479f2b55b0da11acff07a70e,Tests_passed,True,True,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,86d51c9a1077cfba5defabd94c5193d87e9bccd633d18a8e8d40c6aa468381b0,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,bd8232b6b35ac7f435dde97b8f8577cb61393bff00d9b34334af11c400b3c748,Merge_failed,bd8232b6b35ac7f435dde97b8f8577cb61393bff00d9b34334af11c400b3c748,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Merge_failed,4daedf5be747d8e3357e4da2061c0a18d6b6b899f598c5b61401e128fa1b9bfb,0.04606318473815918,0.012862682342529297,0.051427364349365234,0.05177474021911621,0.04097270965576172,0.04440164566040039,0.053426265716552734,0.24523472785949707,0.07314944267272949,0.25943970680236816,0.2577366828918457,0.1783289909362793,3.3546664714813232,0.2018277645111084 diff --git a/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv b/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv index ad87997072..621265abbe 100644 --- a/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv +++ b/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,60813c8d71e04f2555a87814ad47ad8cdb621195,a3fa868fcd9f197799f27e01b7bda7b1cb22f768,0bb0300e17dbc35c25316126bbc9daeabf9dbbe3,,True,True,b6de22d76c34c6ce1a6c4b73b0728effc45b957d9716d1b719d5f9d4ee7da92d,Tests_passed,37e6b8386d7e743eae1f995f53cc0c233200fdaf6c6478d9aac8190d2b93fe20,Tests_passed,True,True,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,82259127a5e14a1a9c6cff9a7cfea8f23e0dd8c8630584c7058fc799d1e0cbf3,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,79470c0f2b5e641ecffb363dd5bed10b2e30150e1c1b6ca7c34cdd26b7c03dae,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,ac23b23f6a27ae5625e3cca17ac4aab4c25bb6a82d5cf075edf767100a067156,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bcbe2ce011af691f8f2bde02a3522e573da6075bd81cb2c50e437940a11d27b5,Merge_failed,bcbe2ce011af691f8f2bde02a3522e573da6075bd81cb2c50e437940a11d27b5,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,7391bfddf057d54b7031ada9942cb7a08d239a8b5be68d9910ee496f556ee87c,0.08026385307312012,0.06920313835144043,0.0844724178314209,0.08867764472961426,0.0913548469543457,0.07898855209350586,0.07948088645935059,0.36171483993530273,0.10495138168334961,0.6049861907958984,0.6690855026245117,0.19008755683898926,5.288080453872681,0.287351131439209 +2,refs/heads/master,60813c8d71e04f2555a87814ad47ad8cdb621195,a3fa868fcd9f197799f27e01b7bda7b1cb22f768,0bb0300e17dbc35c25316126bbc9daeabf9dbbe3,,True,True,b6de22d76c34c6ce1a6c4b73b0728effc45b957d9716d1b719d5f9d4ee7da92d,Tests_passed,37e6b8386d7e743eae1f995f53cc0c233200fdaf6c6478d9aac8190d2b93fe20,Tests_passed,True,True,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,82259127a5e14a1a9c6cff9a7cfea8f23e0dd8c8630584c7058fc799d1e0cbf3,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,79470c0f2b5e641ecffb363dd5bed10b2e30150e1c1b6ca7c34cdd26b7c03dae,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,ac23b23f6a27ae5625e3cca17ac4aab4c25bb6a82d5cf075edf767100a067156,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bcbe2ce011af691f8f2bde02a3522e573da6075bd81cb2c50e437940a11d27b5,Merge_failed,bcbe2ce011af691f8f2bde02a3522e573da6075bd81cb2c50e437940a11d27b5,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,7391bfddf057d54b7031ada9942cb7a08d239a8b5be68d9910ee496f556ee87c,0.08026385307312012,0.06920313835144043,0.0844724178314209,0.08867764472961426,0.0913548469543457,0.07898855209350586,0.07948088645935059,0.36171483993530273,0.10495138168334961,0.6678197383880615,0.7234935760498047,0.19008755683898926,5.288080453872681,0.287351131439209 diff --git a/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv b/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv index 48d75d0225..dc1268029f 100644 --- a/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv +++ b/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,9cd3413080406cb66aa9a23998081e9ef757fe0a,8fafc6ee5cc901b301baee9760c6744be3816d29,4b91fee5ea7faa7a6cf5a6bc64ebc052f41018b8,,True,True,4334654c4fec4cf5cd0edda031569c8528e4d2f931b919cf1bc9c30ce1d75d5b,Tests_passed,bd5b75a8905214677a2a4813b9f5e78279ff68057a41f767a3764fdebebb178e,Tests_passed,True,True,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,0.06163668632507324,0.05650138854980469,0.06691169738769531,0.052506208419799805,0.06556940078735352,0.06675314903259277,0.06267762184143066,0.1832571029663086,0.04692363739013672,0.20004630088806152,0.19939827919006348,0.12274503707885742,1.6245324611663818,0.25026535987854004 +6,refs/heads/master,9cd3413080406cb66aa9a23998081e9ef757fe0a,8fafc6ee5cc901b301baee9760c6744be3816d29,4b91fee5ea7faa7a6cf5a6bc64ebc052f41018b8,,True,True,4334654c4fec4cf5cd0edda031569c8528e4d2f931b919cf1bc9c30ce1d75d5b,Tests_passed,bd5b75a8905214677a2a4813b9f5e78279ff68057a41f767a3764fdebebb178e,Tests_passed,True,True,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,0.06163668632507324,0.05650138854980469,0.06691169738769531,0.052506208419799805,0.06556940078735352,0.06675314903259277,0.06267762184143066,0.1832571029663086,0.04692363739013672,0.19113850593566895,0.19143366813659668,0.12274503707885742,1.6245324611663818,0.25026535987854004 diff --git a/results/combined/merges_timed/maven-nar/nar-maven-plugin.csv b/results/combined/merges_timed/maven-nar/nar-maven-plugin.csv index a5371b1e67..2c9f474d41 100644 --- a/results/combined/merges_timed/maven-nar/nar-maven-plugin.csv +++ b/results/combined/merges_timed/maven-nar/nar-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -33,refs/heads/master,40aa7bb76590d0d32ac1029e9054d37d6f26fdfa,615542e05da885afe07c39474cd4fc02d3dd1199,cd23bdea336fef4ee347b713cbef09ec75f5ae49,,True,True,039f42ec3166b1bc22d3adc959ecd0e83af41af06af760c8600573b42df5e08e,Tests_passed,7c70ac6e3a7bd04e65f7ca0551737d1f3fd288f284541d0ea98781020825b0a8,Tests_passed,True,True,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,0.04130244255065918,0.061505794525146484,0.06556916236877441,0.044561147689819336,0.06110334396362305,0.04724931716918945,0.061189889907836914,0.1894514560699463,0.04901528358459473,0.16590094566345215,0.16684246063232422,0.11645293235778809,0.041143178939819336,0.23381257057189941 +33,refs/heads/master,40aa7bb76590d0d32ac1029e9054d37d6f26fdfa,615542e05da885afe07c39474cd4fc02d3dd1199,cd23bdea336fef4ee347b713cbef09ec75f5ae49,,True,True,039f42ec3166b1bc22d3adc959ecd0e83af41af06af760c8600573b42df5e08e,Tests_passed,7c70ac6e3a7bd04e65f7ca0551737d1f3fd288f284541d0ea98781020825b0a8,Tests_passed,True,True,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,0.04130244255065918,0.061505794525146484,0.06556916236877441,0.044561147689819336,0.06110334396362305,0.04724931716918945,0.061189889907836914,0.1894514560699463,0.04901528358459473,0.16608715057373047,0.16334891319274902,0.11645293235778809,0.041143178939819336,0.23381257057189941 diff --git a/results/combined/merges_timed/mavocz/smscsim.csv b/results/combined/merges_timed/mavocz/smscsim.csv index 615db13a24..3f3f2b421b 100644 --- a/results/combined/merges_timed/mavocz/smscsim.csv +++ b/results/combined/merges_timed/mavocz/smscsim.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/remotes/origin/pull/5,8bfb11d2761aacc461674c06d3df511961252c0b,9b60d4b015a6db7f9d9f2bf9eb6083fcf3dad959,c299c6bf1fdfb1a8fe954b93ed2682bdbb0150f5,,True,True,4530709389bff72c74c2dd79ec52aad8e75d9c5c1902a32b8be9b4ee30cd2b86,Tests_passed,a11239d4bdeaab1c33f9aced952bd4cc56c271013765b6dd80b65b33d3860382,Tests_passed,True,True,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,2d4618f66c8ea1fee9f5021efc2937db010db9db3eb69abbc68d2a847099a42c,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,9cd74bbdd8179a258ef5b78f9ff94775df1b69429c555c4a31e30b4f379d662c,Merge_failed,9cd74bbdd8179a258ef5b78f9ff94775df1b69429c555c4a31e30b4f379d662c,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Merge_failed,8c24e6a839f410c3b851e9a7a63b02fc79ef51c806e72b957e56b70e00766d64,0.043807268142700195,0.03814411163330078,0.03700423240661621,0.04291176795959473,0.03444814682006836,0.0338134765625,0.03259015083312988,0.22870159149169922,0.0814049243927002,0.26227879524230957,0.26285457611083984,0.17954540252685547,1.4502811431884766,0.18633699417114258 +9,refs/remotes/origin/pull/5,8bfb11d2761aacc461674c06d3df511961252c0b,9b60d4b015a6db7f9d9f2bf9eb6083fcf3dad959,c299c6bf1fdfb1a8fe954b93ed2682bdbb0150f5,,True,True,4530709389bff72c74c2dd79ec52aad8e75d9c5c1902a32b8be9b4ee30cd2b86,Tests_passed,a11239d4bdeaab1c33f9aced952bd4cc56c271013765b6dd80b65b33d3860382,Tests_passed,True,True,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,2d4618f66c8ea1fee9f5021efc2937db010db9db3eb69abbc68d2a847099a42c,Merge_failed,7dd594974e87063ef61c0c719a5517d06ec6bef9a89ffe9045890f9c02443530,Merge_failed,9cd74bbdd8179a258ef5b78f9ff94775df1b69429c555c4a31e30b4f379d662c,Merge_failed,9cd74bbdd8179a258ef5b78f9ff94775df1b69429c555c4a31e30b4f379d662c,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Merge_failed,8c24e6a839f410c3b851e9a7a63b02fc79ef51c806e72b957e56b70e00766d64,0.043807268142700195,0.03814411163330078,0.03700423240661621,0.04291176795959473,0.03444814682006836,0.0338134765625,0.03259015083312988,0.22870159149169922,0.0814049243927002,0.2614409923553467,0.2591261863708496,0.17954540252685547,1.4502811431884766,0.18633699417114258 diff --git a/results/combined/merges_timed/maxmind/geoip-api-java.csv b/results/combined/merges_timed/maxmind/geoip-api-java.csv index 04d1bd1dd4..fda9db14d4 100644 --- a/results/combined/merges_timed/maxmind/geoip-api-java.csv +++ b/results/combined/merges_timed/maxmind/geoip-api-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -53,refs/heads/main,49ecb07cc82f13aa1a25857de424be43c88368c1,41ccd2de77d3495a43edcef222564924cbb53740,5eef24504c348cb6880642ae3eb6443f40e3b8a7,,True,True,486fb2319bf0044a951c20cf592d5aa2ab6f0f7e8e106fd734201741b56a1745,Tests_passed,17920ca2ec398d8c5120df1721bd16938a965ded154e41d9cd83bb00f03b52fd,Tests_passed,True,True,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,7cae75002339881f86dc4d063b95b88f9a508a20ce597e474573d1ac09200156,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,a18c9a149d367d2e9d4c7361ee99aabbe42c0e3f9d0217cf67d98d0008a614ce,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,c24a99f8a4c806248dd0b17e6ddef40546a73ba3eb909a21fb685acbfd7e1731,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,f37fb845a5be2b6b583b3080c2daeb0607923cb794d3275f17365efc3bf19f12,Merge_failed,f37fb845a5be2b6b583b3080c2daeb0607923cb794d3275f17365efc3bf19f12,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Merge_failed,10377f57dda2c666abcf0061136182f101d7784c93ffa50163f80ed7fe7a273d,0.04997992515563965,0.06135845184326172,0.06118297576904297,0.05652356147766113,0.06328344345092773,0.05200505256652832,0.04701733589172363,0.19075632095336914,0.07072114944458008,0.10568475723266602,0.1046900749206543,0.14584589004516602,83.58075499534607,0.20973730087280273 +53,refs/heads/main,49ecb07cc82f13aa1a25857de424be43c88368c1,41ccd2de77d3495a43edcef222564924cbb53740,5eef24504c348cb6880642ae3eb6443f40e3b8a7,,True,True,486fb2319bf0044a951c20cf592d5aa2ab6f0f7e8e106fd734201741b56a1745,Tests_passed,17920ca2ec398d8c5120df1721bd16938a965ded154e41d9cd83bb00f03b52fd,Tests_passed,True,True,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,7cae75002339881f86dc4d063b95b88f9a508a20ce597e474573d1ac09200156,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,a18c9a149d367d2e9d4c7361ee99aabbe42c0e3f9d0217cf67d98d0008a614ce,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,c24a99f8a4c806248dd0b17e6ddef40546a73ba3eb909a21fb685acbfd7e1731,Merge_failed,5ccc46253011e5f7e7b365697c272b0df4e52fd53a186159b1fd47b2ce45c124,Merge_failed,f37fb845a5be2b6b583b3080c2daeb0607923cb794d3275f17365efc3bf19f12,Merge_failed,f37fb845a5be2b6b583b3080c2daeb0607923cb794d3275f17365efc3bf19f12,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Merge_failed,10377f57dda2c666abcf0061136182f101d7784c93ffa50163f80ed7fe7a273d,0.04997992515563965,0.06135845184326172,0.06118297576904297,0.05652356147766113,0.06328344345092773,0.05200505256652832,0.04701733589172363,0.19075632095336914,0.07072114944458008,0.10284042358398438,0.10185623168945312,0.14584589004516602,83.58075499534607,0.20973730087280273 diff --git a/results/combined/merges_timed/mbaechler/proxy-servlet.csv b/results/combined/merges_timed/mbaechler/proxy-servlet.csv index f89cd0cda7..a12cdab404 100644 --- a/results/combined/merges_timed/mbaechler/proxy-servlet.csv +++ b/results/combined/merges_timed/mbaechler/proxy-servlet.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/remotes/origin/pull/6,456846e2b56eb09964f65677180bd70ee107d33e,db267681433444c8f171d2cc31286f5b9da437bf,a03279659c46dda30accad5f0b06b8eda491ccc4,,True,True,29056de4ed7e265465fdc8ca4787a81ff7d451d69d853241b2b7f2696b47a1f8,Tests_passed,df6c2a427c019fb49bbe937666286a792eb7afa7fca0ddc3e7fbffe823036358,Tests_passed,True,True,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,8dc1e81c8dabd56f7ff7b09b603e91c34acdfb8c95f544518213dad491617494,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b8b915eae3394a3c854f4b6793aae9b7db4b59093b509b1572597abd299b14bb,Merge_failed,b8b915eae3394a3c854f4b6793aae9b7db4b59093b509b1572597abd299b14bb,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Merge_failed,cca4a56a018004bb0f16bec79df43de795e488b0a528f346f9b220e2b5a1a6e2,0.04161524772644043,0.04479193687438965,0.03497123718261719,0.03698396682739258,0.0402982234954834,0.042790889739990234,0.039598703384399414,0.04715085029602051,0.07246232032775879,0.12183666229248047,0.12240386009216309,0.176605224609375,1.332712173461914,0.19380760192871094 +7,refs/remotes/origin/pull/6,456846e2b56eb09964f65677180bd70ee107d33e,db267681433444c8f171d2cc31286f5b9da437bf,a03279659c46dda30accad5f0b06b8eda491ccc4,,True,True,29056de4ed7e265465fdc8ca4787a81ff7d451d69d853241b2b7f2696b47a1f8,Tests_passed,df6c2a427c019fb49bbe937666286a792eb7afa7fca0ddc3e7fbffe823036358,Tests_passed,True,True,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,8dc1e81c8dabd56f7ff7b09b603e91c34acdfb8c95f544518213dad491617494,Merge_failed,b003af5eba0614a12005d62840a9e571a87738aed0703863ef4c44ad8419f0fd,Merge_failed,b8b915eae3394a3c854f4b6793aae9b7db4b59093b509b1572597abd299b14bb,Merge_failed,b8b915eae3394a3c854f4b6793aae9b7db4b59093b509b1572597abd299b14bb,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Merge_failed,cca4a56a018004bb0f16bec79df43de795e488b0a528f346f9b220e2b5a1a6e2,0.04161524772644043,0.04479193687438965,0.03497123718261719,0.03698396682739258,0.0402982234954834,0.042790889739990234,0.039598703384399414,0.04715085029602051,0.07246232032775879,0.12032961845397949,0.11960649490356445,0.176605224609375,1.332712173461914,0.19380760192871094 diff --git a/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv b/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv index 1b435567e9..11174b945b 100644 --- a/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv +++ b/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,12e472f3dd612c31bfc713248ffd0389e0dd2e8b,1d1aad7523ab4c4304e5766700e0038f75ac7dba,5a53776d9e4be3785c6643ff650370633c2b78e1,,f4f04dc211305042b26b920328fe40bd4af73cd38a6df25f9f1c59d34c12ae58,Tests_passed,6c46c80017aa1a8afd66b39eb24808ac6f96a6b4f016b5beb68ac21ff4147939,Tests_passed,True,True,True,True,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,293d95d43d018c4e6b3c42870daaa1d9c9ccb993955752ec7549b058ed7b61c3,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Tests_passed,25a0dabb8108b3cabc52a94910ea4ef2b7e408ce25a05db5846d64dd9d13136b,Tests_passed,25a0dabb8108b3cabc52a94910ea4ef2b7e408ce25a05db5846d64dd9d13136b,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Merge_failed,1593e83b7722d737409cad6046ba298a56e0c052808029aea8eb2d34465030d4,0.00812983512878418,0.008117914199829102,0.008208513259887695,0.008020401000976562,0.008204936981201172,0.008028268814086914,0.007982730865478516,0.04277849197387695,0.012014150619506836,0.30057573318481445,0.3009915351867676,0.11900544166564941,1.2941620349884033,0.15412330627441406 +6,refs/heads/master,12e472f3dd612c31bfc713248ffd0389e0dd2e8b,1d1aad7523ab4c4304e5766700e0038f75ac7dba,5a53776d9e4be3785c6643ff650370633c2b78e1,,f4f04dc211305042b26b920328fe40bd4af73cd38a6df25f9f1c59d34c12ae58,Tests_passed,6c46c80017aa1a8afd66b39eb24808ac6f96a6b4f016b5beb68ac21ff4147939,Tests_passed,True,True,True,True,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,293d95d43d018c4e6b3c42870daaa1d9c9ccb993955752ec7549b058ed7b61c3,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Tests_passed,25a0dabb8108b3cabc52a94910ea4ef2b7e408ce25a05db5846d64dd9d13136b,Tests_passed,25a0dabb8108b3cabc52a94910ea4ef2b7e408ce25a05db5846d64dd9d13136b,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Merge_failed,1593e83b7722d737409cad6046ba298a56e0c052808029aea8eb2d34465030d4,0.00812983512878418,0.008117914199829102,0.008208513259887695,0.008020401000976562,0.008204936981201172,0.008028268814086914,0.007982730865478516,0.04277849197387695,0.012014150619506836,0.2986307144165039,0.297696590423584,0.11900544166564941,1.2941620349884033,0.15412330627441406 diff --git a/results/combined/merges_timed/mblanchette/maven-java-formatter-plugin.csv b/results/combined/merges_timed/mblanchette/maven-java-formatter-plugin.csv index 3b469b23c8..715da250d7 100644 --- a/results/combined/merges_timed/mblanchette/maven-java-formatter-plugin.csv +++ b/results/combined/merges_timed/mblanchette/maven-java-formatter-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -369,refs/remotes/origin/pull/733,2249c09bd7b1684c81588494daf9353f94323bbe,e1789bf6546cfd122d84c6aff3c6a10f00a2e427,c3607a1d7f7422a7860f1a31e60484c743ef3f6b,,True,True,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,feb8259999683cbc1455ed285c446393c984c315ea0ab011aa96565eea2a90f7,Tests_passed,True,True,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,0.021429777145385742,0.021065235137939453,0.02538156509399414,0.02605724334716797,0.02598404884338379,0.02580857276916504,0.02571272850036621,0.09370636940002441,0.021762371063232422,0.01831531524658203,0.018262624740600586,0.022217750549316406,0.03741455078125,0.21482086181640625 +369,refs/remotes/origin/pull/733,2249c09bd7b1684c81588494daf9353f94323bbe,e1789bf6546cfd122d84c6aff3c6a10f00a2e427,c3607a1d7f7422a7860f1a31e60484c743ef3f6b,,True,True,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,feb8259999683cbc1455ed285c446393c984c315ea0ab011aa96565eea2a90f7,Tests_passed,True,True,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,0.021429777145385742,0.021065235137939453,0.02538156509399414,0.02605724334716797,0.02598404884338379,0.02580857276916504,0.02571272850036621,0.09370636940002441,0.021762371063232422,0.017939090728759766,0.018065452575683594,0.022217750549316406,0.03741455078125,0.21482086181640625 diff --git a/results/combined/merges_timed/mbosecke/pebble.csv b/results/combined/merges_timed/mbosecke/pebble.csv index 48699277b4..0d065f177d 100644 --- a/results/combined/merges_timed/mbosecke/pebble.csv +++ b/results/combined/merges_timed/mbosecke/pebble.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -123,refs/heads/master,7b6bd591f14f5092a01f747e779f21acafa6959e,8bcaf4e262c09d73f043c5d5cbfd881dcf417c05,968a083e1012ad3b024324df36d00fe1e0c5f872,,d07e723fc6841045faa12bc7ea657f370fe4248659e73c574a4492c36a695748,Tests_passed,d5d09f2ff5aed8e7089dd759466fe3d39511e589715486ecf3f9c7c8fc40e3d8,Tests_passed,True,True,True,True,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,a73819cd9ce73097095e9904292cbf05d051ff04f980c601df0bff5a11587314,Tests_passed,a73819cd9ce73097095e9904292cbf05d051ff04f980c601df0bff5a11587314,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,0.023484230041503906,0.04045915603637695,0.0447843074798584,0.06199383735656738,0.044142961502075195,0.04870796203613281,0.04265546798706055,0.20682072639465332,0.06676769256591797,0.18467330932617188,0.176377534866333,0.0801699161529541,0.03541207313537598,0.2573122978210449 +123,refs/heads/master,7b6bd591f14f5092a01f747e779f21acafa6959e,8bcaf4e262c09d73f043c5d5cbfd881dcf417c05,968a083e1012ad3b024324df36d00fe1e0c5f872,,d07e723fc6841045faa12bc7ea657f370fe4248659e73c574a4492c36a695748,Tests_passed,d5d09f2ff5aed8e7089dd759466fe3d39511e589715486ecf3f9c7c8fc40e3d8,Tests_passed,True,True,True,True,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,a73819cd9ce73097095e9904292cbf05d051ff04f980c601df0bff5a11587314,Tests_passed,a73819cd9ce73097095e9904292cbf05d051ff04f980c601df0bff5a11587314,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,0.023484230041503906,0.04045915603637695,0.0447843074798584,0.06199383735656738,0.044142961502075195,0.04870796203613281,0.04265546798706055,0.20682072639465332,0.06676769256591797,0.18300628662109375,0.185103178024292,0.0801699161529541,0.03541207313537598,0.2573122978210449 diff --git a/results/combined/merges_timed/mboudreau/alternator.csv b/results/combined/merges_timed/mboudreau/alternator.csv index 30bb5a0798..ce1cfaaafb 100644 --- a/results/combined/merges_timed/mboudreau/alternator.csv +++ b/results/combined/merges_timed/mboudreau/alternator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/master,e98877f87081708e446b278c812eb504565ff5f9,e5ccfab1da7432b380d0af5e0f86b83894b4eab2,91954b46b0bb37bca9388c3812763f3d24a8aaaa,,True,True,32297fe2fb78354de541330818f8cf10feff1841ed8c9ac9b71167b79caf693b,Tests_passed,dfd7622acf5850de28d3b231d046bc9d0e2bef5a4d6c56d1fe8f610d7340459f,Tests_passed,True,True,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,9b7be440b5dcede4e53439bc679a2fc93040864ba808a1172ee9a4a9decc5406,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,9b7be440b5dcede4e53439bc679a2fc93040864ba808a1172ee9a4a9decc5406,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,e124ba65c566fe6b822286fc323c6d50cdaa660a6829723e4254e037f9fb21b2,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,0b3a66ffd52ae15d4a31712e990e0e758cf42462090259c4deafd290aa0dc32e,Merge_failed,88e622ed2779496dcc9936990b36605a1f0dc46569e3483e42ab896b458ed9b4,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,3a3ae5be878854cd15fbd0e086ea31cdf82dc0c294b1d0da5e9cb8c4f0dc3629,Merge_failed,b1e3791e54512228f0cfae1fe0a51b02135d7e17317772de6e7f8b00479686ba,0.01330423355102539,0.013509035110473633,0.01360321044921875,0.013476848602294922,0.013683080673217773,0.01313924789428711,0.013546228408813477,0.11070823669433594,0.026328086853027344,0.5945086479187012,0.5949742794036865,0.3956267833709717,4.919229030609131,0.1891167163848877 +31,refs/heads/master,e98877f87081708e446b278c812eb504565ff5f9,e5ccfab1da7432b380d0af5e0f86b83894b4eab2,91954b46b0bb37bca9388c3812763f3d24a8aaaa,,True,True,32297fe2fb78354de541330818f8cf10feff1841ed8c9ac9b71167b79caf693b,Tests_passed,dfd7622acf5850de28d3b231d046bc9d0e2bef5a4d6c56d1fe8f610d7340459f,Tests_passed,True,True,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,9b7be440b5dcede4e53439bc679a2fc93040864ba808a1172ee9a4a9decc5406,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,9b7be440b5dcede4e53439bc679a2fc93040864ba808a1172ee9a4a9decc5406,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,e124ba65c566fe6b822286fc323c6d50cdaa660a6829723e4254e037f9fb21b2,Merge_failed,b6028e341613e45e4d08ee4ee6cf116de82862c0d72e5ea02731bbd2e90beb6b,Merge_failed,0b3a66ffd52ae15d4a31712e990e0e758cf42462090259c4deafd290aa0dc32e,Merge_failed,88e622ed2779496dcc9936990b36605a1f0dc46569e3483e42ab896b458ed9b4,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,3a3ae5be878854cd15fbd0e086ea31cdf82dc0c294b1d0da5e9cb8c4f0dc3629,Merge_failed,b1e3791e54512228f0cfae1fe0a51b02135d7e17317772de6e7f8b00479686ba,0.01330423355102539,0.013509035110473633,0.01360321044921875,0.013476848602294922,0.013683080673217773,0.01313924789428711,0.013546228408813477,0.11070823669433594,0.026328086853027344,0.5884876251220703,0.5883221626281738,0.3956267833709717,4.919229030609131,0.1891167163848877 diff --git a/results/combined/merges_timed/mcmmo-dev/mcmmo.csv b/results/combined/merges_timed/mcmmo-dev/mcmmo.csv index 49c8867a22..ce95402c35 100644 --- a/results/combined/merges_timed/mcmmo-dev/mcmmo.csv +++ b/results/combined/merges_timed/mcmmo-dev/mcmmo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,81ac48904ce1c187c6177ad5282575a7c2d28907,ed8c8107f990a68111cce560f0a020c7401902c4,2594dc1bca27548e560cf514aa9285e925d1a612,,8e77e05911abcabe3a0626b50847bf5f50a46a62b2d06fa98224315eebf65aed,Tests_passed,ccf00edc4bbb59f98bad23de096117c3446b8db7d39b6d375760f98fb0fcc349,Tests_passed,True,True,True,True,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,4b53569777fbd2be01ff1b7ada11153c8bff2c53e608bded4dca04f4563edefe,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,b9208f43864038eb4184b5360d51e1aec9027622fc5f9ba807958e180b3eaac3,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,1070abfc4335662bec8d234824fc5059e9f53383cf881de02daf333e26c4550d,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,0.04716682434082031,0.06215238571166992,0.06283879280090332,0.05692481994628906,0.05555081367492676,0.05546975135803223,0.05506396293640137,0.1840202808380127,0.07102084159851074,0.3764455318450928,0.3801112174987793,0.3217172622680664,0.10974335670471191,0.513514518737793 +2,refs/heads/master,81ac48904ce1c187c6177ad5282575a7c2d28907,ed8c8107f990a68111cce560f0a020c7401902c4,2594dc1bca27548e560cf514aa9285e925d1a612,,8e77e05911abcabe3a0626b50847bf5f50a46a62b2d06fa98224315eebf65aed,Tests_passed,ccf00edc4bbb59f98bad23de096117c3446b8db7d39b6d375760f98fb0fcc349,Tests_passed,True,True,True,True,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,4b53569777fbd2be01ff1b7ada11153c8bff2c53e608bded4dca04f4563edefe,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,b9208f43864038eb4184b5360d51e1aec9027622fc5f9ba807958e180b3eaac3,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,1070abfc4335662bec8d234824fc5059e9f53383cf881de02daf333e26c4550d,Merge_failed,794e2fca675bc32db6048f40317b7f6111b5ebae2cfc91cd41e5aac80f5b8bdb,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,0.04716682434082031,0.06215238571166992,0.06283879280090332,0.05692481994628906,0.05555081367492676,0.05546975135803223,0.05506396293640137,0.1840202808380127,0.07102084159851074,0.3793196678161621,0.3751199245452881,0.3217172622680664,0.10974335670471191,0.513514518737793 diff --git a/results/combined/merges_timed/mcupak/beacon-of-beacons.csv b/results/combined/merges_timed/mcupak/beacon-of-beacons.csv index 0ece6002e1..064ded2ed8 100644 --- a/results/combined/merges_timed/mcupak/beacon-of-beacons.csv +++ b/results/combined/merges_timed/mcupak/beacon-of-beacons.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/develop,3723d0f4d5cf51fd3b5bf5c15529463550918e1f,49e4e1cdb8643f276703f5f7761f0cb6c3d836c7,9dd448552f4610d7c651eddacd82fddf7ad48aa1,,True,True,d532a309964d4290c1776c1951480911b52c979f60f9844efedf86be7d7fe1be,Tests_passed,7b484fadc10b7e9c97f9059129e501f30c9b3af803c18127bcc4ec81c51da9a5,Tests_passed,True,True,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,d9da87ceab2710b63992ea86f5e94dad2ce869ee33f40a77ba53c9b90f5b0ce5,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,df6a58a34a4ac20ee2e06b914ecb475b483e3bf2ece976c68868a2fec45b4d95,Merge_failed,df6a58a34a4ac20ee2e06b914ecb475b483e3bf2ece976c68868a2fec45b4d95,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,2aa5152032f8c9c631b74110e02b097431625928af615feb7f6130355262d7ff,0.05915546417236328,0.06881499290466309,0.04349851608276367,0.03867840766906738,0.03338336944580078,0.08196592330932617,0.06272006034851074,1.5589404106140137,0.19498157501220703,3.5295708179473877,3.534872055053711,1.4809317588806152,18.022812366485596,0.31558752059936523 +7,refs/heads/develop,3723d0f4d5cf51fd3b5bf5c15529463550918e1f,49e4e1cdb8643f276703f5f7761f0cb6c3d836c7,9dd448552f4610d7c651eddacd82fddf7ad48aa1,,True,True,d532a309964d4290c1776c1951480911b52c979f60f9844efedf86be7d7fe1be,Tests_passed,7b484fadc10b7e9c97f9059129e501f30c9b3af803c18127bcc4ec81c51da9a5,Tests_passed,True,True,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,d9da87ceab2710b63992ea86f5e94dad2ce869ee33f40a77ba53c9b90f5b0ce5,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,df6a58a34a4ac20ee2e06b914ecb475b483e3bf2ece976c68868a2fec45b4d95,Merge_failed,df6a58a34a4ac20ee2e06b914ecb475b483e3bf2ece976c68868a2fec45b4d95,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,2aa5152032f8c9c631b74110e02b097431625928af615feb7f6130355262d7ff,0.05915546417236328,0.06881499290466309,0.04349851608276367,0.03867840766906738,0.03338336944580078,0.08196592330932617,0.06272006034851074,1.5589404106140137,0.19498157501220703,3.535727024078369,3.5446557998657227,1.4809317588806152,18.022812366485596,0.31558752059936523 diff --git a/results/combined/merges_timed/mdeanda/lorem.csv b/results/combined/merges_timed/mdeanda/lorem.csv index 9d9badaba5..04e443a3fa 100644 --- a/results/combined/merges_timed/mdeanda/lorem.csv +++ b/results/combined/merges_timed/mdeanda/lorem.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,b340dfb840716f7eb60f9febd104087913f2beae,066a95129ded0423403c5d7f48d90aebef73d278,96c00aa7b9415de0effec3d78dafbf3b722c168f,,True,True,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,75b49c8a194bd79d752d4a07f3988a840d91eda770ec5931715322f4cfd524b8,Tests_passed,True,True,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,0.02725839614868164,0.029724836349487305,0.018395662307739258,0.026168107986450195,0.03344321250915527,0.026098012924194336,0.024306774139404297,0.11062049865722656,0.02631688117980957,0.1569373607635498,0.15909934043884277,0.0910646915435791,0.9256606101989746,0.1673431396484375 +1,refs/heads/master,b340dfb840716f7eb60f9febd104087913f2beae,066a95129ded0423403c5d7f48d90aebef73d278,96c00aa7b9415de0effec3d78dafbf3b722c168f,,True,True,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,75b49c8a194bd79d752d4a07f3988a840d91eda770ec5931715322f4cfd524b8,Tests_passed,True,True,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,0.02725839614868164,0.029724836349487305,0.018395662307739258,0.026168107986450195,0.03344321250915527,0.026098012924194336,0.024306774139404297,0.11062049865722656,0.02631688117980957,0.15626120567321777,0.15489864349365234,0.0910646915435791,0.9256606101989746,0.1673431396484375 diff --git a/results/combined/merges_timed/mdeinum/spring-batch-excel.csv b/results/combined/merges_timed/mdeinum/spring-batch-excel.csv index d7ef0ae3ae..441b940a14 100644 --- a/results/combined/merges_timed/mdeinum/spring-batch-excel.csv +++ b/results/combined/merges_timed/mdeinum/spring-batch-excel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,f1109bad1d0f6b5178b84a59be3e59e18442d127,e7fcf225aef0ccdd6d9c972a07104d4fbe87043a,e732239774881d118a937a636bbd7942bcfa6966,,92b6ff26ab94cad5fa3c278f77751bbe5abea735e14350df36a9b31125a0d65d,Tests_passed,b9a87b24f91328d70b6bd43ad3c6b8bad8a595e9ca31ac5a51f0140171520108,Tests_passed,True,True,True,True,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Merge_failed,b61caf8007b4db9cfbfc03cc33b958298cce7292487d3207f66b63a72f10568d,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,0.031099796295166016,0.03827333450317383,0.0673370361328125,0.0689854621887207,0.03540992736816406,0.052695274353027344,0.05703377723693848,0.32517290115356445,0.05674552917480469,0.5840108394622803,0.5856859683990479,0.3049352169036865,2.5501067638397217,0.24753355979919434 +1,refs/heads/master,f1109bad1d0f6b5178b84a59be3e59e18442d127,e7fcf225aef0ccdd6d9c972a07104d4fbe87043a,e732239774881d118a937a636bbd7942bcfa6966,,92b6ff26ab94cad5fa3c278f77751bbe5abea735e14350df36a9b31125a0d65d,Tests_passed,b9a87b24f91328d70b6bd43ad3c6b8bad8a595e9ca31ac5a51f0140171520108,Tests_passed,True,True,True,True,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Merge_failed,b61caf8007b4db9cfbfc03cc33b958298cce7292487d3207f66b63a72f10568d,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,0.031099796295166016,0.03827333450317383,0.0673370361328125,0.0689854621887207,0.03540992736816406,0.052695274353027344,0.05703377723693848,0.32517290115356445,0.05674552917480469,0.5800516605377197,0.5777263641357422,0.3049352169036865,2.5501067638397217,0.24753355979919434 diff --git a/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv b/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv index 61a2647d36..a248835b43 100644 --- a/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv +++ b/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,True,True,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,Tests_passed,True,True,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,0.056929826736450195,0.05699658393859863,0.08025383949279785,0.08061790466308594,0.08028316497802734,0.08058309555053711,0.08079028129577637,0.13065838813781738,0.05724215507507324,0.21758151054382324,0.2180168628692627,0.1122901439666748,1.1493992805480957,0.23141980171203613 +3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,True,True,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,Tests_passed,True,True,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,0.056929826736450195,0.05699658393859863,0.08025383949279785,0.08061790466308594,0.08028316497802734,0.08058309555053711,0.08079028129577637,0.13065838813781738,0.05724215507507324,0.21592235565185547,0.21431612968444824,0.1122901439666748,1.1493992805480957,0.23141980171203613 diff --git a/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv b/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv index 3e01fcb2d1..bed5d32b3f 100644 --- a/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv +++ b/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,Tests_passed,True,True,True,True,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,49670f6e60fec7de3b89f209bef3cd9bab0310adedfee9e71de44817b8bb6c33,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Merge_failed,572dde86788438359c654c1e99098c4ca6badc4fff50c300b3b659c256d73c7f,0.04614877700805664,0.045648813247680664,0.04175305366516113,0.03212332725524902,0.040902137756347656,0.03508758544921875,0.035361528396606445,0.1217963695526123,0.06773161888122559,0.14927887916564941,0.14833402633666992,0.11369752883911133,0.6239135265350342,0.20711946487426758 +12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,Tests_passed,True,True,True,True,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,49670f6e60fec7de3b89f209bef3cd9bab0310adedfee9e71de44817b8bb6c33,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Merge_failed,572dde86788438359c654c1e99098c4ca6badc4fff50c300b3b659c256d73c7f,0.04614877700805664,0.045648813247680664,0.04175305366516113,0.03212332725524902,0.040902137756347656,0.03508758544921875,0.035361528396606445,0.1217963695526123,0.06773161888122559,0.14512062072753906,0.14676666259765625,0.11369752883911133,0.6239135265350342,0.20711946487426758 diff --git a/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv b/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv index 6b2539cb90..d4d423e4f3 100644 --- a/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv +++ b/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,5bddd6e4e8f8cb6d48a82ca31019fd1d44a68c54,c9bed8529d45f3c9dbe8ae8571de774ebad95a4f,a3748c08e9c5c50e0f8e439ccb9b9017606e4c65,,True,True,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,77cceb256ad43eb8042b0f3d10d3ebeee1a6f96d1569b16369e7ab63c10bf440,Tests_passed,True,True,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,0.053955793380737305,0.043679237365722656,0.05874180793762207,0.05532526969909668,0.062160491943359375,0.054827213287353516,0.04497504234313965,0.1820988655090332,0.0544586181640625,0.16335844993591309,0.16216707229614258,0.11847281455993652,0.6454041004180908,0.19699549674987793 +9,refs/heads/master,5bddd6e4e8f8cb6d48a82ca31019fd1d44a68c54,c9bed8529d45f3c9dbe8ae8571de774ebad95a4f,a3748c08e9c5c50e0f8e439ccb9b9017606e4c65,,True,True,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,77cceb256ad43eb8042b0f3d10d3ebeee1a6f96d1569b16369e7ab63c10bf440,Tests_passed,True,True,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,0.053955793380737305,0.043679237365722656,0.05874180793762207,0.05532526969909668,0.062160491943359375,0.054827213287353516,0.04497504234313965,0.1820988655090332,0.0544586181640625,0.15995168685913086,0.1612410545349121,0.11847281455993652,0.6454041004180908,0.19699549674987793 diff --git a/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv b/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv index 98ac974d84..45cf490d3c 100644 --- a/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv +++ b/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,2cffb48e7b98f31e05feb82b21bb15e46b28493b,29be22f2982ec1d94929b4222e10d9a11bfa67c7,bfface3561126d5db1d340a8298e862bc3a8dd49,,76241a787d3f93343b49562e74f00c70514451cd102aae740d65d00a7b558f9d,Tests_passed,015633cb1c997465cdfdf7eed82105b59841252fe67eba77f3b5b8d3a2d238d0,Tests_passed,True,True,True,True,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,9ef15bfc236ba829ad4ff62a5c6cab1b823603809cb811b8866b77796f483f15,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,49af84e4684f71c554400ad06a9533b95096832f22fd514c01d3355bf25a0234,Merge_failed,878aa655fdc8dbc9c0de2ad812592d0712aa975802a246ee44c51cc2303b8bd6,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,7d39a9b8996cba2d0a74b19136b46e4c23a81bb78a66729964d4a33f8b8e0ab8,Merge_failed,b135f7cbfe42a8158a7f96630afbda5b3aee67ef875b978fa129b7dc7652e012,0.03800463676452637,0.041405439376831055,0.03808093070983887,0.040266990661621094,0.04142427444458008,0.042165517807006836,0.03974604606628418,0.2946512699127197,0.07747840881347656,0.06641364097595215,0.06653237342834473,0.2369093894958496,0.8701612949371338,0.1868000030517578 +1,refs/heads/master,2cffb48e7b98f31e05feb82b21bb15e46b28493b,29be22f2982ec1d94929b4222e10d9a11bfa67c7,bfface3561126d5db1d340a8298e862bc3a8dd49,,76241a787d3f93343b49562e74f00c70514451cd102aae740d65d00a7b558f9d,Tests_passed,015633cb1c997465cdfdf7eed82105b59841252fe67eba77f3b5b8d3a2d238d0,Tests_passed,True,True,True,True,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,9ef15bfc236ba829ad4ff62a5c6cab1b823603809cb811b8866b77796f483f15,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,49af84e4684f71c554400ad06a9533b95096832f22fd514c01d3355bf25a0234,Merge_failed,878aa655fdc8dbc9c0de2ad812592d0712aa975802a246ee44c51cc2303b8bd6,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,7d39a9b8996cba2d0a74b19136b46e4c23a81bb78a66729964d4a33f8b8e0ab8,Merge_failed,b135f7cbfe42a8158a7f96630afbda5b3aee67ef875b978fa129b7dc7652e012,0.03800463676452637,0.041405439376831055,0.03808093070983887,0.040266990661621094,0.04142427444458008,0.042165517807006836,0.03974604606628418,0.2946512699127197,0.07747840881347656,0.06535124778747559,0.06654667854309082,0.2369093894958496,0.8701612949371338,0.1868000030517578 diff --git a/results/combined/merges_timed/mercadopago/sdk-java.csv b/results/combined/merges_timed/mercadopago/sdk-java.csv index db33241bc2..d386d60aa6 100644 --- a/results/combined/merges_timed/mercadopago/sdk-java.csv +++ b/results/combined/merges_timed/mercadopago/sdk-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -50,refs/heads/master,f60681aae04e2986541668b836247750833f4147,31885f3c5c4908aec7e7c1249dc024d64a623418,78228de02eb44f771159020c833a8f4da3894763,,f210e064229ce2f0391424a2c8ea155f49f4e6a83bc73544d0128bacf1b35af9,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,Tests_passed,True,True,True,True,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,56ea72e7afa29f8e06d4c15a7bbb1d2abd9b2c3ec4d620f85c40c542000efcd1,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Tests_passed,4641792e92d1c72594ba499308394c81b3bec6273f37da009eec0c0e74a34a62,Tests_passed,4641792e92d1c72594ba499308394c81b3bec6273f37da009eec0c0e74a34a62,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Merge_failed,c28646851fb084a91f3481b896cb782a2fcdd9c137a810a8f2923fca2d4268d2,0.04569125175476074,0.044678688049316406,0.04433941841125488,0.047359466552734375,0.050307512283325195,0.048393964767456055,0.02684926986694336,0.24739694595336914,0.0820472240447998,0.3018798828125,0.301785945892334,0.16317081451416016,1.0416319370269775,0.24460077285766602 +50,refs/heads/master,f60681aae04e2986541668b836247750833f4147,31885f3c5c4908aec7e7c1249dc024d64a623418,78228de02eb44f771159020c833a8f4da3894763,,f210e064229ce2f0391424a2c8ea155f49f4e6a83bc73544d0128bacf1b35af9,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,Tests_passed,True,True,True,True,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Merge_failed,56ea72e7afa29f8e06d4c15a7bbb1d2abd9b2c3ec4d620f85c40c542000efcd1,Merge_failed,3a2b17067f36e05a163bd78a61c4ee09001a0db8d036fd7e810ccec232614089,Tests_passed,4641792e92d1c72594ba499308394c81b3bec6273f37da009eec0c0e74a34a62,Tests_passed,4641792e92d1c72594ba499308394c81b3bec6273f37da009eec0c0e74a34a62,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Merge_failed,c28646851fb084a91f3481b896cb782a2fcdd9c137a810a8f2923fca2d4268d2,0.04569125175476074,0.044678688049316406,0.04433941841125488,0.047359466552734375,0.050307512283325195,0.048393964767456055,0.02684926986694336,0.24739694595336914,0.0820472240447998,0.2963383197784424,0.29756593704223633,0.16317081451416016,1.0416319370269775,0.24460077285766602 diff --git a/results/combined/merges_timed/metamx/extendedset.csv b/results/combined/merges_timed/metamx/extendedset.csv index 41d5d33ad2..e75a2e3fd8 100644 --- a/results/combined/merges_timed/metamx/extendedset.csv +++ b/results/combined/merges_timed/metamx/extendedset.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,7531f1e53c2080be0e20f1eabbbbd4e2ed3fd6fb,5521a5634e996bce73b45152db87141fb4d01c5f,523b72d6b645a4d92dfb6547332976daadfe23bd,,a43c93fecc32649e98815a7234eadc7a814ed68a7b32ade72a2aa82bb9482197,Tests_passed,7910215742467bade0b9141025859e1c8c58120301fdd645ce7c096686cd3663,Tests_passed,True,True,True,True,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,0.045398712158203125,0.05454850196838379,0.04793524742126465,0.04169058799743652,0.047647714614868164,0.06568527221679688,0.04534792900085449,0.16797327995300293,0.04652285575866699,0.17667913436889648,0.1761927604675293,0.10195803642272949,1.4990735054016113,0.18033623695373535 +2,refs/heads/master,7531f1e53c2080be0e20f1eabbbbd4e2ed3fd6fb,5521a5634e996bce73b45152db87141fb4d01c5f,523b72d6b645a4d92dfb6547332976daadfe23bd,,a43c93fecc32649e98815a7234eadc7a814ed68a7b32ade72a2aa82bb9482197,Tests_passed,7910215742467bade0b9141025859e1c8c58120301fdd645ce7c096686cd3663,Tests_passed,True,True,True,True,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,0.045398712158203125,0.05454850196838379,0.04793524742126465,0.04169058799743652,0.047647714614868164,0.06568527221679688,0.04534792900085449,0.16797327995300293,0.04652285575866699,0.1749420166015625,0.17487549781799316,0.10195803642272949,1.4990735054016113,0.18033623695373535 diff --git a/results/combined/merges_timed/meyerjp3/psychometrics.csv b/results/combined/merges_timed/meyerjp3/psychometrics.csv index 5fbdb8462a..82c8204296 100644 --- a/results/combined/merges_timed/meyerjp3/psychometrics.csv +++ b/results/combined/merges_timed/meyerjp3/psychometrics.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,f90c2bd3c3407128d60612613daa8b5e6c509fc7,0a883ddd4ebcc56a9028663e1273b0d50fab85db,06a7ae98fadbd19b1f49de3b6b209e4b556ce4ec,,85d40de620f73882f0bbbdee3fd7ac87e2a188c4dab59b2386ee2b30a0b239e4,Tests_passed,64c27e5d6d67399c27f40815856fe49be9054640815f0b5995c8b8c45a23d0e0,Tests_passed,True,True,True,True,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,0.04250335693359375,0.05360150337219238,0.03544044494628906,0.06034445762634277,0.04923415184020996,0.015531539916992188,0.04295086860656738,0.1409282684326172,0.020721912384033203,0.16525983810424805,0.1622943878173828,0.11105179786682129,0.8189957141876221,0.2669799327850342 +3,refs/heads/master,f90c2bd3c3407128d60612613daa8b5e6c509fc7,0a883ddd4ebcc56a9028663e1273b0d50fab85db,06a7ae98fadbd19b1f49de3b6b209e4b556ce4ec,,85d40de620f73882f0bbbdee3fd7ac87e2a188c4dab59b2386ee2b30a0b239e4,Tests_passed,64c27e5d6d67399c27f40815856fe49be9054640815f0b5995c8b8c45a23d0e0,Tests_passed,True,True,True,True,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,0.04250335693359375,0.05360150337219238,0.03544044494628906,0.06034445762634277,0.04923415184020996,0.015531539916992188,0.04295086860656738,0.1409282684326172,0.020721912384033203,0.25525331497192383,0.16251301765441895,0.11105179786682129,0.8189957141876221,0.2669799327850342 diff --git a/results/combined/merges_timed/mh4j/metaheuristics4java.csv b/results/combined/merges_timed/mh4j/metaheuristics4java.csv index 1202252d93..718b26f079 100644 --- a/results/combined/merges_timed/mh4j/metaheuristics4java.csv +++ b/results/combined/merges_timed/mh4j/metaheuristics4java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/develop,78b481eb40f47dee1a6999abd42abf74ce1bba9e,ff1db58980b33481f6e04b8b9dcaeca2acf9e264,0d540432feceb6995da964618a4a4d016a753608,,True,True,67fd92182d5b04492c24c62c766ae39a1139ea86d33472123430b7e25ea71f6f,Tests_passed,a5d727838d8c45ebda211b42d1227cf322a76a39b303160f95ad3d040d16f74f,Tests_passed,True,True,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,92b845cefd5171f8dc139ad9ebf5c78538adf463d9a6fd9d8df3248be76355bf,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,ed707caa1000b7afd0c8ec7bc31feeee29abcc6305f4f7f269afcce0065dc716,Merge_failed,ed707caa1000b7afd0c8ec7bc31feeee29abcc6305f4f7f269afcce0065dc716,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_failed,1bb10ec911e6746913833cc497d6912d1a24f468333fa28b2a5e3605b6279c00,0.04704713821411133,0.03520917892456055,0.046874046325683594,0.03844881057739258,0.04611849784851074,0.04626655578613281,0.04785275459289551,0.23510241508483887,0.08798098564147949,0.12520647048950195,0.1252305507659912,0.181441068649292,1.304821252822876,0.22703146934509277 +7,refs/heads/develop,78b481eb40f47dee1a6999abd42abf74ce1bba9e,ff1db58980b33481f6e04b8b9dcaeca2acf9e264,0d540432feceb6995da964618a4a4d016a753608,,True,True,67fd92182d5b04492c24c62c766ae39a1139ea86d33472123430b7e25ea71f6f,Tests_passed,a5d727838d8c45ebda211b42d1227cf322a76a39b303160f95ad3d040d16f74f,Tests_passed,True,True,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,92b845cefd5171f8dc139ad9ebf5c78538adf463d9a6fd9d8df3248be76355bf,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,ed707caa1000b7afd0c8ec7bc31feeee29abcc6305f4f7f269afcce0065dc716,Merge_failed,ed707caa1000b7afd0c8ec7bc31feeee29abcc6305f4f7f269afcce0065dc716,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_failed,1bb10ec911e6746913833cc497d6912d1a24f468333fa28b2a5e3605b6279c00,0.04704713821411133,0.03520917892456055,0.046874046325683594,0.03844881057739258,0.04611849784851074,0.04626655578613281,0.04785275459289551,0.23510241508483887,0.08798098564147949,0.12268424034118652,0.12274932861328125,0.181441068649292,1.304821252822876,0.22703146934509277 diff --git a/results/combined/merges_timed/michaelwittig/java-q.csv b/results/combined/merges_timed/michaelwittig/java-q.csv index 7b9d92d0f4..c62682c136 100644 --- a/results/combined/merges_timed/michaelwittig/java-q.csv +++ b/results/combined/merges_timed/michaelwittig/java-q.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,f40f420b416029849a73c6af3de3644db2011af5,b8a193e57a80d4a35b734d7a1500cd4387cc5c6c,0498df2c05d977eb0f376bf12f6b95d93efd1d53,,True,True,2d2a612628096e5db1f58f5060eaecb56bd0f02c1f54d8ba5389dfd7b46ba1f9,Tests_passed,a6436b451d43e9d1e64cd89a22e4217b8a0466ccaa78c0fd2a45636d618ed5a4,Tests_passed,True,True,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,0.05081367492675781,0.03737044334411621,0.03430676460266113,0.032337188720703125,0.05768013000488281,0.03908133506774902,0.057528018951416016,0.1667041778564453,0.04929065704345703,0.14671969413757324,0.14683914184570312,0.12297964096069336,0.5518209934234619,0.2810173034667969 +4,refs/heads/master,f40f420b416029849a73c6af3de3644db2011af5,b8a193e57a80d4a35b734d7a1500cd4387cc5c6c,0498df2c05d977eb0f376bf12f6b95d93efd1d53,,True,True,2d2a612628096e5db1f58f5060eaecb56bd0f02c1f54d8ba5389dfd7b46ba1f9,Tests_passed,a6436b451d43e9d1e64cd89a22e4217b8a0466ccaa78c0fd2a45636d618ed5a4,Tests_passed,True,True,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,0.05081367492675781,0.03737044334411621,0.03430676460266113,0.032337188720703125,0.05768013000488281,0.03908133506774902,0.057528018951416016,0.1667041778564453,0.04929065704345703,0.14661741256713867,0.14611577987670898,0.12297964096069336,0.5518209934234619,0.2810173034667969 diff --git a/results/combined/merges_timed/micromata/javaapiforkml.csv b/results/combined/merges_timed/micromata/javaapiforkml.csv index 5b3f4c13c0..7699a58c91 100644 --- a/results/combined/merges_timed/micromata/javaapiforkml.csv +++ b/results/combined/merges_timed/micromata/javaapiforkml.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/remotes/origin/pull/37,524dc619303f36bb3d0d04d8b4ea0bf72ad81cee,f31e4d3136564156e62a7adf65198fe1cb678237,aab2ba2cac18ef91bb8b3ddb1caed32339ef927c,,True,True,799345aba19456eef37aa4a28d93dac4046a2b3b1e5fddf970f1b0d0c6b8299f,Tests_passed,c51fb7814584d0ec77c4666e8b3ea5df58d88432b987da64c88d20593ce53ad0,Tests_passed,True,True,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f20e3708f15fabafa3cf02e6e2bf45b200057caee616a729caaae0ab14909dbd,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,0c240731993a14a4aa8d86a1276c72ee6a43549bf06aa955d8abd452d73a5f11,Merge_failed,0c240731993a14a4aa8d86a1276c72ee6a43549bf06aa955d8abd452d73a5f11,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,22b5a83225ee024cc0529509022950ff97511baf54ef58dec35afe2f5c6afce1,0.039652109146118164,0.03619670867919922,0.05529141426086426,0.05777120590209961,0.053450584411621094,0.04528522491455078,0.05464363098144531,0.18065834045410156,0.06768536567687988,0.09420156478881836,0.0944526195526123,0.16994929313659668,1.1968464851379395,0.3732428550720215 +9,refs/remotes/origin/pull/37,524dc619303f36bb3d0d04d8b4ea0bf72ad81cee,f31e4d3136564156e62a7adf65198fe1cb678237,aab2ba2cac18ef91bb8b3ddb1caed32339ef927c,,True,True,799345aba19456eef37aa4a28d93dac4046a2b3b1e5fddf970f1b0d0c6b8299f,Tests_passed,c51fb7814584d0ec77c4666e8b3ea5df58d88432b987da64c88d20593ce53ad0,Tests_passed,True,True,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f20e3708f15fabafa3cf02e6e2bf45b200057caee616a729caaae0ab14909dbd,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,0c240731993a14a4aa8d86a1276c72ee6a43549bf06aa955d8abd452d73a5f11,Merge_failed,0c240731993a14a4aa8d86a1276c72ee6a43549bf06aa955d8abd452d73a5f11,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,22b5a83225ee024cc0529509022950ff97511baf54ef58dec35afe2f5c6afce1,0.039652109146118164,0.03619670867919922,0.05529141426086426,0.05777120590209961,0.053450584411621094,0.04528522491455078,0.05464363098144531,0.18065834045410156,0.06768536567687988,0.09341311454772949,0.10363364219665527,0.16994929313659668,1.1968464851379395,0.3732428550720215 diff --git a/results/combined/merges_timed/mikaelhg/openblocks.csv b/results/combined/merges_timed/mikaelhg/openblocks.csv index aff98a239b..a35bdf738f 100644 --- a/results/combined/merges_timed/mikaelhg/openblocks.csv +++ b/results/combined/merges_timed/mikaelhg/openblocks.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/remotes/origin/pull/16,fed14c0074c778058c5c6407c0d3851a48745643,3d42bdb33d25151c7eb51be29b54cd79f18cbea6,76f96715817507d662dba476143d4a55649d8eae,,True,True,f8e6b84c9aaa9bc92ea713cbb039114bff61a8586664a092462e9fd04cbd63b5,Tests_passed,278b9ba2cf765408c336b00d7fd29b42564ebfc9a2d2fb55023a0122cebb3bd3,Tests_passed,True,True,Merge_failed,884b1104ebaa8c39c2f150e82d2508b0eca77ced497c34cfed929a45117c373e,Merge_failed,884b1104ebaa8c39c2f150e82d2508b0eca77ced497c34cfed929a45117c373e,Merge_failed,884b1104ebaa8c39c2f150e82d2508b0eca77ced497c34cfed929a45117c373e,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,884b1104ebaa8c39c2f150e82d2508b0eca77ced497c34cfed929a45117c373e,Tests_failed,ee9b5ea2bc56fb78589cfa4285f3f56a6175381dc4d2126b72afae40d26913b0,Tests_failed,ee9b5ea2bc56fb78589cfa4285f3f56a6175381dc4d2126b72afae40d26913b0,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Merge_failed,bbe432a3e8f57538ddbe11edb7e0e5e0f707f0bc3b5db22fcfcdd364556554ca,0.03145408630371094,0.03414130210876465,0.034848690032958984,0.040778398513793945,0.03923964500427246,0.03901243209838867,0.03962349891662598,0.3562040328979492,0.038421630859375,2.9623799324035645,2.968475103378296,1.072967767715454,22.9702308177948,0.2756361961364746 +15,refs/remotes/origin/pull/16,fed14c0074c778058c5c6407c0d3851a48745643,3d42bdb33d25151c7eb51be29b54cd79f18cbea6,76f96715817507d662dba476143d4a55649d8eae,,True,True,f8e6b84c9aaa9bc92ea713cbb039114bff61a8586664a092462e9fd04cbd63b5,Tests_passed,278b9ba2cf765408c336b00d7fd29b42564ebfc9a2d2fb55023a0122cebb3bd3,Tests_passed,True,True,Merge_failed,884b1104ebaa8c39c2f150e82d2508b0eca77ced497c34cfed929a45117c373e,Merge_failed,884b1104ebaa8c39c2f150e82d2508b0eca77ced497c34cfed929a45117c373e,Merge_failed,884b1104ebaa8c39c2f150e82d2508b0eca77ced497c34cfed929a45117c373e,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,884b1104ebaa8c39c2f150e82d2508b0eca77ced497c34cfed929a45117c373e,Tests_failed,ee9b5ea2bc56fb78589cfa4285f3f56a6175381dc4d2126b72afae40d26913b0,Tests_failed,ee9b5ea2bc56fb78589cfa4285f3f56a6175381dc4d2126b72afae40d26913b0,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Merge_failed,bbe432a3e8f57538ddbe11edb7e0e5e0f707f0bc3b5db22fcfcdd364556554ca,0.03145408630371094,0.03414130210876465,0.034848690032958984,0.040778398513793945,0.03923964500427246,0.03901243209838867,0.03962349891662598,0.3562040328979492,0.038421630859375,2.912437677383423,2.9224905967712402,1.072967767715454,22.9702308177948,0.2756361961364746 diff --git a/results/combined/merges_timed/mikera/vectorz.csv b/results/combined/merges_timed/mikera/vectorz.csv index 654001fb45..1513ed416b 100644 --- a/results/combined/merges_timed/mikera/vectorz.csv +++ b/results/combined/merges_timed/mikera/vectorz.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -82,refs/heads/develop,38479c7a71896eeae10016b9816c3adfd10677c7,aa4246cef8d514c5ba431760237a475f2bc93a6f,5ce3d141304790445a47f3ba853f1b458f3416a2,,8a82f846364a62b45072b39c550008088bcb6d5e89a38e0460f20e8714f16d9d,Tests_passed,ba9b49be5b7ad61f7f291f8f750bd331aa7e945cf42e82e09404246ca0d51da2,Tests_passed,True,True,True,True,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,e8771aa43e0d88cc2249eefbe62fee5f2d326aecaeeb7d1d229dda7cd5339a4d,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,ae7b2ba31b66c9abd04dbbdae7490f9290f67ec0548ad031ca40013995e1f9af,Merge_failed,ae7b2ba31b66c9abd04dbbdae7490f9290f67ec0548ad031ca40013995e1f9af,Merge_failed,4a2f4f42bfab39cc91a1860db983aec7bb1524c2f85cae0d2e6383335933e90f,Tests_failed,34f975b00e43a3bf1100ba8aef6c85e1848c695589489ed0b9784cb1e6e518e5,Merge_failed,f811d04bddefa178a4d5368eea2bd9deda11c71b1592b902698fb092cfd8dfd1,0.02031993865966797,0.020007848739624023,0.023253679275512695,0.02318596839904785,0.014026165008544922,0.031684160232543945,0.02433633804321289,0.05715537071228027,0.02459406852722168,0.09521985054016113,0.09366440773010254,0.08564901351928711,0.47980713844299316,0.22968363761901855 +82,refs/heads/develop,38479c7a71896eeae10016b9816c3adfd10677c7,aa4246cef8d514c5ba431760237a475f2bc93a6f,5ce3d141304790445a47f3ba853f1b458f3416a2,,8a82f846364a62b45072b39c550008088bcb6d5e89a38e0460f20e8714f16d9d,Tests_passed,ba9b49be5b7ad61f7f291f8f750bd331aa7e945cf42e82e09404246ca0d51da2,Tests_passed,True,True,True,True,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,e8771aa43e0d88cc2249eefbe62fee5f2d326aecaeeb7d1d229dda7cd5339a4d,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,ae7b2ba31b66c9abd04dbbdae7490f9290f67ec0548ad031ca40013995e1f9af,Merge_failed,ae7b2ba31b66c9abd04dbbdae7490f9290f67ec0548ad031ca40013995e1f9af,Merge_failed,4a2f4f42bfab39cc91a1860db983aec7bb1524c2f85cae0d2e6383335933e90f,Tests_failed,34f975b00e43a3bf1100ba8aef6c85e1848c695589489ed0b9784cb1e6e518e5,Merge_failed,f811d04bddefa178a4d5368eea2bd9deda11c71b1592b902698fb092cfd8dfd1,0.02031993865966797,0.020007848739624023,0.023253679275512695,0.02318596839904785,0.014026165008544922,0.031684160232543945,0.02433633804321289,0.05715537071228027,0.02459406852722168,0.09302878379821777,0.09263134002685547,0.08564901351928711,0.47980713844299316,0.22968363761901855 diff --git a/results/combined/merges_timed/mikvor/money-conversion.csv b/results/combined/merges_timed/mikvor/money-conversion.csv index 4f19d2eed6..0c7169ac8c 100644 --- a/results/combined/merges_timed/mikvor/money-conversion.csv +++ b/results/combined/merges_timed/mikvor/money-conversion.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/remotes/origin/pull/18,7fd58e662fac159f87c3d1f8980001c7570e615d,f4b08d593619144bcf293727980ac768eef70459,9e6bdb77d6178f61a8e12141628076ff289c5f6a,,0506d34bfb48f879bfe0438a51539ff0345f9ad7bf8bc7061fe1a47acbf66908,Tests_passed,9a88b5c690992e2343df2bb870cf213ea8beb199e3805c8c03a38ff37e50f203,Tests_passed,True,True,True,True,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,33c56adbf87e0d4ed5394bd834745e008dee48608b7320bfdeb9dcf49e25e1ae,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,33c56adbf87e0d4ed5394bd834745e008dee48608b7320bfdeb9dcf49e25e1ae,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,cc562aa836e851086e1404caa03f8a470470c17eee1f4647ad889b6b0773feed,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,3cfcb20cf798cebe57b577328bcb4cd6c0a3b3dd5c8d6c8d60a1233778c3a531,Merge_failed,3cfcb20cf798cebe57b577328bcb4cd6c0a3b3dd5c8d6c8d60a1233778c3a531,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,be003950ff9086d7218f1e0679ab5347e3e13f6091af1e2265f1c8b78c681e32,0.04006242752075195,0.040935516357421875,0.042252540588378906,0.03882193565368652,0.04263019561767578,0.04160499572753906,0.03755354881286621,0.23112034797668457,0.06731414794921875,0.23839616775512695,0.23933839797973633,0.16553616523742676,1.625643014907837,0.18955540657043457 +5,refs/remotes/origin/pull/18,7fd58e662fac159f87c3d1f8980001c7570e615d,f4b08d593619144bcf293727980ac768eef70459,9e6bdb77d6178f61a8e12141628076ff289c5f6a,,0506d34bfb48f879bfe0438a51539ff0345f9ad7bf8bc7061fe1a47acbf66908,Tests_passed,9a88b5c690992e2343df2bb870cf213ea8beb199e3805c8c03a38ff37e50f203,Tests_passed,True,True,True,True,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,33c56adbf87e0d4ed5394bd834745e008dee48608b7320bfdeb9dcf49e25e1ae,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,33c56adbf87e0d4ed5394bd834745e008dee48608b7320bfdeb9dcf49e25e1ae,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,cc562aa836e851086e1404caa03f8a470470c17eee1f4647ad889b6b0773feed,Merge_failed,5610d90675192096960815c74fc373f94a3cc4758e29f56af709354d82f88927,Merge_failed,3cfcb20cf798cebe57b577328bcb4cd6c0a3b3dd5c8d6c8d60a1233778c3a531,Merge_failed,3cfcb20cf798cebe57b577328bcb4cd6c0a3b3dd5c8d6c8d60a1233778c3a531,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,be003950ff9086d7218f1e0679ab5347e3e13f6091af1e2265f1c8b78c681e32,0.04006242752075195,0.040935516357421875,0.042252540588378906,0.03882193565368652,0.04263019561767578,0.04160499572753906,0.03755354881286621,0.23112034797668457,0.06731414794921875,0.23675799369812012,0.23769140243530273,0.16553616523742676,1.625643014907837,0.18955540657043457 diff --git a/results/combined/merges_timed/milkbowl/vaultapi.csv b/results/combined/merges_timed/milkbowl/vaultapi.csv index dd613443fc..55d32da41a 100644 --- a/results/combined/merges_timed/milkbowl/vaultapi.csv +++ b/results/combined/merges_timed/milkbowl/vaultapi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/remotes/origin/pull/152,513fa83f0bb1da4b5a94904ddf3b65fa2dff631e,9520d8847e2b31f4a9d2cb5f7831c38877cd0ce9,7c7d0abcc2a89011a5bd44f67088d6446c7cd676,,True,True,a2c14020634374718d5b0c0f7d5da4fa70eea8d3dba2fbb9971d4642c39c94a3,Tests_passed,86e383c6710dd7bfc11604d004af9dce50edf16bcc0325d8a0a4cc354835216d,Tests_passed,True,True,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Merge_failed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Merge_failed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,0.009462594985961914,0.009325027465820312,0.009758949279785156,0.009682893753051758,0.009789705276489258,0.010204076766967773,0.010285615921020508,0.033596038818359375,0.00989842414855957,0.06880331039428711,0.06846737861633301,0.06456995010375977,0.4638633728027344,0.15895485877990723 +18,refs/remotes/origin/pull/152,513fa83f0bb1da4b5a94904ddf3b65fa2dff631e,9520d8847e2b31f4a9d2cb5f7831c38877cd0ce9,7c7d0abcc2a89011a5bd44f67088d6446c7cd676,,True,True,a2c14020634374718d5b0c0f7d5da4fa70eea8d3dba2fbb9971d4642c39c94a3,Tests_passed,86e383c6710dd7bfc11604d004af9dce50edf16bcc0325d8a0a4cc354835216d,Tests_passed,True,True,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Merge_failed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Merge_failed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,0.009462594985961914,0.009325027465820312,0.009758949279785156,0.009682893753051758,0.009789705276489258,0.010204076766967773,0.010285615921020508,0.033596038818359375,0.00989842414855957,0.06802558898925781,0.0681602954864502,0.06456995010375977,0.4638633728027344,0.15895485877990723 diff --git a/results/combined/merges_timed/mimno/mallet.csv b/results/combined/merges_timed/mimno/mallet.csv index df8b313480..def4073bd9 100644 --- a/results/combined/merges_timed/mimno/mallet.csv +++ b/results/combined/merges_timed/mimno/mallet.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -88,refs/remotes/origin/pull/174,a1f4c0a32d1da92d486d022bd1b860cac1285580,808668f25eab6bbd1282e1cff5c0594c8673b070,12487de1aa6433bdcf5af0ee0a17b368e64c7acf,,True,True,e7509a93067c48b052332a33a4def32a041597470d2282c4f84a53b52158fabe,Tests_passed,f4b5a13b324f0d007132c101e5ca95e9bde8a5db2ba00edc1bc6810990ec4cd4,Tests_passed,True,True,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,8a4509d7fe7397f9dde0f0ad3679d6779e7037af6538e0d011eb60ef97bbb613,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,f664dadb8335547173d6dee9f92ec80c7ae413d2817affda1377bb06752a20f3,Merge_failed,4ec6c1373636a630d71f4a492799ac6abf46039a68a9e58f62e9ce8b7ac60dce,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,0bfa52ac424b4f8da70eba90a2850c59aef193e5fdd9576b2fdf2d35b649811b,Merge_failed,3c31a28e159f073ee34822b81f9298650fed7bfa4ef3df42b0734860508c9d73,0.0603785514831543,0.05301380157470703,0.058934926986694336,0.06537127494812012,0.05718708038330078,0.06647109985351562,0.06812286376953125,0.25701904296875,0.08773112297058105,0.24619722366333008,0.24474310874938965,0.24288105964660645,2.016625165939331,0.7355701923370361 +88,refs/remotes/origin/pull/174,a1f4c0a32d1da92d486d022bd1b860cac1285580,808668f25eab6bbd1282e1cff5c0594c8673b070,12487de1aa6433bdcf5af0ee0a17b368e64c7acf,,True,True,e7509a93067c48b052332a33a4def32a041597470d2282c4f84a53b52158fabe,Tests_passed,f4b5a13b324f0d007132c101e5ca95e9bde8a5db2ba00edc1bc6810990ec4cd4,Tests_passed,True,True,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,8a4509d7fe7397f9dde0f0ad3679d6779e7037af6538e0d011eb60ef97bbb613,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,f664dadb8335547173d6dee9f92ec80c7ae413d2817affda1377bb06752a20f3,Merge_failed,4ec6c1373636a630d71f4a492799ac6abf46039a68a9e58f62e9ce8b7ac60dce,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,0bfa52ac424b4f8da70eba90a2850c59aef193e5fdd9576b2fdf2d35b649811b,Merge_failed,3c31a28e159f073ee34822b81f9298650fed7bfa4ef3df42b0734860508c9d73,0.0603785514831543,0.05301380157470703,0.058934926986694336,0.06537127494812012,0.05718708038330078,0.06647109985351562,0.06812286376953125,0.25701904296875,0.08773112297058105,0.24274682998657227,0.2429811954498291,0.24288105964660645,2.016625165939331,0.7355701923370361 diff --git a/results/combined/merges_timed/minecrafter/bungeejson.csv b/results/combined/merges_timed/minecrafter/bungeejson.csv index cd2a5d7a86..2753757a69 100644 --- a/results/combined/merges_timed/minecrafter/bungeejson.csv +++ b/results/combined/merges_timed/minecrafter/bungeejson.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/remotes/origin/restful-api,0b724f363a57d505cd080c459b42edd48cf57891,9a86a05971b5552c08194dfedaa054d5eac16d8b,80ff9723e4368f5bf84b14dce399d7912d6abce0,,4e43cfb1aa9cec3de65d3a1d1dd9389e296fef1299599c7ef39367fa616d2594,Tests_passed,2fb281682c5cd6c7a0ff5628c1b18a580c7658b6c73edaaf1d7934d1eb91eac2,Tests_passed,True,True,True,True,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,0.008375406265258789,0.00892186164855957,0.008960247039794922,0.00937032699584961,0.008941650390625,0.009052753448486328,0.009173393249511719,0.03178715705871582,0.008939504623413086,0.16496753692626953,0.16416430473327637,0.06315112113952637,0.6489460468292236,0.17100763320922852 +2,refs/remotes/origin/restful-api,0b724f363a57d505cd080c459b42edd48cf57891,9a86a05971b5552c08194dfedaa054d5eac16d8b,80ff9723e4368f5bf84b14dce399d7912d6abce0,,4e43cfb1aa9cec3de65d3a1d1dd9389e296fef1299599c7ef39367fa616d2594,Tests_passed,2fb281682c5cd6c7a0ff5628c1b18a580c7658b6c73edaaf1d7934d1eb91eac2,Tests_passed,True,True,True,True,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,0.008375406265258789,0.00892186164855957,0.008960247039794922,0.00937032699584961,0.008941650390625,0.009052753448486328,0.009173393249511719,0.03178715705871582,0.008939504623413086,0.16298341751098633,0.1628255844116211,0.06315112113952637,0.6489460468292236,0.17100763320922852 diff --git a/results/combined/merges_timed/mitre/http-proxy-servlet.csv b/results/combined/merges_timed/mitre/http-proxy-servlet.csv index 1f1d872093..6b0f04a686 100644 --- a/results/combined/merges_timed/mitre/http-proxy-servlet.csv +++ b/results/combined/merges_timed/mitre/http-proxy-servlet.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,73da1ecb003abb248aae7b00fa554801baff1418,89f7168fa870d7f726185136517c5d52467d73d3,41a79b08bc07511f7f68b193054b19360fd48838,,0c3a39385c0cc620f4f2fb45aa41bc487862513285efbcfee1272d528fd79bbc,Tests_passed,25eb1363d17ad1f68bb841db44f81929ae6cd281015ba990ea9f87329a762b8c,Tests_passed,True,True,True,True,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,0.04258990287780762,0.043234825134277344,0.04316592216491699,0.04578876495361328,0.04329991340637207,0.04605603218078613,0.045240163803100586,0.17613959312438965,0.038121700286865234,0.17086315155029297,0.1702122688293457,0.11720490455627441,1.0983514785766602,0.19288253784179688 +11,refs/heads/master,73da1ecb003abb248aae7b00fa554801baff1418,89f7168fa870d7f726185136517c5d52467d73d3,41a79b08bc07511f7f68b193054b19360fd48838,,0c3a39385c0cc620f4f2fb45aa41bc487862513285efbcfee1272d528fd79bbc,Tests_passed,25eb1363d17ad1f68bb841db44f81929ae6cd281015ba990ea9f87329a762b8c,Tests_passed,True,True,True,True,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,0.04258990287780762,0.043234825134277344,0.04316592216491699,0.04578876495361328,0.04329991340637207,0.04605603218078613,0.045240163803100586,0.17613959312438965,0.038121700286865234,0.16818642616271973,0.16984915733337402,0.11720490455627441,1.0983514785766602,0.19288253784179688 diff --git a/results/combined/merges_timed/mixpanel/mixpanel-java.csv b/results/combined/merges_timed/mixpanel/mixpanel-java.csv index 06fd24a90c..3f3c39474d 100644 --- a/results/combined/merges_timed/mixpanel/mixpanel-java.csv +++ b/results/combined/merges_timed/mixpanel/mixpanel-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,bcdd1ed28f9b69aa8baa6d7d44e292f4d8e8a236,7cc869766660614944e59e0f153f3fac91e654af,dcd372da803eba5bf6ec38189647f005634b922a,,8c5a9a45a6651722aff61e1c8d82077152d3103ee3f03856178a7c1ff4a23777,Tests_passed,e70b6084c60ad9db77a6c5d49ffce05898631fbfde7f7918f1a827665883e10d,Tests_passed,True,True,True,True,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,2779da433461a80abd106d1cca374ba1b1c45c822fbf59660cb1fb0f95b6dd1d,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Tests_failed,1731ba3df9aea3ba5593acbb0d55ad0f1f48fa1bc5848055d744dcc07fb5ffb9,Tests_failed,1731ba3df9aea3ba5593acbb0d55ad0f1f48fa1bc5848055d744dcc07fb5ffb9,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Merge_failed,dea88c5c7a73d979e51b41b9d3f208dc8d86bf783bfba463ba27aec135f1096a,0.03998756408691406,0.03754281997680664,0.038186073303222656,0.04003453254699707,0.04013991355895996,0.030269145965576172,0.04058241844177246,0.1567070484161377,0.06528401374816895,0.15627431869506836,0.15685558319091797,0.1077876091003418,0.6788811683654785,0.17783570289611816 +7,refs/heads/master,bcdd1ed28f9b69aa8baa6d7d44e292f4d8e8a236,7cc869766660614944e59e0f153f3fac91e654af,dcd372da803eba5bf6ec38189647f005634b922a,,8c5a9a45a6651722aff61e1c8d82077152d3103ee3f03856178a7c1ff4a23777,Tests_passed,e70b6084c60ad9db77a6c5d49ffce05898631fbfde7f7918f1a827665883e10d,Tests_passed,True,True,True,True,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,2779da433461a80abd106d1cca374ba1b1c45c822fbf59660cb1fb0f95b6dd1d,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Tests_failed,1731ba3df9aea3ba5593acbb0d55ad0f1f48fa1bc5848055d744dcc07fb5ffb9,Tests_failed,1731ba3df9aea3ba5593acbb0d55ad0f1f48fa1bc5848055d744dcc07fb5ffb9,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Merge_failed,dea88c5c7a73d979e51b41b9d3f208dc8d86bf783bfba463ba27aec135f1096a,0.03998756408691406,0.03754281997680664,0.038186073303222656,0.04003453254699707,0.04013991355895996,0.030269145965576172,0.04058241844177246,0.1567070484161377,0.06528401374816895,0.15400147438049316,0.15492820739746094,0.1077876091003418,0.6788811683654785,0.17783570289611816 diff --git a/results/combined/merges_timed/mjsalerno/unobot.csv b/results/combined/merges_timed/mjsalerno/unobot.csv index 4cee4f99fd..1a2c9d201b 100644 --- a/results/combined/merges_timed/mjsalerno/unobot.csv +++ b/results/combined/merges_timed/mjsalerno/unobot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/remotes/origin/pull/42,5c68b52897a24a9aa71f0ee807a37f04c1f997f3,7c9a626e059d1f481130d6de69cdeb79243d8ffc,50f00c42a551b152e5945adda21c0a9580734ca8,,True,True,da5d9cb924c723c919a0805ef1b79ce0b170172cc44217e4b40a9c6de8211a3a,Tests_passed,07125af5f670ab7ae858ddcfc5fa6ec59148472bc595e74a13c501ba831efaa5,Tests_passed,True,True,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,670aee39f63e827b9150afd28aedcc67a43d0cf262ccfe44fffdc9701104611d,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,8c597237e477a87e662e66be78c9ccd3d75d15154135a41a9b2ef791e302fcc9,Merge_failed,8c597237e477a87e662e66be78c9ccd3d75d15154135a41a9b2ef791e302fcc9,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Merge_failed,3e2b2099e4dd52865e4c32045991075391aadd1bfb5f1a89244029e2f2c1dbdd,0.04147982597351074,0.041783809661865234,0.048081159591674805,0.04715538024902344,0.04252123832702637,0.04236173629760742,0.043619632720947266,0.17548418045043945,0.07028532028198242,0.06628131866455078,0.06649279594421387,0.1245729923248291,2.058908700942993,0.18711519241333008 +32,refs/remotes/origin/pull/42,5c68b52897a24a9aa71f0ee807a37f04c1f997f3,7c9a626e059d1f481130d6de69cdeb79243d8ffc,50f00c42a551b152e5945adda21c0a9580734ca8,,True,True,da5d9cb924c723c919a0805ef1b79ce0b170172cc44217e4b40a9c6de8211a3a,Tests_passed,07125af5f670ab7ae858ddcfc5fa6ec59148472bc595e74a13c501ba831efaa5,Tests_passed,True,True,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,670aee39f63e827b9150afd28aedcc67a43d0cf262ccfe44fffdc9701104611d,Merge_failed,fbcdb145be15fbbbf861361dbf0cdb8d84c48c18822864eea8348f57d3e29d64,Merge_failed,8c597237e477a87e662e66be78c9ccd3d75d15154135a41a9b2ef791e302fcc9,Merge_failed,8c597237e477a87e662e66be78c9ccd3d75d15154135a41a9b2ef791e302fcc9,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Merge_failed,3e2b2099e4dd52865e4c32045991075391aadd1bfb5f1a89244029e2f2c1dbdd,0.04147982597351074,0.041783809661865234,0.048081159591674805,0.04715538024902344,0.04252123832702637,0.04236173629760742,0.043619632720947266,0.17548418045043945,0.07028532028198242,0.0670311450958252,0.06602954864501953,0.1245729923248291,2.058908700942993,0.18711519241333008 diff --git a/results/combined/merges_timed/mjsax/aeolus.csv b/results/combined/merges_timed/mjsax/aeolus.csv index b14ff1a210..569591e39e 100644 --- a/results/combined/merges_timed/mjsax/aeolus.csv +++ b/results/combined/merges_timed/mjsax/aeolus.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,85127f4c5b94cc63493a78baf3bcb0f703a4bca5,9863d87774e76990b823efb0c6dbef3132084438,71bbc8afc3cd487cf847377e54251c8416cc1e49,,True,True,a5049851dccb1faab38ce136e46912bfad21b98691e4d74f903a71f5985a9e33,Tests_passed,4aa0e05f3da13b5a1f192fbccec0b9d0f53fc6b7d359ef49feea494f51bb7689,Tests_passed,True,True,Merge_failed,51ad32da76c4afd4713dbcca05192d0c86946ada07256441c12c3244c0a9327f,Merge_failed,51ad32da76c4afd4713dbcca05192d0c86946ada07256441c12c3244c0a9327f,Merge_failed,a335bd6170dedcf666d33653d9a19f555d7f47a99a62dea469b71222e4841026,Merge_failed,b02257c25e26a73aeefca341de4cc4490359e8892589976a93c3e0e5ac02d9dd,Merge_failed,b02257c25e26a73aeefca341de4cc4490359e8892589976a93c3e0e5ac02d9dd,Merge_failed,b02257c25e26a73aeefca341de4cc4490359e8892589976a93c3e0e5ac02d9dd,Merge_failed,b02257c25e26a73aeefca341de4cc4490359e8892589976a93c3e0e5ac02d9dd,Merge_failed,02444ff1e05d4737abce7a9cb14fea4cda104879c75cc48b40eb5e24720889b6,Merge_failed,51ad32da76c4afd4713dbcca05192d0c86946ada07256441c12c3244c0a9327f,Merge_failed,6db2ed731f6207563049a68722fa514898c449d99e22600f6bf59ed6bdc6930c,Merge_failed,6db2ed731f6207563049a68722fa514898c449d99e22600f6bf59ed6bdc6930c,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,02a2bdcb26285c666c17f15947dac5b4dc202113b542b348442014380fa8904b,0.02788090705871582,0.02758193016052246,0.029208660125732422,0.029335975646972656,0.02885270118713379,0.029081344604492188,0.0302121639251709,0.3760702610015869,0.06588220596313477,3.450763702392578,3.446579694747925,1.5559630393981934,18.570883750915527,0.2915375232696533 +2,refs/heads/master,85127f4c5b94cc63493a78baf3bcb0f703a4bca5,9863d87774e76990b823efb0c6dbef3132084438,71bbc8afc3cd487cf847377e54251c8416cc1e49,,True,True,a5049851dccb1faab38ce136e46912bfad21b98691e4d74f903a71f5985a9e33,Tests_passed,4aa0e05f3da13b5a1f192fbccec0b9d0f53fc6b7d359ef49feea494f51bb7689,Tests_passed,True,True,Merge_failed,51ad32da76c4afd4713dbcca05192d0c86946ada07256441c12c3244c0a9327f,Merge_failed,51ad32da76c4afd4713dbcca05192d0c86946ada07256441c12c3244c0a9327f,Merge_failed,a335bd6170dedcf666d33653d9a19f555d7f47a99a62dea469b71222e4841026,Merge_failed,b02257c25e26a73aeefca341de4cc4490359e8892589976a93c3e0e5ac02d9dd,Merge_failed,b02257c25e26a73aeefca341de4cc4490359e8892589976a93c3e0e5ac02d9dd,Merge_failed,b02257c25e26a73aeefca341de4cc4490359e8892589976a93c3e0e5ac02d9dd,Merge_failed,b02257c25e26a73aeefca341de4cc4490359e8892589976a93c3e0e5ac02d9dd,Merge_failed,02444ff1e05d4737abce7a9cb14fea4cda104879c75cc48b40eb5e24720889b6,Merge_failed,51ad32da76c4afd4713dbcca05192d0c86946ada07256441c12c3244c0a9327f,Merge_failed,6db2ed731f6207563049a68722fa514898c449d99e22600f6bf59ed6bdc6930c,Merge_failed,6db2ed731f6207563049a68722fa514898c449d99e22600f6bf59ed6bdc6930c,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,02a2bdcb26285c666c17f15947dac5b4dc202113b542b348442014380fa8904b,0.02788090705871582,0.02758193016052246,0.029208660125732422,0.029335975646972656,0.02885270118713379,0.029081344604492188,0.0302121639251709,0.3760702610015869,0.06588220596313477,3.459059953689575,3.475661277770996,1.5559630393981934,18.570883750915527,0.2915375232696533 diff --git a/results/combined/merges_timed/mklemm/jaxb2-rich-contract-plugin.csv b/results/combined/merges_timed/mklemm/jaxb2-rich-contract-plugin.csv index f575ec836b..64a4f288ca 100644 --- a/results/combined/merges_timed/mklemm/jaxb2-rich-contract-plugin.csv +++ b/results/combined/merges_timed/mklemm/jaxb2-rich-contract-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,0a55df3366207b1d38e81e468181949e1d53881c,e1a4d4058ac0a67fe00970ba020d205f7bb068d9,dd7ada0dbd4efe4681fb530d9ab1273cd5ef5910,,True,True,a931f70215bee43c3256dbeb50fdebc91f64a34bd7c010172141d8a677f1f5f3,Tests_passed,547099c7078cf1dbcb3272f1cb561a14c534e50dd7c437d61fdd7a71fdfe60b2,Tests_passed,True,True,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,0.0421299934387207,0.04828619956970215,0.04642963409423828,0.042122602462768555,0.03888130187988281,0.049185752868652344,0.05240631103515625,0.16346192359924316,0.04351091384887695,0.19557809829711914,0.1977989673614502,0.1122121810913086,2.5456600189208984,0.20061445236206055 +8,refs/heads/master,0a55df3366207b1d38e81e468181949e1d53881c,e1a4d4058ac0a67fe00970ba020d205f7bb068d9,dd7ada0dbd4efe4681fb530d9ab1273cd5ef5910,,True,True,a931f70215bee43c3256dbeb50fdebc91f64a34bd7c010172141d8a677f1f5f3,Tests_passed,547099c7078cf1dbcb3272f1cb561a14c534e50dd7c437d61fdd7a71fdfe60b2,Tests_passed,True,True,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,0.0421299934387207,0.04828619956970215,0.04642963409423828,0.042122602462768555,0.03888130187988281,0.049185752868652344,0.05240631103515625,0.16346192359924316,0.04351091384887695,0.1877121925354004,0.18665003776550293,0.1122121810913086,2.5456600189208984,0.20061445236206055 diff --git a/results/combined/merges_timed/mlaccetti/javapns.csv b/results/combined/merges_timed/mlaccetti/javapns.csv index dad6ce0e55..394afbb378 100644 --- a/results/combined/merges_timed/mlaccetti/javapns.csv +++ b/results/combined/merges_timed/mlaccetti/javapns.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/develop,413b36b2eb8345ba9226bb29894aa908b78e1f23,2d5ef5447267fb2b50ebf753103505f84605ea6c,f7ebeb852ee61b50638d120d44b4e10507ae553e,,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,910b3f21713eafbd9023948b36bf28d21ff51d6c062b4fd0060d67acf576392c,Tests_passed,True,True,True,True,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,789cce8923e8f1f419598f05505f3879cca74ffdcb5f8e25ce7c6936aeac88f5,Tests_passed,789cce8923e8f1f419598f05505f3879cca74ffdcb5f8e25ce7c6936aeac88f5,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,0.060803890228271484,0.058637380599975586,0.05446338653564453,0.054657936096191406,0.05191993713378906,0.0514528751373291,0.05894207954406738,0.7803995609283447,0.0556645393371582,1.6127300262451172,1.597658634185791,0.5950798988342285,7.25321888923645,0.23679423332214355 +3,refs/heads/develop,413b36b2eb8345ba9226bb29894aa908b78e1f23,2d5ef5447267fb2b50ebf753103505f84605ea6c,f7ebeb852ee61b50638d120d44b4e10507ae553e,,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,910b3f21713eafbd9023948b36bf28d21ff51d6c062b4fd0060d67acf576392c,Tests_passed,True,True,True,True,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,789cce8923e8f1f419598f05505f3879cca74ffdcb5f8e25ce7c6936aeac88f5,Tests_passed,789cce8923e8f1f419598f05505f3879cca74ffdcb5f8e25ce7c6936aeac88f5,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,0.060803890228271484,0.058637380599975586,0.05446338653564453,0.054657936096191406,0.05191993713378906,0.0514528751373291,0.05894207954406738,0.7803995609283447,0.0556645393371582,1.5363783836364746,1.5281057357788086,0.5950798988342285,7.25321888923645,0.23679423332214355 diff --git a/results/combined/merges_timed/mmastrac/nanojson.csv b/results/combined/merges_timed/mmastrac/nanojson.csv index 221ffe0f44..5d9fdd4e2f 100644 --- a/results/combined/merges_timed/mmastrac/nanojson.csv +++ b/results/combined/merges_timed/mmastrac/nanojson.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/heads/master,82385874bb4125a795bc67c7094df60367c096e9,9b02f0ed8d95b7aac915f3fa01632feb862c4751,c9523fac6ebac74f194ccae4aa151736d5c1385d,,True,True,87de4b28745d7d06b89476de36e3a00891cf749a6af641094d0a0b42060dd23d,Tests_passed,dff4712663b33cd2a973726ca9a50144a76e05b16790b328c9448c3067a5a0ff,Tests_passed,True,True,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,0.031897544860839844,0.04731917381286621,0.06467366218566895,0.047614097595214844,0.06380677223205566,0.0484166145324707,0.07474446296691895,0.238722562789917,0.05204510688781738,0.32084226608276367,0.32866430282592773,0.1561431884765625,1.4107248783111572,0.22020959854125977 +23,refs/heads/master,82385874bb4125a795bc67c7094df60367c096e9,9b02f0ed8d95b7aac915f3fa01632feb862c4751,c9523fac6ebac74f194ccae4aa151736d5c1385d,,True,True,87de4b28745d7d06b89476de36e3a00891cf749a6af641094d0a0b42060dd23d,Tests_passed,dff4712663b33cd2a973726ca9a50144a76e05b16790b328c9448c3067a5a0ff,Tests_passed,True,True,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,0.031897544860839844,0.04731917381286621,0.06467366218566895,0.047614097595214844,0.06380677223205566,0.0484166145324707,0.07474446296691895,0.238722562789917,0.05204510688781738,0.31085681915283203,0.3103649616241455,0.1561431884765625,1.4107248783111572,0.22020959854125977 diff --git a/results/combined/merges_timed/mmazi/rescu.csv b/results/combined/merges_timed/mmazi/rescu.csv index cabd69ed91..1c0e23f920 100644 --- a/results/combined/merges_timed/mmazi/rescu.csv +++ b/results/combined/merges_timed/mmazi/rescu.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -35,refs/remotes/origin/pull/100,efdd938e7a692b6e6f5cc759202a445f8c1d58e6,74f37e6c3fdaf31c8ffcb7562dea81b6cf48ef66,5b9ff524c314835010d92e74200a4f2f66377d3f,,c82ab7e00366a2f9d675099d7d0af778474a762c96e95ac74c3b75684f8f38b8,Tests_passed,0fcfb9942c9e8f8509892a7db28250ad676b82fbf2727bda4785cb1f7ef402a8,Tests_passed,True,True,True,True,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_failed,85460ccf75c5598362eadfaa6539e76c160d54ee1a300dd22465aa70be2bbfd2,Tests_failed,85460ccf75c5598362eadfaa6539e76c160d54ee1a300dd22465aa70be2bbfd2,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,0.04961872100830078,0.04176068305969238,0.04710125923156738,0.04992198944091797,0.047080278396606445,0.051339149475097656,0.03697347640991211,0.23429322242736816,0.054071664810180664,0.1706235408782959,0.1707909107208252,0.17016339302062988,1.253561019897461,0.20528268814086914 +35,refs/remotes/origin/pull/100,efdd938e7a692b6e6f5cc759202a445f8c1d58e6,74f37e6c3fdaf31c8ffcb7562dea81b6cf48ef66,5b9ff524c314835010d92e74200a4f2f66377d3f,,c82ab7e00366a2f9d675099d7d0af778474a762c96e95ac74c3b75684f8f38b8,Tests_passed,0fcfb9942c9e8f8509892a7db28250ad676b82fbf2727bda4785cb1f7ef402a8,Tests_passed,True,True,True,True,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_failed,85460ccf75c5598362eadfaa6539e76c160d54ee1a300dd22465aa70be2bbfd2,Tests_failed,85460ccf75c5598362eadfaa6539e76c160d54ee1a300dd22465aa70be2bbfd2,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,0.04961872100830078,0.04176068305969238,0.04710125923156738,0.04992198944091797,0.047080278396606445,0.051339149475097656,0.03697347640991211,0.23429322242736816,0.054071664810180664,0.1674654483795166,0.16746783256530762,0.17016339302062988,1.253561019897461,0.20528268814086914 diff --git a/results/combined/merges_timed/mmlab/rmlprocessor.csv b/results/combined/merges_timed/mmlab/rmlprocessor.csv index 541a6f1656..68c6810668 100644 --- a/results/combined/merges_timed/mmlab/rmlprocessor.csv +++ b/results/combined/merges_timed/mmlab/rmlprocessor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,707510e3a9c3a799e38a2933cd54e4688c0ad7aa,e011318d42cff62d34c224ad889163c38254cb5b,7fc95258a1ce664d978c90ea375c9ee0d76546ca,,ff38e94a8726322f71be194cc8a46873dcedb18403a1a57a57cf1c70704a8712,Tests_passed,cef6c32a7d620ba45c9847b3b61719e9fc33db4993de3802e44f9678f4a705c2,Tests_passed,True,True,True,True,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,a400a60516a7ee15ff9dc020de6f16ec79f219bbb9e0c72fc690e3c2faf137fc,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,e8c2cd576bbcc6c39e54b4420844ff597cc1dc1eefbeca12db49e51812459245,Merge_failed,e8c2cd576bbcc6c39e54b4420844ff597cc1dc1eefbeca12db49e51812459245,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,6956031f2ef21c6cdef5265bcefd7d0f91f75ee96d1718dbad4da46574594a22,0.04576897621154785,0.06780242919921875,0.05227470397949219,0.035822391510009766,0.06319379806518555,0.048416852951049805,0.03875303268432617,0.388427734375,0.07248568534851074,0.5442423820495605,0.5453002452850342,0.2899017333984375,3.721930503845215,0.22883391380310059 +4,refs/heads/master,707510e3a9c3a799e38a2933cd54e4688c0ad7aa,e011318d42cff62d34c224ad889163c38254cb5b,7fc95258a1ce664d978c90ea375c9ee0d76546ca,,ff38e94a8726322f71be194cc8a46873dcedb18403a1a57a57cf1c70704a8712,Tests_passed,cef6c32a7d620ba45c9847b3b61719e9fc33db4993de3802e44f9678f4a705c2,Tests_passed,True,True,True,True,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,a400a60516a7ee15ff9dc020de6f16ec79f219bbb9e0c72fc690e3c2faf137fc,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,e8c2cd576bbcc6c39e54b4420844ff597cc1dc1eefbeca12db49e51812459245,Merge_failed,e8c2cd576bbcc6c39e54b4420844ff597cc1dc1eefbeca12db49e51812459245,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,6956031f2ef21c6cdef5265bcefd7d0f91f75ee96d1718dbad4da46574594a22,0.04576897621154785,0.06780242919921875,0.05227470397949219,0.035822391510009766,0.06319379806518555,0.048416852951049805,0.03875303268432617,0.388427734375,0.07248568534851074,0.5504214763641357,0.5407435894012451,0.2899017333984375,3.721930503845215,0.22883391380310059 diff --git a/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv b/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv index a41bf1ec54..95214a05e1 100644 --- a/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv +++ b/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -43,refs/remotes/origin/pull/44,4c831013aa8566249aae635880e414012ded48ee,885f2f42706c637b79aebc3d6ea45b68394c9301,79ffadef8f9200893a5df55480b8cc920e77a394,,56102c0f0170020a033681690e9cb0174cdf5be753f59b8fbfcc4c31094eb98f,Tests_passed,f6ccc78e0da0f85a5fb0feeb6ed94f5da145f7625d30eceb39383711122a33f9,Tests_passed,True,True,True,True,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,3bce6b104624ccaf12f48d575be76a8d4202a528df2423f7a20cf6d21132c359,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,c80beb9a019e10ad2743601174aec94f867cdb5baab83b39619ed43de6a03177,Merge_failed,c80beb9a019e10ad2743601174aec94f867cdb5baab83b39619ed43de6a03177,Merge_failed,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Tests_passed,8540e33851275d5356cc248ac3cd4a514c69fb4c87ef2bfee857d3d799a713c1,Merge_failed,1c5e16cfaeecfc632f513844f79567f3193dd39ef5628e3b2809c810c12e0739,0.0350947380065918,0.04623556137084961,0.05068206787109375,0.046700239181518555,0.044840097427368164,0.04007720947265625,0.04721212387084961,0.1716630458831787,0.06914472579956055,0.07236599922180176,0.07293391227722168,0.12360334396362305,1.5209083557128906,0.19981098175048828 +43,refs/remotes/origin/pull/44,4c831013aa8566249aae635880e414012ded48ee,885f2f42706c637b79aebc3d6ea45b68394c9301,79ffadef8f9200893a5df55480b8cc920e77a394,,56102c0f0170020a033681690e9cb0174cdf5be753f59b8fbfcc4c31094eb98f,Tests_passed,f6ccc78e0da0f85a5fb0feeb6ed94f5da145f7625d30eceb39383711122a33f9,Tests_passed,True,True,True,True,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,3bce6b104624ccaf12f48d575be76a8d4202a528df2423f7a20cf6d21132c359,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,c80beb9a019e10ad2743601174aec94f867cdb5baab83b39619ed43de6a03177,Merge_failed,c80beb9a019e10ad2743601174aec94f867cdb5baab83b39619ed43de6a03177,Merge_failed,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Tests_passed,8540e33851275d5356cc248ac3cd4a514c69fb4c87ef2bfee857d3d799a713c1,Merge_failed,1c5e16cfaeecfc632f513844f79567f3193dd39ef5628e3b2809c810c12e0739,0.0350947380065918,0.04623556137084961,0.05068206787109375,0.046700239181518555,0.044840097427368164,0.04007720947265625,0.04721212387084961,0.1716630458831787,0.06914472579956055,0.07300305366516113,0.07275891304016113,0.12360334396362305,1.5209083557128906,0.19981098175048828 diff --git a/results/combined/merges_timed/mongobee/mongobee.csv b/results/combined/merges_timed/mongobee/mongobee.csv index ba641a640e..c52d5e7b3c 100644 --- a/results/combined/merges_timed/mongobee/mongobee.csv +++ b/results/combined/merges_timed/mongobee/mongobee.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,abf507930c55a2a4d918d70d5c3ff852fb5cbf5e,81176bcbef3ba6fa4bfb006ba4571a33c71bdbc2,f73e3dc7807a7a4daafde4fa720b6f4246670978,,True,True,2c1a5f276ab626eba7700c2ad8e3724e568a77586b80c21a1614d9bde703dbf1,Tests_passed,9e00b2d19b8f69e948b4291cba5261ea6dcad756e554a824442f59e591e24e48,Tests_passed,True,True,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,b1d33a948d9733df10125e2730868b80dd5be2f8d0324469deff6708c58daea3,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,b1d33a948d9733df10125e2730868b80dd5be2f8d0324469deff6708c58daea3,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,44b6e2884b1f1a8dd8ee9504103a452e0f9fea1e6537410ba9a5404fa9047bab,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,5455d838b3b3f38df59146657536f61f3eff42976ab71255b5bc58c72eaf53ab,Merge_failed,5455d838b3b3f38df59146657536f61f3eff42976ab71255b5bc58c72eaf53ab,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Merge_failed,94e4f07c31c4dc2509182f0a698a0522e72a878623c8434e51a54efcc715cda8,0.04684329032897949,0.045816898345947266,0.040709495544433594,0.04358530044555664,0.0359959602355957,0.040045738220214844,0.044884681701660156,0.23576140403747559,0.05132031440734863,0.12398004531860352,0.12424206733703613,0.1766963005065918,1.3892931938171387,0.20625567436218262 +8,refs/heads/master,abf507930c55a2a4d918d70d5c3ff852fb5cbf5e,81176bcbef3ba6fa4bfb006ba4571a33c71bdbc2,f73e3dc7807a7a4daafde4fa720b6f4246670978,,True,True,2c1a5f276ab626eba7700c2ad8e3724e568a77586b80c21a1614d9bde703dbf1,Tests_passed,9e00b2d19b8f69e948b4291cba5261ea6dcad756e554a824442f59e591e24e48,Tests_passed,True,True,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,b1d33a948d9733df10125e2730868b80dd5be2f8d0324469deff6708c58daea3,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,b1d33a948d9733df10125e2730868b80dd5be2f8d0324469deff6708c58daea3,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,44b6e2884b1f1a8dd8ee9504103a452e0f9fea1e6537410ba9a5404fa9047bab,Merge_failed,c8c838b96346a701654fe28e501dbb4d7de74f06fd14df23669651cf80bbc963,Merge_failed,5455d838b3b3f38df59146657536f61f3eff42976ab71255b5bc58c72eaf53ab,Merge_failed,5455d838b3b3f38df59146657536f61f3eff42976ab71255b5bc58c72eaf53ab,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Merge_failed,94e4f07c31c4dc2509182f0a698a0522e72a878623c8434e51a54efcc715cda8,0.04684329032897949,0.045816898345947266,0.040709495544433594,0.04358530044555664,0.0359959602355957,0.040045738220214844,0.044884681701660156,0.23576140403747559,0.05132031440734863,0.12431812286376953,0.12389802932739258,0.1766963005065918,1.3892931938171387,0.20625567436218262 diff --git a/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv b/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv index d487bd24c8..fbb097d965 100644 --- a/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv +++ b/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -47,refs/heads/master,0ddd3bd015cc0a792db62c6a5988844478e7d388,8a016a98cd4c187894853bfcefb543dd43277519,f44c06b09b95cdd8c943957fa81e46aaf8feb552,,ea23a0b0bfe6a0c4fdfb0191726b93d411ebf26f98c077e7520bb92f107b90cb,Tests_passed,cc7214658eb15b1919ae7460e98fb19dc3a1b929346bbcc8517b2f6c08b398ab,Tests_passed,True,True,True,True,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,7d222e4ecd626a077f1a37c7522e7b736ff39547333b6fdfc85b4d5908994b4f,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,0.013883829116821289,0.014308452606201172,0.016765594482421875,0.015892505645751953,0.01636481285095215,0.016234159469604492,0.016750097274780273,0.060468196868896484,0.013971328735351562,0.3174772262573242,0.3136866092681885,0.12865805625915527,2.324634313583374,0.18973898887634277 +47,refs/heads/master,0ddd3bd015cc0a792db62c6a5988844478e7d388,8a016a98cd4c187894853bfcefb543dd43277519,f44c06b09b95cdd8c943957fa81e46aaf8feb552,,ea23a0b0bfe6a0c4fdfb0191726b93d411ebf26f98c077e7520bb92f107b90cb,Tests_passed,cc7214658eb15b1919ae7460e98fb19dc3a1b929346bbcc8517b2f6c08b398ab,Tests_passed,True,True,True,True,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,7d222e4ecd626a077f1a37c7522e7b736ff39547333b6fdfc85b4d5908994b4f,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,0.013883829116821289,0.014308452606201172,0.016765594482421875,0.015892505645751953,0.01636481285095215,0.016234159469604492,0.016750097274780273,0.060468196868896484,0.013971328735351562,0.30942678451538086,0.31114745140075684,0.12865805625915527,2.324634313583374,0.18973898887634277 diff --git a/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv b/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv index de37c1a88f..73401cd0c6 100644 --- a/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv +++ b/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,6024cb183c93a9bcde34205c97b4a1dfb3694ac5,6c0272594c958b201b17fd354e8b06b3f8008cef,e6694bb0f8433e24d3bed2c2a2c10e16b6b53eb4,,0bad627e56221cdf7b5054b87bab687cd870efe747d1b9fc07527c8b64bf2e74,Tests_passed,c48d3da379b47b59f3ce0583e029d3557b679af0c333d74137f31bbaa524be71,Tests_passed,True,True,True,True,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,0.03983640670776367,0.04173541069030762,0.04349946975708008,0.04386186599731445,0.042281389236450195,0.04378938674926758,0.039635658264160156,0.2342386245727539,0.04017949104309082,0.14856195449829102,0.1499497890472412,0.16608190536499023,0.4651765823364258,0.18414950370788574 +1,refs/heads/master,6024cb183c93a9bcde34205c97b4a1dfb3694ac5,6c0272594c958b201b17fd354e8b06b3f8008cef,e6694bb0f8433e24d3bed2c2a2c10e16b6b53eb4,,0bad627e56221cdf7b5054b87bab687cd870efe747d1b9fc07527c8b64bf2e74,Tests_passed,c48d3da379b47b59f3ce0583e029d3557b679af0c333d74137f31bbaa524be71,Tests_passed,True,True,True,True,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,0.03983640670776367,0.04173541069030762,0.04349946975708008,0.04386186599731445,0.042281389236450195,0.04378938674926758,0.039635658264160156,0.2342386245727539,0.04017949104309082,0.1480567455291748,0.1473989486694336,0.16608190536499023,0.4651765823364258,0.18414950370788574 diff --git a/results/combined/merges_timed/mooso/azure-tables-hadoop.csv b/results/combined/merges_timed/mooso/azure-tables-hadoop.csv index 13213ed2f3..8e54a82984 100644 --- a/results/combined/merges_timed/mooso/azure-tables-hadoop.csv +++ b/results/combined/merges_timed/mooso/azure-tables-hadoop.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,f5ae55a8d5024fba05bd9a188ae18116b624a69d,8dfebe85856c3c8b151ef6c125269f017e4ff3c8,2d39177520998c04d9ae22cfe33364183a368d84,,9e4249278bd982e5cf0c0fd85a3f35ec70961e9d195585c572a71834917564fd,Tests_passed,61bae1ae8066aca05420353b193b18f6b6a44366dbd625f0f341c69d1b411ea7,Tests_passed,True,True,True,True,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,8245d50737143bbcbf0d441577ab48af02ab67a45866b6d460eef4c26dff850a,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,8245d50737143bbcbf0d441577ab48af02ab67a45866b6d460eef4c26dff850a,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,ab5228d5529cb303b9904aaa7c02be1bd63cc68719b85daa95f5860c53964423,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,84625574533159f9280def3e76d06b92124afeb90c64dec5e842c528835537a2,Merge_failed,84625574533159f9280def3e76d06b92124afeb90c64dec5e842c528835537a2,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_failed,4d5e3f5820d955fce14483595fa285414031d5c6c66430799aba70e180928633,0.041785478591918945,0.04632234573364258,0.03166317939758301,0.04515409469604492,0.03222918510437012,0.038799285888671875,0.04024386405944824,0.7250766754150391,0.12147712707519531,1.1073431968688965,1.1161491870880127,0.6221773624420166,4.528571844100952,0.1983797550201416 +1,refs/heads/master,f5ae55a8d5024fba05bd9a188ae18116b624a69d,8dfebe85856c3c8b151ef6c125269f017e4ff3c8,2d39177520998c04d9ae22cfe33364183a368d84,,9e4249278bd982e5cf0c0fd85a3f35ec70961e9d195585c572a71834917564fd,Tests_passed,61bae1ae8066aca05420353b193b18f6b6a44366dbd625f0f341c69d1b411ea7,Tests_passed,True,True,True,True,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,8245d50737143bbcbf0d441577ab48af02ab67a45866b6d460eef4c26dff850a,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,8245d50737143bbcbf0d441577ab48af02ab67a45866b6d460eef4c26dff850a,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,ab5228d5529cb303b9904aaa7c02be1bd63cc68719b85daa95f5860c53964423,Merge_failed,952668f1ed23d9a2bdeb55acbc04c515bbff739a2493a696a37b6e6caa5c38b8,Merge_failed,84625574533159f9280def3e76d06b92124afeb90c64dec5e842c528835537a2,Merge_failed,84625574533159f9280def3e76d06b92124afeb90c64dec5e842c528835537a2,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_failed,4d5e3f5820d955fce14483595fa285414031d5c6c66430799aba70e180928633,0.041785478591918945,0.04632234573364258,0.03166317939758301,0.04515409469604492,0.03222918510437012,0.038799285888671875,0.04024386405944824,0.7250766754150391,0.12147712707519531,1.1151378154754639,1.1104886531829834,0.6221773624420166,4.528571844100952,0.1983797550201416 diff --git a/results/combined/merges_timed/moquette-io/moquette.csv b/results/combined/merges_timed/moquette-io/moquette.csv index 5000c5d8d2..9847e48df0 100644 --- a/results/combined/merges_timed/moquette-io/moquette.csv +++ b/results/combined/merges_timed/moquette-io/moquette.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -108,refs/remotes/origin/pull/109,f0bde2f711c6774a067098216079052e05940751,cc4b3715c59dbdca3cc68d422c0e541ef5258b62,a9404bdf31f9c6455857e5cfbaea9f54d95f008a,,True,True,3f33d8a484bbc013c0ce66ab4670073048dd2c4bf434a0847f9c7c94cae3d427,Tests_passed,51e1197b825373beb5903fb928988806465201c3ab3388b79fe0e9e4e70ee6ef,Tests_passed,True,True,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,0.05082535743713379,0.04283881187438965,0.05010581016540527,0.03232002258300781,0.03838062286376953,0.04252433776855469,0.04762005805969238,0.17762446403503418,0.04236960411071777,0.16084933280944824,0.16207456588745117,0.10495758056640625,0.9524059295654297,0.26206421852111816 +108,refs/remotes/origin/pull/109,f0bde2f711c6774a067098216079052e05940751,cc4b3715c59dbdca3cc68d422c0e541ef5258b62,a9404bdf31f9c6455857e5cfbaea9f54d95f008a,,True,True,3f33d8a484bbc013c0ce66ab4670073048dd2c4bf434a0847f9c7c94cae3d427,Tests_passed,51e1197b825373beb5903fb928988806465201c3ab3388b79fe0e9e4e70ee6ef,Tests_passed,True,True,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,0.05082535743713379,0.04283881187438965,0.05010581016540527,0.03232002258300781,0.03838062286376953,0.04252433776855469,0.04762005805969238,0.17762446403503418,0.04236960411071777,0.1594831943511963,0.15860223770141602,0.10495758056640625,0.9524059295654297,0.26206421852111816 diff --git a/results/combined/merges_timed/morfologik/morfologik-stemming.csv b/results/combined/merges_timed/morfologik/morfologik-stemming.csv index e71fa1a0f9..f5aec7be93 100644 --- a/results/combined/merges_timed/morfologik/morfologik-stemming.csv +++ b/results/combined/merges_timed/morfologik/morfologik-stemming.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/heads/master,ff3dde628c969e0d31cd9c0f3d845320e626545d,1a27128d9e6104f726032168c4b31e39d0d8556b,8c46349590627e869e00b42681c9c1ff5e79c4f1,,True,True,9e6d8183cb58a04ac6efef887389378960a7eeb4a0165ad934bb84252f09dc36,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,True,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,143702ce4aad93bf48a6e7b2d3739dd8040942387cc21d7dae3450bc22e23c4d,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,238f48e20f95e95642cd36694b705cba762fc80ade26bb791672e58b4d5c59a1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d6d966a5f4a8b7dad6e47f850b8d91554da53e4b298f8b785385f1c4a0560a36,Tests_passed,d6d966a5f4a8b7dad6e47f850b8d91554da53e4b298f8b785385f1c4a0560a36,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,0.01014399528503418,0.04837512969970703,0.01155543327331543,0.06827163696289062,0.06724739074707031,0.06992793083190918,0.029551267623901367,0.13885116577148438,0.04815101623535156,0.17554807662963867,0.20920634269714355,0.10812973976135254,1.372253656387329,0.2237842082977295 +23,refs/heads/master,ff3dde628c969e0d31cd9c0f3d845320e626545d,1a27128d9e6104f726032168c4b31e39d0d8556b,8c46349590627e869e00b42681c9c1ff5e79c4f1,,True,True,9e6d8183cb58a04ac6efef887389378960a7eeb4a0165ad934bb84252f09dc36,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,True,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,143702ce4aad93bf48a6e7b2d3739dd8040942387cc21d7dae3450bc22e23c4d,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,238f48e20f95e95642cd36694b705cba762fc80ade26bb791672e58b4d5c59a1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d6d966a5f4a8b7dad6e47f850b8d91554da53e4b298f8b785385f1c4a0560a36,Tests_passed,d6d966a5f4a8b7dad6e47f850b8d91554da53e4b298f8b785385f1c4a0560a36,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,0.01014399528503418,0.04837512969970703,0.01155543327331543,0.06827163696289062,0.06724739074707031,0.06992793083190918,0.029551267623901367,0.13885116577148438,0.04815101623535156,0.20683693885803223,0.18893861770629883,0.10812973976135254,1.372253656387329,0.2237842082977295 diff --git a/results/combined/merges_timed/moritanosuke/glacieruploader.csv b/results/combined/merges_timed/moritanosuke/glacieruploader.csv index b9e04f743a..8da05f87bb 100644 --- a/results/combined/merges_timed/moritanosuke/glacieruploader.csv +++ b/results/combined/merges_timed/moritanosuke/glacieruploader.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,cfeacbf6ce259d925301898491500214446bfa79,c1decd8574b90ca049cc3c1cdf35f71d9fbc270b,daa8e1c90e68ae8d880c1cd587e5536bf18d1dfa,,True,True,ffe1246fbc2c46d1e69a57d15ea6d56e371ad45c6054b2e8777088e59d8b01e5,Tests_passed,8cb2c6858c9c1d7e891945e10645769cfa0c3d96f14877bdea2396720ffc63df,Tests_passed,True,True,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,50726c021ef6f531a32297a28e443f3ea503f5e438438358031914093cdb69e8,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,83d3df972d92ecec5a35071448a9972abbfffcc9bdc0ce7a8f10b5a0a2b7def4,Merge_failed,83d3df972d92ecec5a35071448a9972abbfffcc9bdc0ce7a8f10b5a0a2b7def4,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Merge_failed,de1791a4a070f381145fd895685eac66e576ad421448fb26ace814e25d59ec79,0.03562283515930176,0.042084693908691406,0.036934852600097656,0.039595603942871094,0.011941671371459961,0.037325382232666016,0.035614013671875,0.23298859596252441,0.025185346603393555,0.20183467864990234,0.20258831977844238,0.17133188247680664,1.0644934177398682,0.20889043807983398 +11,refs/heads/master,cfeacbf6ce259d925301898491500214446bfa79,c1decd8574b90ca049cc3c1cdf35f71d9fbc270b,daa8e1c90e68ae8d880c1cd587e5536bf18d1dfa,,True,True,ffe1246fbc2c46d1e69a57d15ea6d56e371ad45c6054b2e8777088e59d8b01e5,Tests_passed,8cb2c6858c9c1d7e891945e10645769cfa0c3d96f14877bdea2396720ffc63df,Tests_passed,True,True,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,50726c021ef6f531a32297a28e443f3ea503f5e438438358031914093cdb69e8,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,83d3df972d92ecec5a35071448a9972abbfffcc9bdc0ce7a8f10b5a0a2b7def4,Merge_failed,83d3df972d92ecec5a35071448a9972abbfffcc9bdc0ce7a8f10b5a0a2b7def4,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Merge_failed,de1791a4a070f381145fd895685eac66e576ad421448fb26ace814e25d59ec79,0.03562283515930176,0.042084693908691406,0.036934852600097656,0.039595603942871094,0.011941671371459961,0.037325382232666016,0.035614013671875,0.23298859596252441,0.025185346603393555,0.1963973045349121,0.19743776321411133,0.17133188247680664,1.0644934177398682,0.20889043807983398 diff --git a/results/combined/merges_timed/motown-io/motown.csv b/results/combined/merges_timed/motown-io/motown.csv index 6d860359a0..c1f9613f2f 100644 --- a/results/combined/merges_timed/motown-io/motown.csv +++ b/results/combined/merges_timed/motown-io/motown.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/develop,0208735508218488254ec01471e5025b1c2f97cc,f48ce44e8435ebb642994c7795002d01d4ea87c5,789dded2d8f15fbdd4d2955d662359327b773e59,,23f1f47f71cb0373d0e0af67412dac4bace21b6f5b0d8f30b0e9a8af04324fdb,Tests_passed,464511e1c2853954081c786c2e930137c1b6bd0db74b2b1d25f445640358f892,Tests_passed,True,True,True,True,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,0.07253742218017578,0.08007264137268066,0.07462525367736816,0.08373236656188965,0.08158636093139648,0.07148861885070801,0.07883977890014648,0.22618317604064941,0.06281018257141113,0.17177081108093262,0.17276740074157715,0.1502077579498291,0.6540679931640625,0.5383837223052979 +1,refs/heads/develop,0208735508218488254ec01471e5025b1c2f97cc,f48ce44e8435ebb642994c7795002d01d4ea87c5,789dded2d8f15fbdd4d2955d662359327b773e59,,23f1f47f71cb0373d0e0af67412dac4bace21b6f5b0d8f30b0e9a8af04324fdb,Tests_passed,464511e1c2853954081c786c2e930137c1b6bd0db74b2b1d25f445640358f892,Tests_passed,True,True,True,True,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,0.07253742218017578,0.08007264137268066,0.07462525367736816,0.08373236656188965,0.08158636093139648,0.07148861885070801,0.07883977890014648,0.22618317604064941,0.06281018257141113,0.17139267921447754,0.17110872268676758,0.1502077579498291,0.6540679931640625,0.5383837223052979 diff --git a/results/combined/merges_timed/movsim/movsim.csv b/results/combined/merges_timed/movsim/movsim.csv index c550aed29e..6e23a85bca 100644 --- a/results/combined/merges_timed/movsim/movsim.csv +++ b/results/combined/merges_timed/movsim/movsim.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -194,refs/heads/develop,f65dfc825dcaa8a267f5fba4694b112528f3189c,11f108e83b85fd4f50a883fcdda9110f0d334146,54ff56818521387e816bae3400d078cdda1968e3,,364de8ef6f4805b6c793d210d2447e0c3455f830342ece8e72b6162611b8d669,Tests_passed,b1ea70fe76e2c6d08d006b4179f5f2381f2234f3c1ab09ed2d2b1ccd5108f700,Tests_passed,True,True,True,True,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,8632dca4c66c01945e3254536f51373a893e2d374962d1110089b9b175048cc7,Merge_failed,5778a9179ee6b6c5fda4e16aafe9420b3adcef5b17727eafa0e5499f8cca1662,Merge_failed,5778a9179ee6b6c5fda4e16aafe9420b3adcef5b17727eafa0e5499f8cca1662,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,6ba51ee1752f3c5ad585ad078eeb9c59799a8dc2af713ee392f65176f67eecc7,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,d3eabdb959744b52da354d07b47b0f83cef55be362ab590db93d206dabfbcd2e,Merge_failed,d3eabdb959744b52da354d07b47b0f83cef55be362ab590db93d206dabfbcd2e,Merge_failed,a8dfd69fcc948632a302ea182e859041ecbf52133a823eb2dc6693855073dae0,Merge_failed,3fb5aee21332904efc7edf84a8bb71ef19a7ad7ebc2e2e0c53e7f702a52df03c,Merge_failed,18f8f09ef7c4a519ec67d0fb20b46ce52e6ce5d1c93ef4674e593351dca53040,0.04309225082397461,0.04737401008605957,0.048781633377075195,0.0463719367980957,0.049712419509887695,0.046521663665771484,0.04688882827758789,0.21288394927978516,0.09560632705688477,0.08751845359802246,0.08819127082824707,0.12060189247131348,0.761162519454956,0.3126373291015625 +194,refs/heads/develop,f65dfc825dcaa8a267f5fba4694b112528f3189c,11f108e83b85fd4f50a883fcdda9110f0d334146,54ff56818521387e816bae3400d078cdda1968e3,,364de8ef6f4805b6c793d210d2447e0c3455f830342ece8e72b6162611b8d669,Tests_passed,b1ea70fe76e2c6d08d006b4179f5f2381f2234f3c1ab09ed2d2b1ccd5108f700,Tests_passed,True,True,True,True,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,8632dca4c66c01945e3254536f51373a893e2d374962d1110089b9b175048cc7,Merge_failed,5778a9179ee6b6c5fda4e16aafe9420b3adcef5b17727eafa0e5499f8cca1662,Merge_failed,5778a9179ee6b6c5fda4e16aafe9420b3adcef5b17727eafa0e5499f8cca1662,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,6ba51ee1752f3c5ad585ad078eeb9c59799a8dc2af713ee392f65176f67eecc7,Merge_failed,a9155c28495408d2579d4c353b9d1a6098e2e57d1dc0d46a32ccc58cfe2656ae,Merge_failed,d3eabdb959744b52da354d07b47b0f83cef55be362ab590db93d206dabfbcd2e,Merge_failed,d3eabdb959744b52da354d07b47b0f83cef55be362ab590db93d206dabfbcd2e,Merge_failed,a8dfd69fcc948632a302ea182e859041ecbf52133a823eb2dc6693855073dae0,Merge_failed,3fb5aee21332904efc7edf84a8bb71ef19a7ad7ebc2e2e0c53e7f702a52df03c,Merge_failed,18f8f09ef7c4a519ec67d0fb20b46ce52e6ce5d1c93ef4674e593351dca53040,0.04309225082397461,0.04737401008605957,0.048781633377075195,0.0463719367980957,0.049712419509887695,0.046521663665771484,0.04688882827758789,0.21288394927978516,0.09560632705688477,0.08902144432067871,0.09802818298339844,0.12060189247131348,0.761162519454956,0.3126373291015625 diff --git a/results/combined/merges_timed/mpatric/mp3agic.csv b/results/combined/merges_timed/mpatric/mp3agic.csv index 7d6d30ba4a..45be2c094c 100644 --- a/results/combined/merges_timed/mpatric/mp3agic.csv +++ b/results/combined/merges_timed/mpatric/mp3agic.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,446353b8eebf05bb653a17e1d326a2f0d2ba82a4,b8f18ab448b131ef01eb7a23e9d078ef594218ae,ff596131531ae8cebadbf1c827a1bd4f449888ce,,b3024ec13bedc96ae0b33c4ecd79a18151e09c50687fae1f0d26b43e0fc60448,Tests_passed,8b46d1842e4d7a58a7c53b1dcefb183cd7d50b9dc4e1bda69d385d78bb29522e,Tests_passed,True,True,True,True,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,0.013562679290771484,0.01330876350402832,0.0158233642578125,0.01610565185546875,0.015661239624023438,0.015368461608886719,0.016190290451049805,0.04239988327026367,0.013128280639648438,0.1814117431640625,0.18171954154968262,0.06810164451599121,1.453890085220337,0.17121410369873047 +20,refs/heads/master,446353b8eebf05bb653a17e1d326a2f0d2ba82a4,b8f18ab448b131ef01eb7a23e9d078ef594218ae,ff596131531ae8cebadbf1c827a1bd4f449888ce,,b3024ec13bedc96ae0b33c4ecd79a18151e09c50687fae1f0d26b43e0fc60448,Tests_passed,8b46d1842e4d7a58a7c53b1dcefb183cd7d50b9dc4e1bda69d385d78bb29522e,Tests_passed,True,True,True,True,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,0.013562679290771484,0.01330876350402832,0.0158233642578125,0.01610565185546875,0.015661239624023438,0.015368461608886719,0.016190290451049805,0.04239988327026367,0.013128280639648438,0.1777176856994629,0.17864370346069336,0.06810164451599121,1.453890085220337,0.17121410369873047 diff --git a/results/combined/merges_timed/mpusher/mpush.csv b/results/combined/merges_timed/mpusher/mpush.csv index 784f64e23e..794ddcfd53 100644 --- a/results/combined/merges_timed/mpusher/mpush.csv +++ b/results/combined/merges_timed/mpusher/mpush.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,684f038dad1d5b95b6f3f60674e12e4ef0b47922,07fd8670acc7a57964abb915d5ca5f7ac52fc274,f13181de9b34506304d88fe53c7d7054b4263bfa,,True,True,9325b0a62a895f85e0a4a4c3cbbd4fb641db2580c675202874d33c62ebaecaf6,Tests_passed,5e9acc50a49f00d7b8ef74aae78782a1312444730aeacf468783fc14224fd47d,Tests_passed,True,True,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a843b9470551c3e439f4f5fd43ea9ad21c881afa996bee82993cb1739e76e6a9,Merge_failed,54c57a422d7b3f3d2be55785a5f8559f25f28da8df7883f8f4dbe9affb69d0da,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a9f3ce5c36d29e486416f4ae87e9f1f0c9b89ba5b25bcfea8f00dd0fbc5817f2,Merge_failed,a9f3ce5c36d29e486416f4ae87e9f1f0c9b89ba5b25bcfea8f00dd0fbc5817f2,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,fc72ebd162fd37de12fc5452c076ede619f97f3ad91cb988a941e61816ce683c,Merge_failed,ac66d17b435a7e060766986ee0df2af0f2fd065c1259b96ce324e510c0004381,0.05559968948364258,0.07389974594116211,0.06519770622253418,0.07088470458984375,0.0642862319946289,0.06090831756591797,0.06240391731262207,0.8698749542236328,0.12299489974975586,0.9716978073120117,0.9641993045806885,0.6969237327575684,5.425331354141235,0.38678717613220215 +4,refs/heads/master,684f038dad1d5b95b6f3f60674e12e4ef0b47922,07fd8670acc7a57964abb915d5ca5f7ac52fc274,f13181de9b34506304d88fe53c7d7054b4263bfa,,True,True,9325b0a62a895f85e0a4a4c3cbbd4fb641db2580c675202874d33c62ebaecaf6,Tests_passed,5e9acc50a49f00d7b8ef74aae78782a1312444730aeacf468783fc14224fd47d,Tests_passed,True,True,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a843b9470551c3e439f4f5fd43ea9ad21c881afa996bee82993cb1739e76e6a9,Merge_failed,54c57a422d7b3f3d2be55785a5f8559f25f28da8df7883f8f4dbe9affb69d0da,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a9f3ce5c36d29e486416f4ae87e9f1f0c9b89ba5b25bcfea8f00dd0fbc5817f2,Merge_failed,a9f3ce5c36d29e486416f4ae87e9f1f0c9b89ba5b25bcfea8f00dd0fbc5817f2,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,fc72ebd162fd37de12fc5452c076ede619f97f3ad91cb988a941e61816ce683c,Merge_failed,ac66d17b435a7e060766986ee0df2af0f2fd065c1259b96ce324e510c0004381,0.05559968948364258,0.07389974594116211,0.06519770622253418,0.07088470458984375,0.0642862319946289,0.06090831756591797,0.06240391731262207,0.8698749542236328,0.12299489974975586,0.9607257843017578,0.9603695869445801,0.6969237327575684,5.425331354141235,0.38678717613220215 diff --git a/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv b/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv index fe55600a1d..af8225b8f1 100644 --- a/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv +++ b/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -95,refs/heads/master,affa3af06c5f08748b89a2b739cd0ffa4c22ffa0,5f525fbf748f920ca1f2260a4501daee22c7aa31,58fde5cbdf8d5b83f692893081f7c476b34f60bd,,True,True,9bfad9bd915b5d2c182b82535d36d6770a8ba1a81f136a1b179b811e3a6441c2,Tests_passed,c75056464942075194dac961defd6b49323ce5c1b4a132056eb8e2f3de00fb23,Tests_passed,True,True,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Merge_failed,b03b75a18b9ddeebf5d186a8395ddffac5975476890c7add64a67285d768f133,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_failed,4e77b8ec5f234ee8a6291db3175551a8147c3f81d30ac06fe732440f7b5db7fe,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,0.016453981399536133,0.01661849021911621,0.019764184951782227,0.0196077823638916,0.01908135414123535,0.019076824188232422,0.019489526748657227,0.08489012718200684,0.016806840896606445,0.38693833351135254,0.3894054889678955,0.0710153579711914,2.894188404083252,0.37201523780822754 +95,refs/heads/master,affa3af06c5f08748b89a2b739cd0ffa4c22ffa0,5f525fbf748f920ca1f2260a4501daee22c7aa31,58fde5cbdf8d5b83f692893081f7c476b34f60bd,,True,True,9bfad9bd915b5d2c182b82535d36d6770a8ba1a81f136a1b179b811e3a6441c2,Tests_passed,c75056464942075194dac961defd6b49323ce5c1b4a132056eb8e2f3de00fb23,Tests_passed,True,True,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Merge_failed,b03b75a18b9ddeebf5d186a8395ddffac5975476890c7add64a67285d768f133,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_failed,4e77b8ec5f234ee8a6291db3175551a8147c3f81d30ac06fe732440f7b5db7fe,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,0.016453981399536133,0.01661849021911621,0.019764184951782227,0.0196077823638916,0.01908135414123535,0.019076824188232422,0.019489526748657227,0.08489012718200684,0.016806840896606445,0.37627577781677246,0.3852696418762207,0.0710153579711914,2.894188404083252,0.37201523780822754 diff --git a/results/combined/merges_timed/mrice/license-check.csv b/results/combined/merges_timed/mrice/license-check.csv index a9cb94e090..cf2a6d6176 100644 --- a/results/combined/merges_timed/mrice/license-check.csv +++ b/results/combined/merges_timed/mrice/license-check.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/remotes/origin/pull/28,df4be32c0a82130293069c4cb3c69fa9f176241d,6f1e7823726ea7d7b3113f534fa01982984ccc16,373dd8516ce2531960cd609ee036b038c16d6daa,,7d8a2df5668fdd55bb7f28f3e1471ce43c384034864632c694995ddfea24dac0,Tests_passed,42aaa63971641451dfc7fa4cb319e2ae3d76bd21be83b5d7b3650d53750e9f3d,Tests_passed,True,True,True,True,Merge_failed,01e589ef3c901c2fd3a304724fde5f031dfd99672d15475ef3620490ff151dc5,Merge_failed,9a78650afa6db373b08ffc143e039d04777c37b148762b774b5277528da82fa6,Merge_failed,01e589ef3c901c2fd3a304724fde5f031dfd99672d15475ef3620490ff151dc5,Merge_failed,6a463aac639a840b5818f42f23a45a2dc0ac6421493d694981dea53f28f70dcb,Merge_failed,82c5e3599a31551bdb67361fa6987e6e78bd484df1fc9f26e9d2dc95945b5582,Merge_failed,82c5e3599a31551bdb67361fa6987e6e78bd484df1fc9f26e9d2dc95945b5582,Merge_failed,a4772a92db81eaa783a0a3b227d58f7d1bd4402cc2a84bed84b0d2e43ea1cd5e,Merge_failed,188d58bb3576b1e478d1e00a88f4f1692acd3a99a905401326a77ea4a3024766,Merge_failed,01e589ef3c901c2fd3a304724fde5f031dfd99672d15475ef3620490ff151dc5,Merge_failed,5a28c547356c73bf26e3acb9ebb1c62868bd3dfae7a817ee86cd64397dbf596e,Merge_failed,98ac734a8349758d5eec1d62fe659c1d92d25edfde808ba3215b09350f496ba3,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,74d7bfcf570b980f4dac61b819ee9913b80d467906982b0406929aae58b9c055,Merge_failed,9abbf9542a2dc59f0c384dda028bd06b2ea651e4b1e7e5c528492a59d2c134a0,0.009112834930419922,0.00920557975769043,0.009064912796020508,0.008753299713134766,0.00896453857421875,0.008858680725097656,0.009211301803588867,0.06258416175842285,0.018132448196411133,0.22623300552368164,0.21454977989196777,0.1844344139099121,1.0618185997009277,0.1551814079284668 +7,refs/remotes/origin/pull/28,df4be32c0a82130293069c4cb3c69fa9f176241d,6f1e7823726ea7d7b3113f534fa01982984ccc16,373dd8516ce2531960cd609ee036b038c16d6daa,,7d8a2df5668fdd55bb7f28f3e1471ce43c384034864632c694995ddfea24dac0,Tests_passed,42aaa63971641451dfc7fa4cb319e2ae3d76bd21be83b5d7b3650d53750e9f3d,Tests_passed,True,True,True,True,Merge_failed,01e589ef3c901c2fd3a304724fde5f031dfd99672d15475ef3620490ff151dc5,Merge_failed,9a78650afa6db373b08ffc143e039d04777c37b148762b774b5277528da82fa6,Merge_failed,01e589ef3c901c2fd3a304724fde5f031dfd99672d15475ef3620490ff151dc5,Merge_failed,6a463aac639a840b5818f42f23a45a2dc0ac6421493d694981dea53f28f70dcb,Merge_failed,82c5e3599a31551bdb67361fa6987e6e78bd484df1fc9f26e9d2dc95945b5582,Merge_failed,82c5e3599a31551bdb67361fa6987e6e78bd484df1fc9f26e9d2dc95945b5582,Merge_failed,a4772a92db81eaa783a0a3b227d58f7d1bd4402cc2a84bed84b0d2e43ea1cd5e,Merge_failed,188d58bb3576b1e478d1e00a88f4f1692acd3a99a905401326a77ea4a3024766,Merge_failed,01e589ef3c901c2fd3a304724fde5f031dfd99672d15475ef3620490ff151dc5,Merge_failed,5a28c547356c73bf26e3acb9ebb1c62868bd3dfae7a817ee86cd64397dbf596e,Merge_failed,98ac734a8349758d5eec1d62fe659c1d92d25edfde808ba3215b09350f496ba3,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,74d7bfcf570b980f4dac61b819ee9913b80d467906982b0406929aae58b9c055,Merge_failed,9abbf9542a2dc59f0c384dda028bd06b2ea651e4b1e7e5c528492a59d2c134a0,0.009112834930419922,0.00920557975769043,0.009064912796020508,0.008753299713134766,0.00896453857421875,0.008858680725097656,0.009211301803588867,0.06258416175842285,0.018132448196411133,0.23612308502197266,0.23146939277648926,0.1844344139099121,1.0618185997009277,0.1551814079284668 diff --git a/results/combined/merges_timed/mrpdaemon/encfs-java.csv b/results/combined/merges_timed/mrpdaemon/encfs-java.csv index 39180ecc72..355d900ae1 100644 --- a/results/combined/merges_timed/mrpdaemon/encfs-java.csv +++ b/results/combined/merges_timed/mrpdaemon/encfs-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,bdee7ef4faeae5943a8d25ed9eb48be4d97f7cae,31a551c0db99c6797ccbc368f8a81ae7b63d61c9,bf71a245940d69cf408659e03d9ec701ac0d686e,,True,True,d74264bc6dc3c1f7c4552000544703d378a029b2bbf5bc4946126886445d47a3,Tests_passed,f020afa7d60ba22abce5393485170f63c7145c8a7df5165648498db762cf012c,Tests_passed,True,True,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,34b247e720274b064a8dd09277bbc378e50bb01cceb3d470302423c837e73d87,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,5caff5af34d105b8e4e9d0dbdef6409e8cbd96eb3ab7744dbe7508aecb4b6fe6,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,612e6bed8c44147eacee0a89ec1517bda81bce9cbe74c22c2069adaf4ed3bee8,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,3e7e9d9a5a3b251623ac4d74e5aeebb6a443af57b7e37cc4257d54cee3eefe6e,Merge_failed,3e7e9d9a5a3b251623ac4d74e5aeebb6a443af57b7e37cc4257d54cee3eefe6e,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,ce51a5946f02c5f94bd533c1999f568c7715e878feb349fb46a0ff8124d68d29,0.05002546310424805,0.043054819107055664,0.053536415100097656,0.044072866439819336,0.050383567810058594,0.053037166595458984,0.04908275604248047,0.3576362133026123,0.09612321853637695,0.444622278213501,0.4427030086517334,0.28838372230529785,2.8846359252929688,0.3535652160644531 +6,refs/heads/master,bdee7ef4faeae5943a8d25ed9eb48be4d97f7cae,31a551c0db99c6797ccbc368f8a81ae7b63d61c9,bf71a245940d69cf408659e03d9ec701ac0d686e,,True,True,d74264bc6dc3c1f7c4552000544703d378a029b2bbf5bc4946126886445d47a3,Tests_passed,f020afa7d60ba22abce5393485170f63c7145c8a7df5165648498db762cf012c,Tests_passed,True,True,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,34b247e720274b064a8dd09277bbc378e50bb01cceb3d470302423c837e73d87,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,5caff5af34d105b8e4e9d0dbdef6409e8cbd96eb3ab7744dbe7508aecb4b6fe6,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,612e6bed8c44147eacee0a89ec1517bda81bce9cbe74c22c2069adaf4ed3bee8,Merge_failed,83612b3a93ffcae207c1d45997d7595ebe23087867c5d2bbf45dd056e41ba58a,Merge_failed,3e7e9d9a5a3b251623ac4d74e5aeebb6a443af57b7e37cc4257d54cee3eefe6e,Merge_failed,3e7e9d9a5a3b251623ac4d74e5aeebb6a443af57b7e37cc4257d54cee3eefe6e,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,ce51a5946f02c5f94bd533c1999f568c7715e878feb349fb46a0ff8124d68d29,0.05002546310424805,0.043054819107055664,0.053536415100097656,0.044072866439819336,0.050383567810058594,0.053037166595458984,0.04908275604248047,0.3576362133026123,0.09612321853637695,0.44168925285339355,0.4431493282318115,0.28838372230529785,2.8846359252929688,0.3535652160644531 diff --git a/results/combined/merges_timed/msopentech/azure-activedirectory-library-for-java.csv b/results/combined/merges_timed/msopentech/azure-activedirectory-library-for-java.csv index e1e15e7cfb..38602aa2c6 100644 --- a/results/combined/merges_timed/msopentech/azure-activedirectory-library-for-java.csv +++ b/results/combined/merges_timed/msopentech/azure-activedirectory-library-for-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -106,refs/remotes/origin/pull/185,53e9d401e409ac8f9b99d475acb008450857b31f,d01281f86b40190d142afd8f62d839eabfd12111,3141f3a9bb4d8ff5402fcf055ed6f0cbe5fc9c66,,True,True,77e7f5afd859171ad6b9c66c640c6167652fe127ea9ce3a63c5c3474142fc1bc,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,True,True,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,f5e95bda8d9ede9a02117b8aea97356ed98f344330a30a3e82e601d028ee90b1,Merge_failed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,0.0698404312133789,0.06516599655151367,0.06358194351196289,0.06502842903137207,0.02820563316345215,0.0569002628326416,0.06377005577087402,0.38855695724487305,0.06372523307800293,0.5825278759002686,0.5853867530822754,0.29111695289611816,2.0749354362487793,0.2705554962158203 +106,refs/remotes/origin/pull/185,53e9d401e409ac8f9b99d475acb008450857b31f,d01281f86b40190d142afd8f62d839eabfd12111,3141f3a9bb4d8ff5402fcf055ed6f0cbe5fc9c66,,True,True,77e7f5afd859171ad6b9c66c640c6167652fe127ea9ce3a63c5c3474142fc1bc,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,True,True,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,f5e95bda8d9ede9a02117b8aea97356ed98f344330a30a3e82e601d028ee90b1,Merge_failed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,0.0698404312133789,0.06516599655151367,0.06358194351196289,0.06502842903137207,0.02820563316345215,0.0569002628326416,0.06377005577087402,0.38855695724487305,0.06372523307800293,0.5784406661987305,0.5749680995941162,0.29111695289611816,2.0749354362487793,0.2705554962158203 diff --git a/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv b/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv index 1571a82ca3..c387307003 100644 --- a/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv +++ b/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,44aa839e687eccffddf79772f186de581646b9f5,ba3fb170040f29dc002f5b7e4f393b106358c404,dd40c2076fbf3a7fd6f3d732ba864b09b58b1b46,,True,True,68ebeae518531d431c7f3ce6d9a22bce14196b040e0785c32ed7d0a1cac9f134,Tests_passed,7a098a87b1757f98ae3d2774e65a801f5f365b303836841954ce1cd66166748d,Tests_passed,True,True,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,0.04567670822143555,0.044271230697631836,0.04662370681762695,0.045546770095825195,0.04420590400695801,0.051384687423706055,0.051363229751586914,0.1692967414855957,0.04701662063598633,0.15227198600769043,0.15103602409362793,0.12308073043823242,0.6090657711029053,0.2099926471710205 +2,refs/heads/master,44aa839e687eccffddf79772f186de581646b9f5,ba3fb170040f29dc002f5b7e4f393b106358c404,dd40c2076fbf3a7fd6f3d732ba864b09b58b1b46,,True,True,68ebeae518531d431c7f3ce6d9a22bce14196b040e0785c32ed7d0a1cac9f134,Tests_passed,7a098a87b1757f98ae3d2774e65a801f5f365b303836841954ce1cd66166748d,Tests_passed,True,True,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,0.04567670822143555,0.044271230697631836,0.04662370681762695,0.045546770095825195,0.04420590400695801,0.051384687423706055,0.051363229751586914,0.1692967414855957,0.04701662063598633,0.15409493446350098,0.14551472663879395,0.12308073043823242,0.6090657711029053,0.2099926471710205 diff --git a/results/combined/merges_timed/mtedone/podam.csv b/results/combined/merges_timed/mtedone/podam.csv index b81006ee74..5c273aa80a 100644 --- a/results/combined/merges_timed/mtedone/podam.csv +++ b/results/combined/merges_timed/mtedone/podam.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -84,refs/heads/develop,58364a4c12addbed1a1ccc5415e07aadbe49012a,006dbd635f0eb2dbb1318e9d895fdaaf282f548d,d51460bf0a0b1bdee87973c01cf2241f508c7cfc,,5395de2cea89ae1148b3a16f7db53f14e9e76551374b03809c3c2775e5127f80,Tests_passed,2798891134cb3857ed16c7ba9a2483ad766ad96da62711861250013b2a87ec5f,Tests_passed,True,True,True,True,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,ac853227677ac8fec5567f87a69f08e679800e521eb5feaf98ab62d805908554,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,0dd36ffc09affdb5664ae717ab40e769cbad00ba4c3405a2df123425bc7cfd6d,Merge_failed,0dd36ffc09affdb5664ae717ab40e769cbad00ba4c3405a2df123425bc7cfd6d,Merge_failed,1fb74bf3210f779bb89c1cac4e9531716fa4aee2fe49acdc14db1f1aba62b6a1,Tests_passed,31d359acdf76260ed47659eb6597a25ce591e9c26c27eade678ee66c292bcd3f,Merge_failed,ef6ada9551489c5a996211a3b40aa0a1046ffc57ab2199e742c0c8c8c6360ea6,0.04536604881286621,0.03962397575378418,0.04255843162536621,0.040636301040649414,0.04938769340515137,0.026918888092041016,0.024749755859375,0.18945956230163574,0.07376956939697266,0.07912349700927734,0.08018112182617188,0.11489152908325195,0.4544212818145752,0.26756906509399414 +84,refs/heads/develop,58364a4c12addbed1a1ccc5415e07aadbe49012a,006dbd635f0eb2dbb1318e9d895fdaaf282f548d,d51460bf0a0b1bdee87973c01cf2241f508c7cfc,,5395de2cea89ae1148b3a16f7db53f14e9e76551374b03809c3c2775e5127f80,Tests_passed,2798891134cb3857ed16c7ba9a2483ad766ad96da62711861250013b2a87ec5f,Tests_passed,True,True,True,True,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,ac853227677ac8fec5567f87a69f08e679800e521eb5feaf98ab62d805908554,Merge_failed,63cfe897f30aa52d53b796f6fe84efe234c28e2338e79c4cc67175a687daf267,Merge_failed,0dd36ffc09affdb5664ae717ab40e769cbad00ba4c3405a2df123425bc7cfd6d,Merge_failed,0dd36ffc09affdb5664ae717ab40e769cbad00ba4c3405a2df123425bc7cfd6d,Merge_failed,1fb74bf3210f779bb89c1cac4e9531716fa4aee2fe49acdc14db1f1aba62b6a1,Tests_passed,31d359acdf76260ed47659eb6597a25ce591e9c26c27eade678ee66c292bcd3f,Merge_failed,ef6ada9551489c5a996211a3b40aa0a1046ffc57ab2199e742c0c8c8c6360ea6,0.04536604881286621,0.03962397575378418,0.04255843162536621,0.040636301040649414,0.04938769340515137,0.026918888092041016,0.024749755859375,0.18945956230163574,0.07376956939697266,0.0793771743774414,0.07956480979919434,0.11489152908325195,0.4544212818145752,0.26756906509399414 diff --git a/results/combined/merges_timed/mttkay/signpost.csv b/results/combined/merges_timed/mttkay/signpost.csv index 729fe8df20..c3124c3152 100644 --- a/results/combined/merges_timed/mttkay/signpost.csv +++ b/results/combined/merges_timed/mttkay/signpost.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,3db54f4931b3d3afcf7b7400426614c40e58ec4c,0e81fbde2863d3aeab9a2cfb3bad75f48a1686f5,f6f8b4904baf3f335abd3428216c364999ea82cf,,True,True,f9f3a4d35b2d77cbf9b186932e0f8bf47f07b8c8fa31e457efbe77ae2a28bcd8,Tests_passed,27746c62cf63d432a3c57d0cade969e5d1c64f6b6bfb99838f215020afe28bdc,Tests_passed,True,True,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c83358a5470cce98cabbfb8217fcbb0e24613e9b42fe2813054fa971eb2517be,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c176630f4289e6d1d18cd519b933b7e2da3380a264b724f40da5e4c551f0dbfc,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,0.04544353485107422,0.043966054916381836,0.046237945556640625,0.04079437255859375,0.03739428520202637,0.04694652557373047,0.04892253875732422,0.38678789138793945,0.10751795768737793,0.1597301959991455,0.15912199020385742,0.34802770614624023,0.7837331295013428,0.21558213233947754 +14,refs/heads/master,3db54f4931b3d3afcf7b7400426614c40e58ec4c,0e81fbde2863d3aeab9a2cfb3bad75f48a1686f5,f6f8b4904baf3f335abd3428216c364999ea82cf,,True,True,f9f3a4d35b2d77cbf9b186932e0f8bf47f07b8c8fa31e457efbe77ae2a28bcd8,Tests_passed,27746c62cf63d432a3c57d0cade969e5d1c64f6b6bfb99838f215020afe28bdc,Tests_passed,True,True,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c83358a5470cce98cabbfb8217fcbb0e24613e9b42fe2813054fa971eb2517be,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c176630f4289e6d1d18cd519b933b7e2da3380a264b724f40da5e4c551f0dbfc,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,0.04544353485107422,0.043966054916381836,0.046237945556640625,0.04079437255859375,0.03739428520202637,0.04694652557373047,0.04892253875732422,0.38678789138793945,0.10751795768737793,0.15662074089050293,0.15664196014404297,0.34802770614624023,0.7837331295013428,0.21558213233947754 diff --git a/results/combined/merges_timed/mwanji/toml4j.csv b/results/combined/merges_timed/mwanji/toml4j.csv index e2c9890f1e..cbb0c769ad 100644 --- a/results/combined/merges_timed/mwanji/toml4j.csv +++ b/results/combined/merges_timed/mwanji/toml4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,f8f55a6f16602fb21f3d44c45744e719ec808e2f,e7d7de7ae5d5a0b7e6d59e095d4ee9bae829ad68,8571d258cafb004ddb73ea22ae9d620b7310f20b,,True,True,53009c36ff12b528f2d397f15d0c3e574d09557685bc4131ae3f74b16b0c2d9a,Tests_passed,993b37a673e4fa19f2752d54fcc7c2ea74cdbca098b2c80b5eb7d4e1a26f7424,Tests_passed,True,True,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,59367c636b603406cd43339d68b11865bd82cd8211bf911ee84738ebb92acdf9,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,59367c636b603406cd43339d68b11865bd82cd8211bf911ee84738ebb92acdf9,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,ce5b9e40cdfdbd54ae20d7f078c3eeaee7a65994985f51cecebe0a2bb3702b34,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,609af63fded7f993310596cf743704b71f7ebcea43a969691b08ac079d8e4ef2,Merge_failed,609af63fded7f993310596cf743704b71f7ebcea43a969691b08ac079d8e4ef2,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,2b56c54259855b4ccbb5dddb5eeb92d1e688447dd7d1bf75e7309fac444ea4e5,Merge_failed,6bcba85ea79a8eb5fc9d5c67a294f1f219ea4b96994cf305daaaebeb8ec57a92,0.04077887535095215,0.04664325714111328,0.04082942008972168,0.04146933555603027,0.034862518310546875,0.045696258544921875,0.0393366813659668,0.22713828086853027,0.0801076889038086,0.16873526573181152,0.1629035472869873,0.168900728225708,0.8746564388275146,0.2134709358215332 +10,refs/heads/master,f8f55a6f16602fb21f3d44c45744e719ec808e2f,e7d7de7ae5d5a0b7e6d59e095d4ee9bae829ad68,8571d258cafb004ddb73ea22ae9d620b7310f20b,,True,True,53009c36ff12b528f2d397f15d0c3e574d09557685bc4131ae3f74b16b0c2d9a,Tests_passed,993b37a673e4fa19f2752d54fcc7c2ea74cdbca098b2c80b5eb7d4e1a26f7424,Tests_passed,True,True,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,59367c636b603406cd43339d68b11865bd82cd8211bf911ee84738ebb92acdf9,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,59367c636b603406cd43339d68b11865bd82cd8211bf911ee84738ebb92acdf9,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,ce5b9e40cdfdbd54ae20d7f078c3eeaee7a65994985f51cecebe0a2bb3702b34,Merge_failed,6e6ac0ed7bb27f64c6efc59394133d0f704fb0e19f488fa825a8539f006d9afb,Merge_failed,609af63fded7f993310596cf743704b71f7ebcea43a969691b08ac079d8e4ef2,Merge_failed,609af63fded7f993310596cf743704b71f7ebcea43a969691b08ac079d8e4ef2,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,2b56c54259855b4ccbb5dddb5eeb92d1e688447dd7d1bf75e7309fac444ea4e5,Merge_failed,6bcba85ea79a8eb5fc9d5c67a294f1f219ea4b96994cf305daaaebeb8ec57a92,0.04077887535095215,0.04664325714111328,0.04082942008972168,0.04146933555603027,0.034862518310546875,0.045696258544921875,0.0393366813659668,0.22713828086853027,0.0801076889038086,0.16138935089111328,0.16214656829833984,0.168900728225708,0.8746564388275146,0.2134709358215332 diff --git a/results/combined/merges_timed/mybatis/jpetstore-6.csv b/results/combined/merges_timed/mybatis/jpetstore-6.csv index 3f405aec1e..ddc164c934 100644 --- a/results/combined/merges_timed/mybatis/jpetstore-6.csv +++ b/results/combined/merges_timed/mybatis/jpetstore-6.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -548,refs/remotes/origin/pull/637,b26b0c87017c0f2ec431ee0a1425910b9a9fff00,3c5d4b04254c9c898b2831b458a02b6f8c277def,f3362fe251b6fb468e0159bad8c36f1fd5798a3b,,True,True,e2df62e1bcac35ae7304c1745b17150b6ac2d9c1be03ff5bf22873ec52943079,Tests_passed,136cac0b81ce395b9a3937d4ee18a60e4a8928044a6c8cb32d4b44508fd3b882,Tests_passed,True,True,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,09e940465b2e40279da13647c02056a37d2aa82c65200b4fc4805e9f69250102,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,51574fcbc023ea59538e40f280b32e3b874559948e435491f97ee3868cb0dc26,Merge_failed,51574fcbc023ea59538e40f280b32e3b874559948e435491f97ee3868cb0dc26,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,0.0409848690032959,0.023320913314819336,0.04799818992614746,0.02449178695678711,0.0418245792388916,0.038591861724853516,0.0467681884765625,0.22784948348999023,0.07468032836914062,0.07811260223388672,0.07771587371826172,0.1524183750152588,0.04544329643249512,0.21012449264526367 +548,refs/remotes/origin/pull/637,b26b0c87017c0f2ec431ee0a1425910b9a9fff00,3c5d4b04254c9c898b2831b458a02b6f8c277def,f3362fe251b6fb468e0159bad8c36f1fd5798a3b,,True,True,e2df62e1bcac35ae7304c1745b17150b6ac2d9c1be03ff5bf22873ec52943079,Tests_passed,136cac0b81ce395b9a3937d4ee18a60e4a8928044a6c8cb32d4b44508fd3b882,Tests_passed,True,True,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,09e940465b2e40279da13647c02056a37d2aa82c65200b4fc4805e9f69250102,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,51574fcbc023ea59538e40f280b32e3b874559948e435491f97ee3868cb0dc26,Merge_failed,51574fcbc023ea59538e40f280b32e3b874559948e435491f97ee3868cb0dc26,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,0.0409848690032959,0.023320913314819336,0.04799818992614746,0.02449178695678711,0.0418245792388916,0.038591861724853516,0.0467681884765625,0.22784948348999023,0.07468032836914062,0.07719063758850098,0.0765683650970459,0.1524183750152588,0.04544329643249512,0.21012449264526367 diff --git a/results/combined/merges_timed/mybatis/mybatis-3.csv b/results/combined/merges_timed/mybatis/mybatis-3.csv index 2a5d0bac06..2d5fa619be 100644 --- a/results/combined/merges_timed/mybatis/mybatis-3.csv +++ b/results/combined/merges_timed/mybatis/mybatis-3.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -172,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,Tests_passed,True,True,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,0.13586640357971191,0.13757586479187012,0.2539541721343994,0.25399351119995117,0.2552957534790039,0.2543463706970215,0.2550218105316162,0.29887986183166504,0.13489007949829102,0.27087950706481934,0.2721266746520996,0.19056057929992676,0.14876532554626465,4.229933261871338 +172,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,Tests_passed,True,True,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,0.13586640357971191,0.13757586479187012,0.2539541721343994,0.25399351119995117,0.2552957534790039,0.2543463706970215,0.2550218105316162,0.29887986183166504,0.13489007949829102,0.26972365379333496,0.26905250549316406,0.19056057929992676,0.14876532554626465,4.229933261871338 diff --git a/results/combined/merges_timed/mybatis/spring.csv b/results/combined/merges_timed/mybatis/spring.csv index f7836e6ec6..a7bb9c74ed 100644 --- a/results/combined/merges_timed/mybatis/spring.csv +++ b/results/combined/merges_timed/mybatis/spring.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,Tests_passed,True,True,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,0.03406405448913574,0.043744802474975586,0.05973958969116211,0.05338478088378906,0.05395650863647461,0.06111645698547363,0.0741415023803711,0.2666006088256836,0.03545022010803223,0.33321070671081543,0.3355898857116699,0.15196585655212402,0.05642056465148926,0.35519886016845703 +155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,Tests_passed,True,True,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,0.03406405448913574,0.043744802474975586,0.05973958969116211,0.05338478088378906,0.05395650863647461,0.06111645698547363,0.0741415023803711,0.2666006088256836,0.03545022010803223,0.3325490951538086,0.3321387767791748,0.15196585655212402,0.05642056465148926,0.35519886016845703 diff --git a/results/combined/merges_timed/mycila/license-maven-plugin.csv b/results/combined/merges_timed/mycila/license-maven-plugin.csv index ce9d21b5d2..d77679b7ee 100644 --- a/results/combined/merges_timed/mycila/license-maven-plugin.csv +++ b/results/combined/merges_timed/mycila/license-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -173,refs/remotes/origin/pull/197,756e4d52b940fb8911942ebc2e5654e7cefe1597,39991e5512483613ab0c8d5cf2c21bde1f52ad5d,a6e528cee7fe56b9f310c77bc00eee0850ad0c36,,True,True,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,53d0802c8bed7db42a799bd948cf65a2654a2618a48bd3bc8a028c3d1473618c,Tests_passed,True,True,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,0.06648063659667969,0.028137683868408203,0.02762293815612793,0.02886962890625,0.03677940368652344,0.027880191802978516,0.025053739547729492,0.10411477088928223,0.017650127410888672,0.17398977279663086,0.18065953254699707,0.07923579216003418,0.033995866775512695,0.2919778823852539 +173,refs/remotes/origin/pull/197,756e4d52b940fb8911942ebc2e5654e7cefe1597,39991e5512483613ab0c8d5cf2c21bde1f52ad5d,a6e528cee7fe56b9f310c77bc00eee0850ad0c36,,True,True,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,53d0802c8bed7db42a799bd948cf65a2654a2618a48bd3bc8a028c3d1473618c,Tests_passed,True,True,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,0.06648063659667969,0.028137683868408203,0.02762293815612793,0.02886962890625,0.03677940368652344,0.027880191802978516,0.025053739547729492,0.10411477088928223,0.017650127410888672,0.17842721939086914,0.17958378791809082,0.07923579216003418,0.033995866775512695,0.2919778823852539 diff --git a/results/combined/merges_timed/mygrid/rightfield.csv b/results/combined/merges_timed/mygrid/rightfield.csv index 91f304aaca..fb60b4a31d 100644 --- a/results/combined/merges_timed/mygrid/rightfield.csv +++ b/results/combined/merges_timed/mygrid/rightfield.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -44,refs/heads/main,d34df55c7357f0aa5556d42703f3cbcc6c3d0389,6b372f7d40a40ff21d06aadc40e92cbaef78b958,e75a3a2b73de9706282f7e991088d0f82f831b85,,True,True,99760028def508e4b875110f567997b11d507752e40f53e56ffed27a73a978c6,Tests_passed,6380bf6a0caca244fa2ec924181696460a9e9260d18a4f9ac5008255e3918fdf,Tests_passed,True,True,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,0.03649735450744629,0.0400083065032959,0.017648935317993164,0.013461828231811523,0.04796934127807617,0.042380332946777344,0.029506206512451172,0.15703296661376953,0.011890172958374023,0.19472503662109375,0.20044565200805664,0.09833168983459473,0.7682085037231445,0.30078673362731934 +44,refs/heads/main,d34df55c7357f0aa5556d42703f3cbcc6c3d0389,6b372f7d40a40ff21d06aadc40e92cbaef78b958,e75a3a2b73de9706282f7e991088d0f82f831b85,,True,True,99760028def508e4b875110f567997b11d507752e40f53e56ffed27a73a978c6,Tests_passed,6380bf6a0caca244fa2ec924181696460a9e9260d18a4f9ac5008255e3918fdf,Tests_passed,True,True,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,0.03649735450744629,0.0400083065032959,0.017648935317993164,0.013461828231811523,0.04796934127807617,0.042380332946777344,0.029506206512451172,0.15703296661376953,0.011890172958374023,0.1916491985321045,0.15875530242919922,0.09833168983459473,0.7682085037231445,0.30078673362731934 diff --git a/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv b/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv index 7309db5669..284e3a247d 100644 --- a/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv +++ b/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/remotes/origin/5.1.1-dev,9ad6ef3cc4463ad5e7c71ae057264ad3ba7b2f86,4d58e53b86ac42a8ed6d8a66f14a09f356ce119f,a591b944acfe10d8889b1554d1cb335853268272,,True,True,8d90decbf47edf1cf55e9af45b19204deecf1c7e9cc5b7cc04b85000c603c1b1,Tests_passed,10b35739e282c49fbacc1766c18807c0bc5b69268e86a1578c5a16d89a6f2636,Tests_passed,True,True,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,9ffa7b6c4a4f032635e9d9d9e2e7e6eb6a841d8aef1015aae095ba9f0f2e1e8c,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,49c1c476b360f6d4ef83ea4bf095a09a7adf872d197fd950f540920625e275ba,Merge_failed,32805cc3a742eeae2a2b0ef8b4bd502f1cc4b51741305a298b21514f82241a2b,Merge_failed,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,11b2253cd118bf5a8693bb0d6f706771dfeaeb67146fed260fcadc93ae748ae4,Merge_failed,656490d1eff78b7d1909b4071b506c2153562fd7c7cd7c22491d2ae8b8bacf74,0.016804933547973633,0.01663351058959961,0.017778396606445312,0.017528295516967773,0.018414020538330078,0.017870664596557617,0.017925739288330078,0.10605192184448242,0.030245542526245117,0.4005439281463623,0.4003729820251465,0.35230207443237305,3.6707022190093994,0.19568324089050293 +32,refs/remotes/origin/5.1.1-dev,9ad6ef3cc4463ad5e7c71ae057264ad3ba7b2f86,4d58e53b86ac42a8ed6d8a66f14a09f356ce119f,a591b944acfe10d8889b1554d1cb335853268272,,True,True,8d90decbf47edf1cf55e9af45b19204deecf1c7e9cc5b7cc04b85000c603c1b1,Tests_passed,10b35739e282c49fbacc1766c18807c0bc5b69268e86a1578c5a16d89a6f2636,Tests_passed,True,True,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,9ffa7b6c4a4f032635e9d9d9e2e7e6eb6a841d8aef1015aae095ba9f0f2e1e8c,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,49c1c476b360f6d4ef83ea4bf095a09a7adf872d197fd950f540920625e275ba,Merge_failed,32805cc3a742eeae2a2b0ef8b4bd502f1cc4b51741305a298b21514f82241a2b,Merge_failed,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,11b2253cd118bf5a8693bb0d6f706771dfeaeb67146fed260fcadc93ae748ae4,Merge_failed,656490d1eff78b7d1909b4071b506c2153562fd7c7cd7c22491d2ae8b8bacf74,0.016804933547973633,0.01663351058959961,0.017778396606445312,0.017528295516967773,0.018414020538330078,0.017870664596557617,0.017925739288330078,0.10605192184448242,0.030245542526245117,0.4009244441986084,0.402040958404541,0.35230207443237305,3.6707022190093994,0.19568324089050293 diff --git a/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv b/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv index c3dce37827..af3d92800a 100644 --- a/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv +++ b/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,1842e580665903b7192e06575679fb39870601b5,ff683a4d4ac09672f45d47252cf5d366f17c3a61,6c30f8927d85bfedc3bdca89dcf753a0074f0f4a,,True,True,e8c6e9255ca001e7c13d41b00bd947d30fd4ea8618dd6684611662d37e2113dd,Tests_passed,2296fda8c17bed3d5a9cc407311a097fea5f7d6b215d6610f31eb9b52940cc38,Tests_passed,True,True,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,0.036630868911743164,0.04319190979003906,0.045736074447631836,0.03963780403137207,0.04138493537902832,0.03898024559020996,0.03660988807678223,0.14175701141357422,0.03678560256958008,0.14972686767578125,0.1506638526916504,0.10963249206542969,0.5799272060394287,0.2076127529144287 +1,refs/heads/master,1842e580665903b7192e06575679fb39870601b5,ff683a4d4ac09672f45d47252cf5d366f17c3a61,6c30f8927d85bfedc3bdca89dcf753a0074f0f4a,,True,True,e8c6e9255ca001e7c13d41b00bd947d30fd4ea8618dd6684611662d37e2113dd,Tests_passed,2296fda8c17bed3d5a9cc407311a097fea5f7d6b215d6610f31eb9b52940cc38,Tests_passed,True,True,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,0.036630868911743164,0.04319190979003906,0.045736074447631836,0.03963780403137207,0.04138493537902832,0.03898024559020996,0.03660988807678223,0.14175701141357422,0.03678560256958008,0.14799046516418457,0.1486513614654541,0.10963249206542969,0.5799272060394287,0.2076127529144287 diff --git a/results/combined/merges_timed/nabedge/mixer2.csv b/results/combined/merges_timed/nabedge/mixer2.csv index 533888986e..c39d0f3ccc 100644 --- a/results/combined/merges_timed/nabedge/mixer2.csv +++ b/results/combined/merges_timed/nabedge/mixer2.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,e8a1930e8dc2367176464e888888ac1645bb9eee,b7f31d46bb5fe9ceb54490c49483081ca0bd854d,82a9bb4a4bd8b2a4c705a47a1b8325e2a492f950,,True,True,ce14e4e4da5260130f5d137d049257acf929e6c886b0243264e5e0e5f2835805,Tests_passed,92886eaeaa78cbd79977557e7e6832e4c6ade83201fd4f6596f54f15cb64efaa,Tests_passed,True,True,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,d1d08f996753b5e41ddb05b76e5c48a435ce10a711e2f939e9e64c2844453cc5,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,d1d08f996753b5e41ddb05b76e5c48a435ce10a711e2f939e9e64c2844453cc5,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,8def30c0134f7a75739dee29e028ec40cd194df05b38a8c235c1cd792cfff2f1,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Tests_failed,9f4b72fa9d1fdafee63b8103cde0fe41e544db408c381a16b6fa33a43d81d9e1,Tests_failed,9f4b72fa9d1fdafee63b8103cde0fe41e544db408c381a16b6fa33a43d81d9e1,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Merge_failed,1ad3e436791baafb47ecb0e277ffa6ea106bae0ae9fdca02a8ad4ff073b64427,0.0118408203125,0.012058019638061523,0.012236595153808594,0.011841297149658203,0.011817216873168945,0.012737751007080078,0.012202739715576172,0.04940462112426758,0.020290136337280273,0.20996904373168945,0.17605113983154297,0.07339310646057129,0.8504440784454346,0.2483501434326172 +6,refs/heads/master,e8a1930e8dc2367176464e888888ac1645bb9eee,b7f31d46bb5fe9ceb54490c49483081ca0bd854d,82a9bb4a4bd8b2a4c705a47a1b8325e2a492f950,,True,True,ce14e4e4da5260130f5d137d049257acf929e6c886b0243264e5e0e5f2835805,Tests_passed,92886eaeaa78cbd79977557e7e6832e4c6ade83201fd4f6596f54f15cb64efaa,Tests_passed,True,True,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,d1d08f996753b5e41ddb05b76e5c48a435ce10a711e2f939e9e64c2844453cc5,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,d1d08f996753b5e41ddb05b76e5c48a435ce10a711e2f939e9e64c2844453cc5,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Merge_failed,8def30c0134f7a75739dee29e028ec40cd194df05b38a8c235c1cd792cfff2f1,Merge_failed,e3a1b3b195c65722703c4b36e69585ab81fcf9ff0957e032773033645b826e68,Tests_failed,9f4b72fa9d1fdafee63b8103cde0fe41e544db408c381a16b6fa33a43d81d9e1,Tests_failed,9f4b72fa9d1fdafee63b8103cde0fe41e544db408c381a16b6fa33a43d81d9e1,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Merge_failed,1ad3e436791baafb47ecb0e277ffa6ea106bae0ae9fdca02a8ad4ff073b64427,0.0118408203125,0.012058019638061523,0.012236595153808594,0.011841297149658203,0.011817216873168945,0.012737751007080078,0.012202739715576172,0.04940462112426758,0.020290136337280273,0.1792125701904297,0.1776447296142578,0.07339310646057129,0.8504440784454346,0.2483501434326172 diff --git a/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv b/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv index 3aba45fbdc..6df76c9b7e 100644 --- a/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv +++ b/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,539b0183d88f09003733316cbe25ccb3c952d024,e30d4dba438a58d625b740c0cf388bb8efacf02f,6434435f5c4da9f3c8b9b4112f34237bdcef10e3,,True,True,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Tests_passed,82589bba1cc439b911c77fa5792386700d6de74a4a0a1a3ddca9d41611dfc89a,Tests_passed,True,True,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,48c53865e18a310e5c2d45c8c6e1cce871e5f5241598fbec2a5f0087e93bac11,Merge_failed,48c53865e18a310e5c2d45c8c6e1cce871e5f5241598fbec2a5f0087e93bac11,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,89b9d92d10d9d8a53d83d25cbf2a8c1f9c43a8d3936e7bb4ed10e52c0d23f9fb,0.016828298568725586,0.01681065559387207,0.018436908721923828,0.01785564422607422,0.016943693161010742,0.01726555824279785,0.01728081703186035,0.07274246215820312,0.02819347381591797,0.8396601676940918,0.8353137969970703,0.18922805786132812,1.7167747020721436,0.1953742504119873 +6,refs/heads/master,539b0183d88f09003733316cbe25ccb3c952d024,e30d4dba438a58d625b740c0cf388bb8efacf02f,6434435f5c4da9f3c8b9b4112f34237bdcef10e3,,True,True,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Tests_passed,82589bba1cc439b911c77fa5792386700d6de74a4a0a1a3ddca9d41611dfc89a,Tests_passed,True,True,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,71d59578ce91e35275626906c53dc232647e72ccb21c81160d6609017f8cfbef,Merge_failed,48c53865e18a310e5c2d45c8c6e1cce871e5f5241598fbec2a5f0087e93bac11,Merge_failed,48c53865e18a310e5c2d45c8c6e1cce871e5f5241598fbec2a5f0087e93bac11,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,89b9d92d10d9d8a53d83d25cbf2a8c1f9c43a8d3936e7bb4ed10e52c0d23f9fb,0.016828298568725586,0.01681065559387207,0.018436908721923828,0.01785564422607422,0.016943693161010742,0.01726555824279785,0.01728081703186035,0.07274246215820312,0.02819347381591797,0.7611486911773682,0.786541223526001,0.18922805786132812,1.7167747020721436,0.1953742504119873 diff --git a/results/combined/merges_timed/named-data/jndn.csv b/results/combined/merges_timed/named-data/jndn.csv index c8435c3639..cf9a1bfb2d 100644 --- a/results/combined/merges_timed/named-data/jndn.csv +++ b/results/combined/merges_timed/named-data/jndn.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -132,refs/remotes/origin/issue/2075-OnExpressFailure,4464a94e645097a18084eb4facef47a98be0e879,3a645931d6b8ad2f9b59705b35b54dd43e01ec35,00ee252e7d549a900817bfd18f11825b2ad06484,,True,True,49b1d63eefb0accadbb2154e82aeae4077c2d341d3726358622cb1d2e297029a,Tests_passed,3ece39464f8e2a307991887b9867ac1db7770286dd1f7942fe1629e20035e2d2,Tests_passed,True,True,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,cfa4edce5d38af5bdba04aece6e8e58e5c47f14187af430168ca95a807e149bc,Tests_passed,cfa4edce5d38af5bdba04aece6e8e58e5c47f14187af430168ca95a807e149bc,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_failed,d96d46fb8ac2867d2723cd2593cdfd2f08532c4f69f85400c555c5992add279c,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,0.05827450752258301,0.06853389739990234,0.057943105697631836,0.06702685356140137,0.0778665542602539,0.07179737091064453,0.07309079170227051,0.9818191528320312,0.06464385986328125,2.046356201171875,2.0742008686065674,0.7898638248443604,10.77619457244873,0.42311549186706543 +132,refs/remotes/origin/issue/2075-OnExpressFailure,4464a94e645097a18084eb4facef47a98be0e879,3a645931d6b8ad2f9b59705b35b54dd43e01ec35,00ee252e7d549a900817bfd18f11825b2ad06484,,True,True,49b1d63eefb0accadbb2154e82aeae4077c2d341d3726358622cb1d2e297029a,Tests_passed,3ece39464f8e2a307991887b9867ac1db7770286dd1f7942fe1629e20035e2d2,Tests_passed,True,True,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_passed,cfa4edce5d38af5bdba04aece6e8e58e5c47f14187af430168ca95a807e149bc,Tests_passed,cfa4edce5d38af5bdba04aece6e8e58e5c47f14187af430168ca95a807e149bc,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,Tests_failed,d96d46fb8ac2867d2723cd2593cdfd2f08532c4f69f85400c555c5992add279c,Tests_passed,8e907ddb8f8efadd0bfa4bc846bb8ff94e00193a9f80e5dfa17bb162faee7ba2,0.05827450752258301,0.06853389739990234,0.057943105697631836,0.06702685356140137,0.0778665542602539,0.07179737091064453,0.07309079170227051,0.9818191528320312,0.06464385986328125,2.028414726257324,2.05962872505188,0.7898638248443604,10.77619457244873,0.42311549186706543 diff --git a/results/combined/merges_timed/nanohttpd/nanohttpd.csv b/results/combined/merges_timed/nanohttpd/nanohttpd.csv index b849682b49..f9a5968862 100644 --- a/results/combined/merges_timed/nanohttpd/nanohttpd.csv +++ b/results/combined/merges_timed/nanohttpd/nanohttpd.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,e175fd08e041cd741016bb1f1a944d2caec8f3e6,63815b9a19c35d965465fa25028cd0a9a5fbcb40,9cd340f18884c71807da5ed687bc51450b7811d0,,True,True,064eabb579823852af71b85087c929d27b87659a6b202f5c144a8b23a4ffe714,Tests_passed,d9184fa03ddd372bb9e50d2b80b64f6bfc77099e248476a61a62757e6b96f5c1,Tests_passed,True,True,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,760d179976a51f1a5bd49cfa994ffce2c119674b7576a63904b2797cc22c1bd2,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,0.04477047920227051,0.04626059532165527,0.04992818832397461,0.04505157470703125,0.04137539863586426,0.050064802169799805,0.056285858154296875,0.2608911991119385,0.028474807739257812,0.33516359329223633,0.333127498626709,0.137007474899292,2.3065645694732666,0.21901321411132812 +11,refs/heads/master,e175fd08e041cd741016bb1f1a944d2caec8f3e6,63815b9a19c35d965465fa25028cd0a9a5fbcb40,9cd340f18884c71807da5ed687bc51450b7811d0,,True,True,064eabb579823852af71b85087c929d27b87659a6b202f5c144a8b23a4ffe714,Tests_passed,d9184fa03ddd372bb9e50d2b80b64f6bfc77099e248476a61a62757e6b96f5c1,Tests_passed,True,True,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,760d179976a51f1a5bd49cfa994ffce2c119674b7576a63904b2797cc22c1bd2,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,0.04477047920227051,0.04626059532165527,0.04992818832397461,0.04505157470703125,0.04137539863586426,0.050064802169799805,0.056285858154296875,0.2608911991119385,0.028474807739257812,0.325345516204834,0.32613658905029297,0.137007474899292,2.3065645694732666,0.21901321411132812 diff --git a/results/combined/merges_timed/nastel/tnt4j.csv b/results/combined/merges_timed/nastel/tnt4j.csv index bd3a5f421e..175afa745d 100644 --- a/results/combined/merges_timed/nastel/tnt4j.csv +++ b/results/combined/merges_timed/nastel/tnt4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,627930d2b4765450617ae73f3c5d4a7af62b97c2,90ce78c0eba903759538d042760362497ca10b56,2d191958a7ab53e2ba0d37d112f2386a24e63c8e,,8b99c52e2c24a34537e4d34808dee8da1482de5cf9c4872d16dc3e7d8cb2cf0a,Tests_passed,1e13ff31c149b138b0d4fd8d49ac48b9d9ca85c81d8982e744f92bad97e8c466,Tests_passed,True,True,True,True,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,a057bc5a8236b65ac225532c1b44e440d7908b85d2f962fa9c133461d0750b38,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,65115c537e519ad7fc2e4b3bc5bc22990c0333e385d7daa98e2ba625af92bdb0,Merge_failed,65115c537e519ad7fc2e4b3bc5bc22990c0333e385d7daa98e2ba625af92bdb0,Merge_failed,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,2fd262f62748d7a3caa76f5b459226d185b43949fd8d2b9eeedd72f6d1dd7f66,Merge_failed,b7954486a5556b5fe146d1e5031c084b1f051ac053f6373e0d59fa6995f0b446,0.03827500343322754,0.03664875030517578,0.029434919357299805,0.042395591735839844,0.024693012237548828,0.01836228370666504,0.04832005500793457,0.5296530723571777,0.0817112922668457,0.33328986167907715,0.33286261558532715,0.46618151664733887,2.3889567852020264,0.22777080535888672 +13,refs/heads/master,627930d2b4765450617ae73f3c5d4a7af62b97c2,90ce78c0eba903759538d042760362497ca10b56,2d191958a7ab53e2ba0d37d112f2386a24e63c8e,,8b99c52e2c24a34537e4d34808dee8da1482de5cf9c4872d16dc3e7d8cb2cf0a,Tests_passed,1e13ff31c149b138b0d4fd8d49ac48b9d9ca85c81d8982e744f92bad97e8c466,Tests_passed,True,True,True,True,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,a057bc5a8236b65ac225532c1b44e440d7908b85d2f962fa9c133461d0750b38,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,65115c537e519ad7fc2e4b3bc5bc22990c0333e385d7daa98e2ba625af92bdb0,Merge_failed,65115c537e519ad7fc2e4b3bc5bc22990c0333e385d7daa98e2ba625af92bdb0,Merge_failed,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,2fd262f62748d7a3caa76f5b459226d185b43949fd8d2b9eeedd72f6d1dd7f66,Merge_failed,b7954486a5556b5fe146d1e5031c084b1f051ac053f6373e0d59fa6995f0b446,0.03827500343322754,0.03664875030517578,0.029434919357299805,0.042395591735839844,0.024693012237548828,0.01836228370666504,0.04832005500793457,0.5296530723571777,0.0817112922668457,0.33303213119506836,0.3305356502532959,0.46618151664733887,2.3889567852020264,0.22777080535888672 diff --git a/results/combined/merges_timed/nea/vertx-mod-cassandra-persistor.csv b/results/combined/merges_timed/nea/vertx-mod-cassandra-persistor.csv index ada752dbe9..ccb98eeb3b 100644 --- a/results/combined/merges_timed/nea/vertx-mod-cassandra-persistor.csv +++ b/results/combined/merges_timed/nea/vertx-mod-cassandra-persistor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,5f849c44ac7fa15876145c056ba40871f94afeb1,fa8733a59151272f42eb183d907ca866dda4fc02,274f625caff7e956fde0784982f279a69328a99c,,True,True,3a97a7e1d982df6a8806a0c5c6ba7af25065a0e7b5f723df724b5410678f539b,Tests_passed,53ff524ad4faf8e4bb54b559a74b17b8b21c604f12cdd931ab4efbd18d94e743,Tests_passed,True,True,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,7c3bfce3ac9afb6761bf4e08d54626721d90513991200c347a2101ecce9858bf,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,7c3bfce3ac9afb6761bf4e08d54626721d90513991200c347a2101ecce9858bf,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,f9bf85f6fdace20079e96950586f8b3aa3cb8d72d051790ef4f737881dfa1c19,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,c4e6445258656ce41df284fb83d9d1ee33e0aac15adfb2d104fb0d4293462789,Merge_failed,c4e6445258656ce41df284fb83d9d1ee33e0aac15adfb2d104fb0d4293462789,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,0.009414196014404297,0.010398387908935547,0.009886026382446289,0.010500907897949219,0.010094165802001953,0.010105609893798828,0.010064363479614258,0.05822896957397461,0.01633453369140625,0.1690077781677246,0.16790413856506348,0.17987728118896484,0.013338088989257812,0.15354061126708984 +3,refs/heads/master,5f849c44ac7fa15876145c056ba40871f94afeb1,fa8733a59151272f42eb183d907ca866dda4fc02,274f625caff7e956fde0784982f279a69328a99c,,True,True,3a97a7e1d982df6a8806a0c5c6ba7af25065a0e7b5f723df724b5410678f539b,Tests_passed,53ff524ad4faf8e4bb54b559a74b17b8b21c604f12cdd931ab4efbd18d94e743,Tests_passed,True,True,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,7c3bfce3ac9afb6761bf4e08d54626721d90513991200c347a2101ecce9858bf,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,7c3bfce3ac9afb6761bf4e08d54626721d90513991200c347a2101ecce9858bf,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,f9bf85f6fdace20079e96950586f8b3aa3cb8d72d051790ef4f737881dfa1c19,Merge_failed,4658c45ebeab7314b4f2a2de4c0a40c092cf036bc4b5aa09202dd51683fdae2b,Merge_failed,c4e6445258656ce41df284fb83d9d1ee33e0aac15adfb2d104fb0d4293462789,Merge_failed,c4e6445258656ce41df284fb83d9d1ee33e0aac15adfb2d104fb0d4293462789,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,0.009414196014404297,0.010398387908935547,0.009886026382446289,0.010500907897949219,0.010094165802001953,0.010105609893798828,0.010064363479614258,0.05822896957397461,0.01633453369140625,0.1693706512451172,0.16677570343017578,0.17987728118896484,0.013338088989257812,0.15354061126708984 diff --git a/results/combined/merges_timed/needle4j/needle4j.csv b/results/combined/merges_timed/needle4j/needle4j.csv index ae81cc3aa3..3917ea80fb 100644 --- a/results/combined/merges_timed/needle4j/needle4j.csv +++ b/results/combined/merges_timed/needle4j/needle4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,93f886c3493bba1e2bc216c583c83bee71c6c747,d247514a07b785bd923d201ce11bf88d3972afd5,81ca0c3cf142efb24091bc993a6ed13d091835b6,,be9360c550c3cf09e7f0027ff9299d4d405aa4927b2e8385f33623c6eaa898f2,Tests_passed,cc4a937c431587dfc2e0f013bb0804cb50e608dc3da1f756441d1fcdbb0448c3,Tests_passed,True,True,True,True,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,e1fb906da1a8bd543acf60c6daebbe3c0d7c5db064c6ab8ed9cb4da27568857e,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,83785b142da691b2f07f2e2de84f1e62314918b94e61795ed6f8dfa937956082,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,a91581ef4185b031f9b86e27d68bdea3076fe43885545702f83412ec86f1f96c,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d36fccb0cfa904b5cb5f23d5b454b79f74db59e93e5361021e70b2d53d19f03d,Merge_failed,d36fccb0cfa904b5cb5f23d5b454b79f74db59e93e5361021e70b2d53d19f03d,Merge_failed,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Merge_failed,cae569b0dd75d816b7b3e90876ff766010727d6f19e93a03b9f76791bc31def6,0.05286741256713867,0.04703927040100098,0.022038936614990234,0.038706064224243164,0.04700660705566406,0.03243708610534668,0.032337188720703125,0.3109431266784668,0.0802755355834961,0.30640721321105957,0.3093283176422119,0.25876545906066895,2.3697664737701416,0.23861002922058105 +7,refs/heads/master,93f886c3493bba1e2bc216c583c83bee71c6c747,d247514a07b785bd923d201ce11bf88d3972afd5,81ca0c3cf142efb24091bc993a6ed13d091835b6,,be9360c550c3cf09e7f0027ff9299d4d405aa4927b2e8385f33623c6eaa898f2,Tests_passed,cc4a937c431587dfc2e0f013bb0804cb50e608dc3da1f756441d1fcdbb0448c3,Tests_passed,True,True,True,True,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,e1fb906da1a8bd543acf60c6daebbe3c0d7c5db064c6ab8ed9cb4da27568857e,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,83785b142da691b2f07f2e2de84f1e62314918b94e61795ed6f8dfa937956082,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,a91581ef4185b031f9b86e27d68bdea3076fe43885545702f83412ec86f1f96c,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d36fccb0cfa904b5cb5f23d5b454b79f74db59e93e5361021e70b2d53d19f03d,Merge_failed,d36fccb0cfa904b5cb5f23d5b454b79f74db59e93e5361021e70b2d53d19f03d,Merge_failed,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Merge_failed,cae569b0dd75d816b7b3e90876ff766010727d6f19e93a03b9f76791bc31def6,0.05286741256713867,0.04703927040100098,0.022038936614990234,0.038706064224243164,0.04700660705566406,0.03243708610534668,0.032337188720703125,0.3109431266784668,0.0802755355834961,0.3050038814544678,0.30877137184143066,0.25876545906066895,2.3697664737701416,0.23861002922058105 diff --git a/results/combined/merges_timed/nepxion/discovery.csv b/results/combined/merges_timed/nepxion/discovery.csv index dba645ac76..23839200e3 100644 --- a/results/combined/merges_timed/nepxion/discovery.csv +++ b/results/combined/merges_timed/nepxion/discovery.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/6.x.x,99c2bc3a686bfaa15e56484c3828e1fb0e17cfd6,a5a645b7496ddd0c4647abc6b1d8334d561f1eb4,eeef4711d6e2f12a03b2956bda837b06311feea1,,True,True,084f2c345aeb1284e4d1a6d16ac0ad405f5477595a8ae351ee1f3266b7ee43df,Tests_passed,c93f72ef3c8f6ade021264011100c1be77a55a5d6f716404c4e16f69bcbba451,Tests_passed,True,True,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9f12e440b5fef3fb34930f9ee4f9a94d8cdfe5b03b91e127d8ea5348a29cadd9,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,8186fac8f99130b80b1e5c7e4d7b6dee100952815dbab9cc6fe75558c5d119d6,Merge_failed,8186fac8f99130b80b1e5c7e4d7b6dee100952815dbab9cc6fe75558c5d119d6,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,0.0481562614440918,0.031149625778198242,0.05950450897216797,0.025644302368164062,0.05263781547546387,0.05614781379699707,0.04702305793762207,0.3046746253967285,0.12761402130126953,0.22952961921691895,0.24251508712768555,0.18300557136535645,0.03519845008850098,0.44635605812072754 +13,refs/heads/6.x.x,99c2bc3a686bfaa15e56484c3828e1fb0e17cfd6,a5a645b7496ddd0c4647abc6b1d8334d561f1eb4,eeef4711d6e2f12a03b2956bda837b06311feea1,,True,True,084f2c345aeb1284e4d1a6d16ac0ad405f5477595a8ae351ee1f3266b7ee43df,Tests_passed,c93f72ef3c8f6ade021264011100c1be77a55a5d6f716404c4e16f69bcbba451,Tests_passed,True,True,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9f12e440b5fef3fb34930f9ee4f9a94d8cdfe5b03b91e127d8ea5348a29cadd9,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,8186fac8f99130b80b1e5c7e4d7b6dee100952815dbab9cc6fe75558c5d119d6,Merge_failed,8186fac8f99130b80b1e5c7e4d7b6dee100952815dbab9cc6fe75558c5d119d6,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,0.0481562614440918,0.031149625778198242,0.05950450897216797,0.025644302368164062,0.05263781547546387,0.05614781379699707,0.04702305793762207,0.3046746253967285,0.12761402130126953,0.237746000289917,0.22742795944213867,0.18300557136535645,0.03519845008850098,0.44635605812072754 diff --git a/results/combined/merges_timed/nerdwin15/stash-jenkins-postreceive-webhook.csv b/results/combined/merges_timed/nerdwin15/stash-jenkins-postreceive-webhook.csv index 9f5fcd2461..e2f204b9ab 100644 --- a/results/combined/merges_timed/nerdwin15/stash-jenkins-postreceive-webhook.csv +++ b/results/combined/merges_timed/nerdwin15/stash-jenkins-postreceive-webhook.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/master,8860ab3c4ed4b40a174411ac0b97af4d2ffcd4cf,48490bd6058369d762091369ef73d5144f194f05,e9b8f2006b0f21d93d0a3818ea5105919123a493,,True,True,508df40e55546af80f2a1412bcd69eed9fc49242fedd7d2e67693fb8898f7e52,Tests_passed,709947285e823acfe6fc6d38da2b50be4cb9595e24cf66b20946ed5c14f93fa8,Tests_passed,True,True,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,0.044162750244140625,0.0438687801361084,0.039580345153808594,0.0440216064453125,0.05344510078430176,0.04492044448852539,0.036200523376464844,0.17362117767333984,0.03844904899597168,0.15510869026184082,0.1580357551574707,0.11258077621459961,0.787304162979126,0.1844336986541748 +16,refs/heads/master,8860ab3c4ed4b40a174411ac0b97af4d2ffcd4cf,48490bd6058369d762091369ef73d5144f194f05,e9b8f2006b0f21d93d0a3818ea5105919123a493,,True,True,508df40e55546af80f2a1412bcd69eed9fc49242fedd7d2e67693fb8898f7e52,Tests_passed,709947285e823acfe6fc6d38da2b50be4cb9595e24cf66b20946ed5c14f93fa8,Tests_passed,True,True,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,0.044162750244140625,0.0438687801361084,0.039580345153808594,0.0440216064453125,0.05344510078430176,0.04492044448852539,0.036200523376464844,0.17362117767333984,0.03844904899597168,0.15298724174499512,0.1531391143798828,0.11258077621459961,0.787304162979126,0.1844336986541748 diff --git a/results/combined/merges_timed/netflix/rxjava.csv b/results/combined/merges_timed/netflix/rxjava.csv index 61b188145e..28269dfcf7 100644 --- a/results/combined/merges_timed/netflix/rxjava.csv +++ b/results/combined/merges_timed/netflix/rxjava.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1661,refs/remotes/origin/pull/7148,8ac9df9b2e145914d91007ebe3fc7ba0606c6751,ec96e6a73c7b55f8f41654ff97dd7ef189a43560,54850d0d344434022070fb034cdb7bda59b17b2b,,efed346b5213b3f7d41c04dbf3b3d6aae051762dee43954d9c5ea31a2e1e6b5c,Tests_passed,57d2334564d46196bf26d6048d852522d8af994c9f1ff9d11304c8b63862e2dc,Tests_passed,True,True,True,True,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,cab93085195df6f20a6285f866c2a487969e3fc3f6b8dd401ea4084e728fc76a,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,066403c43b18a495693c48ccd7607924bc07c74c1dd7f374c439a0c466a48d96,Merge_failed,066403c43b18a495693c48ccd7607924bc07c74c1dd7f374c439a0c466a48d96,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,0.08119463920593262,0.0754086971282959,0.0734105110168457,0.08338809013366699,0.07433390617370605,0.10346055030822754,0.08720111846923828,0.5075204372406006,0.16789650917053223,0.48012423515319824,0.48459506034851074,0.3640933036804199,0.09866189956665039,0.6074190139770508 +1661,refs/remotes/origin/pull/7148,8ac9df9b2e145914d91007ebe3fc7ba0606c6751,ec96e6a73c7b55f8f41654ff97dd7ef189a43560,54850d0d344434022070fb034cdb7bda59b17b2b,,efed346b5213b3f7d41c04dbf3b3d6aae051762dee43954d9c5ea31a2e1e6b5c,Tests_passed,57d2334564d46196bf26d6048d852522d8af994c9f1ff9d11304c8b63862e2dc,Tests_passed,True,True,True,True,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,cab93085195df6f20a6285f866c2a487969e3fc3f6b8dd401ea4084e728fc76a,Merge_failed,31bb2a0816ed7063830b259d7e224444206fc313d9cf0a67615ecc6df4935c8f,Merge_failed,066403c43b18a495693c48ccd7607924bc07c74c1dd7f374c439a0c466a48d96,Merge_failed,066403c43b18a495693c48ccd7607924bc07c74c1dd7f374c439a0c466a48d96,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,0.08119463920593262,0.0754086971282959,0.0734105110168457,0.08338809013366699,0.07433390617370605,0.10346055030822754,0.08720111846923828,0.5075204372406006,0.16789650917053223,0.48085808753967285,0.4790472984313965,0.3640933036804199,0.09866189956665039,0.6074190139770508 diff --git a/results/combined/merges_timed/newbee-ltd/newbee-mall.csv b/results/combined/merges_timed/newbee-ltd/newbee-mall.csv index c2817f6e27..a4c855d2b0 100644 --- a/results/combined/merges_timed/newbee-ltd/newbee-mall.csv +++ b/results/combined/merges_timed/newbee-ltd/newbee-mall.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/remotes/origin/pull/62,0710125767852fddddaf0ab338c25793f492f68d,1c1d9af4776ed9e0da72091e7635065a05f53ee1,59354e6e91eefa18168fb7528c1d4b462196575f,,True,True,2f4394f7607535d62e504d42dfee2c0163bca12dff23efd0f52a1e8c3b7d8fd2,Tests_passed,0f025595e8b03340e6f54231cae991778a17399c8f390b26c0bee570918cab7c,Tests_passed,True,True,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,70b40ecd186f3475b61f24bbd55e10f6393e3bc8d19c9f0729100a3229ffb72c,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,0e73a90785e0aa7751a842a5c012adb18ffc64d88ad529dab0c7d5a7a259e1cc,Merge_failed,0e73a90785e0aa7751a842a5c012adb18ffc64d88ad529dab0c7d5a7a259e1cc,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,0.11765217781066895,0.11958527565002441,0.14587926864624023,0.1566603183746338,0.14646315574645996,0.14771580696105957,0.15063238143920898,0.36700987815856934,0.1731112003326416,0.5258033275604248,0.5279309749603271,0.3409719467163086,0.13479018211364746,0.57694411277771 +25,refs/remotes/origin/pull/62,0710125767852fddddaf0ab338c25793f492f68d,1c1d9af4776ed9e0da72091e7635065a05f53ee1,59354e6e91eefa18168fb7528c1d4b462196575f,,True,True,2f4394f7607535d62e504d42dfee2c0163bca12dff23efd0f52a1e8c3b7d8fd2,Tests_passed,0f025595e8b03340e6f54231cae991778a17399c8f390b26c0bee570918cab7c,Tests_passed,True,True,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,70b40ecd186f3475b61f24bbd55e10f6393e3bc8d19c9f0729100a3229ffb72c,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,0e73a90785e0aa7751a842a5c012adb18ffc64d88ad529dab0c7d5a7a259e1cc,Merge_failed,0e73a90785e0aa7751a842a5c012adb18ffc64d88ad529dab0c7d5a7a259e1cc,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,0.11765217781066895,0.11958527565002441,0.14587926864624023,0.1566603183746338,0.14646315574645996,0.14771580696105957,0.15063238143920898,0.36700987815856934,0.1731112003326416,0.5268151760101318,0.5282394886016846,0.3409719467163086,0.13479018211364746,0.57694411277771 diff --git a/results/combined/merges_timed/nhl/link-etl.csv b/results/combined/merges_timed/nhl/link-etl.csv index ff3de71308..1b6ebe4b48 100644 --- a/results/combined/merges_timed/nhl/link-etl.csv +++ b/results/combined/merges_timed/nhl/link-etl.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,5809ccc76269b6a862d5670835367f18ad2061ae,33baf16591242cead99d984a2d1f4c0d747989e4,0593efe9ae3fb77d9ac067420e2ca07b0600ccc9,,True,True,a3d3b344798a3390d4c5ad3aaefc15420eeb7ab2cb150b5aed609cedc5b651b5,Tests_passed,5b8354b4a36983f6480e12595ab97547febf13bd57ebf86976e39523db126b3d,Tests_passed,True,True,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,d9c98d63d668556f054d9b94bf35f0950d86d371eae63f58374c7212d71fc0f5,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,605527d4f0cbf4580dd505c69ec4a71b73acfb8a1e3cc48723c019ec43f93fee,Merge_failed,605527d4f0cbf4580dd505c69ec4a71b73acfb8a1e3cc48723c019ec43f93fee,Merge_failed,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,41c3cf69e96f05b06c3e7e41a8f5b6b290e607f2401c4f1d8ac3bafa833b3474,0.05789780616760254,0.059975385665893555,0.05385112762451172,0.042388916015625,0.061199188232421875,0.06631803512573242,0.06209206581115723,0.2973804473876953,0.09475111961364746,0.3436868190765381,0.3483548164367676,0.25168275833129883,1.5359086990356445,0.34569764137268066 +2,refs/heads/master,5809ccc76269b6a862d5670835367f18ad2061ae,33baf16591242cead99d984a2d1f4c0d747989e4,0593efe9ae3fb77d9ac067420e2ca07b0600ccc9,,True,True,a3d3b344798a3390d4c5ad3aaefc15420eeb7ab2cb150b5aed609cedc5b651b5,Tests_passed,5b8354b4a36983f6480e12595ab97547febf13bd57ebf86976e39523db126b3d,Tests_passed,True,True,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,d9c98d63d668556f054d9b94bf35f0950d86d371eae63f58374c7212d71fc0f5,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,605527d4f0cbf4580dd505c69ec4a71b73acfb8a1e3cc48723c019ec43f93fee,Merge_failed,605527d4f0cbf4580dd505c69ec4a71b73acfb8a1e3cc48723c019ec43f93fee,Merge_failed,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,41c3cf69e96f05b06c3e7e41a8f5b6b290e607f2401c4f1d8ac3bafa833b3474,0.05789780616760254,0.059975385665893555,0.05385112762451172,0.042388916015625,0.061199188232421875,0.06631803512573242,0.06209206581115723,0.2973804473876953,0.09475111961364746,0.3494400978088379,0.3480367660522461,0.25168275833129883,1.5359086990356445,0.34569764137268066 diff --git a/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv b/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv index 3a87a43521..76f67f5997 100644 --- a/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv +++ b/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -42,refs/heads/master,837c34617a6123ead3cc374d0a1afef4f0232ffa,cec0366866143849da17a6a0e2917736c53cba07,084cbfda8cf2ecb83cf81e8bb6802db18a6e8aa1,,True,True,0ec14b7cff841a219998c9a4df9660a906d6e1ba9255fa9c3906e0689cd77595,Tests_passed,7f92c9e1d16c78b0634ba1a08ec8e9caa1acf9368077f7dca8a39e37054b4bf1,Tests_passed,True,True,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_failed,ae87f90b770eec9a746e7ba4a39678d819487ef1ee540ac3af36150e4d3f8676,Tests_failed,ae87f90b770eec9a746e7ba4a39678d819487ef1ee540ac3af36150e4d3f8676,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,0.01255345344543457,0.012227535247802734,0.014419794082641602,0.013695240020751953,0.013825178146362305,0.01383209228515625,0.01384115219116211,0.05324268341064453,0.01270914077758789,0.31827569007873535,0.3176541328430176,0.11973714828491211,1.2554724216461182,0.1930832862854004 +42,refs/heads/master,837c34617a6123ead3cc374d0a1afef4f0232ffa,cec0366866143849da17a6a0e2917736c53cba07,084cbfda8cf2ecb83cf81e8bb6802db18a6e8aa1,,True,True,0ec14b7cff841a219998c9a4df9660a906d6e1ba9255fa9c3906e0689cd77595,Tests_passed,7f92c9e1d16c78b0634ba1a08ec8e9caa1acf9368077f7dca8a39e37054b4bf1,Tests_passed,True,True,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_failed,ae87f90b770eec9a746e7ba4a39678d819487ef1ee540ac3af36150e4d3f8676,Tests_failed,ae87f90b770eec9a746e7ba4a39678d819487ef1ee540ac3af36150e4d3f8676,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,0.01255345344543457,0.012227535247802734,0.014419794082641602,0.013695240020751953,0.013825178146362305,0.01383209228515625,0.01384115219116211,0.05324268341064453,0.01270914077758789,0.31287193298339844,0.31519579887390137,0.11973714828491211,1.2554724216461182,0.1930832862854004 diff --git a/results/combined/merges_timed/ning/compress.csv b/results/combined/merges_timed/ning/compress.csv index 95ae902c97..13f36abacd 100644 --- a/results/combined/merges_timed/ning/compress.csv +++ b/results/combined/merges_timed/ning/compress.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,aa9cf28d6f6a6c4aa88c4ab77bfb5b9a1a43b16f,6752dba1ae0535d0c279326d247e6a10d4f51608,01ea96f50f6e82de9a0436e403afd975be90920c,,ea6b050c5a70e5bef4d20e3665d3465e7050a2244744fea0ebdd577c09e6b169,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Tests_passed,True,True,True,True,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Merge_failed,2111d4a90e85e33372de5c06c2d2508f7148b7a7da9ed5ddfd60e68cbb570371,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Tests_passed,73bafbd276034fa5db7443c0b5af8c80e0c5258a509acce660fe6b0c919e5997,Tests_passed,73bafbd276034fa5db7443c0b5af8c80e0c5258a509acce660fe6b0c919e5997,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Merge_failed,8826fc754f965994e8b1c7cef6176bdab559152d9f78f4820abe2294a7b05e48,0.06889677047729492,0.07657957077026367,0.08522439002990723,0.09874153137207031,0.06861019134521484,0.08226394653320312,0.09406089782714844,0.1736316680908203,0.08470487594604492,0.3775184154510498,0.37531495094299316,0.17258286476135254,1.2790298461914062,0.27748656272888184 +11,refs/heads/master,aa9cf28d6f6a6c4aa88c4ab77bfb5b9a1a43b16f,6752dba1ae0535d0c279326d247e6a10d4f51608,01ea96f50f6e82de9a0436e403afd975be90920c,,ea6b050c5a70e5bef4d20e3665d3465e7050a2244744fea0ebdd577c09e6b169,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Tests_passed,True,True,True,True,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Merge_failed,2111d4a90e85e33372de5c06c2d2508f7148b7a7da9ed5ddfd60e68cbb570371,Merge_failed,b10085c7318f36c906f012a3b55fe2a24cedd4e38e04f21ff783263fcd028599,Tests_passed,73bafbd276034fa5db7443c0b5af8c80e0c5258a509acce660fe6b0c919e5997,Tests_passed,73bafbd276034fa5db7443c0b5af8c80e0c5258a509acce660fe6b0c919e5997,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Merge_failed,8826fc754f965994e8b1c7cef6176bdab559152d9f78f4820abe2294a7b05e48,0.06889677047729492,0.07657957077026367,0.08522439002990723,0.09874153137207031,0.06861019134521484,0.08226394653320312,0.09406089782714844,0.1736316680908203,0.08470487594604492,0.36343836784362793,0.36143994331359863,0.17258286476135254,1.2790298461914062,0.27748656272888184 diff --git a/results/combined/merges_timed/ninjaframework/ninja.csv b/results/combined/merges_timed/ninjaframework/ninja.csv index 68e8d47894..6a2c6ed540 100644 --- a/results/combined/merges_timed/ninjaframework/ninja.csv +++ b/results/combined/merges_timed/ninjaframework/ninja.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -480,refs/heads/develop,851c45513b188851e66868f1fdd0d80a1ed7344c,6a57f076f80dfeeb316a40fb134711b9388bc32c,cd3d0d8b56760edf71bddc2c6b1b4f00aa3a3b30,,True,True,3def925c02143a1c3a406890fff77012f7d1504aa3bf86ebd07df7e4e9b1994f,Tests_passed,d534b4720cb943c07b998ccd6572246a84b3fb11153dcbe1fa0db94a2bee06af,Tests_passed,True,True,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_failed,be09c3fa3cace75a7c0132a2c178d0d6d6888b4db4179e5f3a0884d17a84a0bc,Tests_failed,be09c3fa3cace75a7c0132a2c178d0d6d6888b4db4179e5f3a0884d17a84a0bc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,f487c028fd9017264f2f2db0bfc2fe20207b7b2bbf02a6d352883daf89ccf869,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,0.019037246704101562,0.018578529357910156,0.023587942123413086,0.023169517517089844,0.023734331130981445,0.02359771728515625,0.023306846618652344,0.053696632385253906,0.019121408462524414,0.1620783805847168,0.15946626663208008,0.0736551284790039,0.49148130416870117,0.2518453598022461 +480,refs/heads/develop,851c45513b188851e66868f1fdd0d80a1ed7344c,6a57f076f80dfeeb316a40fb134711b9388bc32c,cd3d0d8b56760edf71bddc2c6b1b4f00aa3a3b30,,True,True,3def925c02143a1c3a406890fff77012f7d1504aa3bf86ebd07df7e4e9b1994f,Tests_passed,d534b4720cb943c07b998ccd6572246a84b3fb11153dcbe1fa0db94a2bee06af,Tests_passed,True,True,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_failed,be09c3fa3cace75a7c0132a2c178d0d6d6888b4db4179e5f3a0884d17a84a0bc,Tests_failed,be09c3fa3cace75a7c0132a2c178d0d6d6888b4db4179e5f3a0884d17a84a0bc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,f487c028fd9017264f2f2db0bfc2fe20207b7b2bbf02a6d352883daf89ccf869,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,0.019037246704101562,0.018578529357910156,0.023587942123413086,0.023169517517089844,0.023734331130981445,0.02359771728515625,0.023306846618652344,0.053696632385253906,0.019121408462524414,0.15977835655212402,0.15949583053588867,0.0736551284790039,0.49148130416870117,0.2518453598022461 diff --git a/results/combined/merges_timed/ninjudd/drip.csv b/results/combined/merges_timed/ninjudd/drip.csv index f82efabd82..8e7f7fd7bf 100644 --- a/results/combined/merges_timed/ninjudd/drip.csv +++ b/results/combined/merges_timed/ninjudd/drip.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/heads/master,d2d0fae2ac75d59f17a8b24764fe886d73349e21,381ee4e2e8e56034ec0b79744aa2e8ad7ccc9796,32381db764e83aa02c6ad94a987076c64c54e259,,02513436999f519a039250c513424abc4cfbaf279a90f64e54b6f6438445a90d,Tests_passed,477d7e3589fe9da218db8dd24a6bc40c75fde183af52b5865fcbacffa0de77b2,Tests_passed,True,True,True,True,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,0.03739500045776367,0.03791236877441406,0.03908228874206543,0.038495540618896484,0.037780046463012695,0.03877425193786621,0.03641557693481445,0.15652179718017578,0.03850603103637695,0.14362168312072754,0.14412140846252441,0.10643959045410156,0.7693829536437988,0.18352985382080078 +19,refs/heads/master,d2d0fae2ac75d59f17a8b24764fe886d73349e21,381ee4e2e8e56034ec0b79744aa2e8ad7ccc9796,32381db764e83aa02c6ad94a987076c64c54e259,,02513436999f519a039250c513424abc4cfbaf279a90f64e54b6f6438445a90d,Tests_passed,477d7e3589fe9da218db8dd24a6bc40c75fde183af52b5865fcbacffa0de77b2,Tests_passed,True,True,True,True,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,0.03739500045776367,0.03791236877441406,0.03908228874206543,0.038495540618896484,0.037780046463012695,0.03877425193786621,0.03641557693481445,0.15652179718017578,0.03850603103637695,0.1417996883392334,0.1422433853149414,0.10643959045410156,0.7693829536437988,0.18352985382080078 diff --git a/results/combined/merges_timed/nitnelave/creeperheal.csv b/results/combined/merges_timed/nitnelave/creeperheal.csv index 7bc53ea16d..cb1ba2be4d 100644 --- a/results/combined/merges_timed/nitnelave/creeperheal.csv +++ b/results/combined/merges_timed/nitnelave/creeperheal.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/remotes/origin/pull/60,a8f5cf9a61b44a1c73353cfe0ba1bc9e341fd402,f3b468bd793ea17c8393ccde13effe27c8dfc544,4efd54689557c48ab4dc71c35cefe358127914bf,,True,True,4d9b55d86bc14154db3ec7c0006899830e401cdb41f3ed6f3467f4f58a2c1f89,Tests_passed,6d0a1b20623d5fd7fc273379f9bc436315679b245b715efe9ba0c02c3e8a0766,Tests_passed,True,True,Merge_failed,097a452363036c1b8eb85e33a5e89b923dd4fae630341849f882bf4408d27f51,Merge_failed,9c03313a3af63be0108bdc04d5e475376c5faf87594bdf4d59820e0a564b25f3,Merge_failed,097a452363036c1b8eb85e33a5e89b923dd4fae630341849f882bf4408d27f51,Merge_failed,aa1cbd1a351b0066b94d94d51e36966e67a133af45693022861366d6c02da19b,Merge_failed,68f17eca4d4c31d523fb1f47657f609a4e92d6cb7a22e2155bfdfaa799a44e6d,Merge_failed,68f17eca4d4c31d523fb1f47657f609a4e92d6cb7a22e2155bfdfaa799a44e6d,Merge_failed,60ac50f2597231f39f243e4bfa782f192fbc941b232f3a014e02f9b8cfe2c6c9,Merge_failed,6e185cc158cebda7ce86a2c818ebe28aa51161c7f5d2a4849587894a72152e82,Merge_failed,097a452363036c1b8eb85e33a5e89b923dd4fae630341849f882bf4408d27f51,Merge_failed,4b18b34f993fe0d846655ddc7f868d01d6402b07f08b075fcb28f7f9dec3516e,Merge_failed,4b18b34f993fe0d846655ddc7f868d01d6402b07f08b075fcb28f7f9dec3516e,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,3e21a0439d58be5d9688befbbdfcaf2463befc233eec2b0197f83fad33ed6244,Merge_failed,f42a9f16171c8b4c8424de409ddb29590fa0b284c69c9d5f98b57d177b39aae1,0.027543306350708008,0.027852535247802734,0.03082895278930664,0.03122687339782715,0.031462907791137695,0.03153514862060547,0.031139135360717773,0.2797353267669678,0.08074092864990234,1.0935029983520508,1.0975146293640137,0.8721339702606201,6.757500886917114,0.2844674587249756 +23,refs/remotes/origin/pull/60,a8f5cf9a61b44a1c73353cfe0ba1bc9e341fd402,f3b468bd793ea17c8393ccde13effe27c8dfc544,4efd54689557c48ab4dc71c35cefe358127914bf,,True,True,4d9b55d86bc14154db3ec7c0006899830e401cdb41f3ed6f3467f4f58a2c1f89,Tests_passed,6d0a1b20623d5fd7fc273379f9bc436315679b245b715efe9ba0c02c3e8a0766,Tests_passed,True,True,Merge_failed,097a452363036c1b8eb85e33a5e89b923dd4fae630341849f882bf4408d27f51,Merge_failed,9c03313a3af63be0108bdc04d5e475376c5faf87594bdf4d59820e0a564b25f3,Merge_failed,097a452363036c1b8eb85e33a5e89b923dd4fae630341849f882bf4408d27f51,Merge_failed,aa1cbd1a351b0066b94d94d51e36966e67a133af45693022861366d6c02da19b,Merge_failed,68f17eca4d4c31d523fb1f47657f609a4e92d6cb7a22e2155bfdfaa799a44e6d,Merge_failed,68f17eca4d4c31d523fb1f47657f609a4e92d6cb7a22e2155bfdfaa799a44e6d,Merge_failed,60ac50f2597231f39f243e4bfa782f192fbc941b232f3a014e02f9b8cfe2c6c9,Merge_failed,6e185cc158cebda7ce86a2c818ebe28aa51161c7f5d2a4849587894a72152e82,Merge_failed,097a452363036c1b8eb85e33a5e89b923dd4fae630341849f882bf4408d27f51,Merge_failed,4b18b34f993fe0d846655ddc7f868d01d6402b07f08b075fcb28f7f9dec3516e,Merge_failed,4b18b34f993fe0d846655ddc7f868d01d6402b07f08b075fcb28f7f9dec3516e,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,3e21a0439d58be5d9688befbbdfcaf2463befc233eec2b0197f83fad33ed6244,Merge_failed,f42a9f16171c8b4c8424de409ddb29590fa0b284c69c9d5f98b57d177b39aae1,0.027543306350708008,0.027852535247802734,0.03082895278930664,0.03122687339782715,0.031462907791137695,0.03153514862060547,0.031139135360717773,0.2797353267669678,0.08074092864990234,1.1010692119598389,1.0913975238800049,0.8721339702606201,6.757500886917114,0.2844674587249756 diff --git a/results/combined/merges_timed/nlpchina/nlp-lang.csv b/results/combined/merges_timed/nlpchina/nlp-lang.csv index b0e2327344..9318b51531 100644 --- a/results/combined/merges_timed/nlpchina/nlp-lang.csv +++ b/results/combined/merges_timed/nlpchina/nlp-lang.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,cec0dd677bf90156ba3adaea1ffd6c69f64df9a1,08aa1059f93618cc7c59624d5df0157ae691cef1,20cc939c8bce1777f8e750c83154a0e1fb373406,,True,True,70df7518916170212cab9406318f082d665458bc3df72963690c84581bd56a2f,Tests_passed,688f7a4088aefbf02ccb2cb5f5c7840365e6ecc4d6b6244d2149694b727507ad,Tests_passed,True,True,Merge_failed,321000a36852099f6e1f95f6a89f302133e0a76cd31ffe10f1953817760b55c3,Merge_failed,ff7b881e7af7f84e568e81f63054c5ce3c230538a5ae0a8ad3e8269f8ef036da,Merge_failed,321000a36852099f6e1f95f6a89f302133e0a76cd31ffe10f1953817760b55c3,Merge_failed,ff7b881e7af7f84e568e81f63054c5ce3c230538a5ae0a8ad3e8269f8ef036da,Merge_failed,4402e11fef32a63d4ea00c4f459b54518bb0a3aa2cb43a4010d1d7ed5dd8c9d9,Merge_failed,4402e11fef32a63d4ea00c4f459b54518bb0a3aa2cb43a4010d1d7ed5dd8c9d9,Merge_failed,321000a36852099f6e1f95f6a89f302133e0a76cd31ffe10f1953817760b55c3,Merge_failed,e12059b2389f14bc1f55954c60f206a25f9acbca6ca6d2bf9ea272eb3381234e,Merge_failed,321000a36852099f6e1f95f6a89f302133e0a76cd31ffe10f1953817760b55c3,Merge_failed,aa44d3afafe7970f1f5e36a3339137891996cf4b442eddcbce9df4a1673bdcdf,Merge_failed,aa44d3afafe7970f1f5e36a3339137891996cf4b442eddcbce9df4a1673bdcdf,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,28de242da21c4e2eeedebe22db487124df36f1eb557cd288dd5614177e220aaa,0.04969644546508789,0.0429387092590332,0.05030632019042969,0.03953361511230469,0.05286073684692383,0.04962468147277832,0.06367015838623047,0.17739295959472656,0.05994558334350586,0.24407005310058594,0.24379587173461914,0.16393637657165527,0.9382648468017578,0.21801376342773438 +15,refs/heads/master,cec0dd677bf90156ba3adaea1ffd6c69f64df9a1,08aa1059f93618cc7c59624d5df0157ae691cef1,20cc939c8bce1777f8e750c83154a0e1fb373406,,True,True,70df7518916170212cab9406318f082d665458bc3df72963690c84581bd56a2f,Tests_passed,688f7a4088aefbf02ccb2cb5f5c7840365e6ecc4d6b6244d2149694b727507ad,Tests_passed,True,True,Merge_failed,321000a36852099f6e1f95f6a89f302133e0a76cd31ffe10f1953817760b55c3,Merge_failed,ff7b881e7af7f84e568e81f63054c5ce3c230538a5ae0a8ad3e8269f8ef036da,Merge_failed,321000a36852099f6e1f95f6a89f302133e0a76cd31ffe10f1953817760b55c3,Merge_failed,ff7b881e7af7f84e568e81f63054c5ce3c230538a5ae0a8ad3e8269f8ef036da,Merge_failed,4402e11fef32a63d4ea00c4f459b54518bb0a3aa2cb43a4010d1d7ed5dd8c9d9,Merge_failed,4402e11fef32a63d4ea00c4f459b54518bb0a3aa2cb43a4010d1d7ed5dd8c9d9,Merge_failed,321000a36852099f6e1f95f6a89f302133e0a76cd31ffe10f1953817760b55c3,Merge_failed,e12059b2389f14bc1f55954c60f206a25f9acbca6ca6d2bf9ea272eb3381234e,Merge_failed,321000a36852099f6e1f95f6a89f302133e0a76cd31ffe10f1953817760b55c3,Merge_failed,aa44d3afafe7970f1f5e36a3339137891996cf4b442eddcbce9df4a1673bdcdf,Merge_failed,aa44d3afafe7970f1f5e36a3339137891996cf4b442eddcbce9df4a1673bdcdf,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,28de242da21c4e2eeedebe22db487124df36f1eb557cd288dd5614177e220aaa,0.04969644546508789,0.0429387092590332,0.05030632019042969,0.03953361511230469,0.05286073684692383,0.04962468147277832,0.06367015838623047,0.17739295959472656,0.05994558334350586,0.24065756797790527,0.2420656681060791,0.16393637657165527,0.9382648468017578,0.21801376342773438 diff --git a/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv b/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv index 4aae053044..1543cc79bf 100644 --- a/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv +++ b/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -52,refs/heads/master,4b26663ea1d58a3deaad68a2da6b674b055b291a,43943849a35b943ec203c0d39583a9c5fcec4675,5101b8a038c57c34faa31f05a3a1da4a50cd091f,,True,True,abd2fadb2826104a244981a79c491d2f7deb794cb335766e36276e16a06de96e,Tests_passed,76d2806e6c21bbfc46c261ee7b68e6e82116316827ee84dd22ef3a51ee2773f0,Tests_passed,True,True,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,e88277e29757a4ef62b6757f1e293bc5357bf5692b7b38d1834247a138307be5,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,78f4341dab43e3ba135feee8ef58161044bc5e94681df33d736261d18408b5e9,Merge_failed,78f4341dab43e3ba135feee8ef58161044bc5e94681df33d736261d18408b5e9,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,3f10c3355fc9a0653f2c4ab0f8c2ea391ee574cc52741fa15487e7fadbcd0374,0.04317355155944824,0.04027056694030762,0.04572701454162598,0.0385892391204834,0.04216766357421875,0.018129348754882812,0.04470467567443848,0.1794588565826416,0.042505741119384766,0.10475516319274902,0.10528111457824707,0.1035761833190918,1.1465511322021484,0.2144148349761963 +52,refs/heads/master,4b26663ea1d58a3deaad68a2da6b674b055b291a,43943849a35b943ec203c0d39583a9c5fcec4675,5101b8a038c57c34faa31f05a3a1da4a50cd091f,,True,True,abd2fadb2826104a244981a79c491d2f7deb794cb335766e36276e16a06de96e,Tests_passed,76d2806e6c21bbfc46c261ee7b68e6e82116316827ee84dd22ef3a51ee2773f0,Tests_passed,True,True,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,e88277e29757a4ef62b6757f1e293bc5357bf5692b7b38d1834247a138307be5,Merge_failed,bc5d15abf044c4203a8efb2d1c5034887c67531c4b2912c3bfd1aa394f2a0e96,Merge_failed,78f4341dab43e3ba135feee8ef58161044bc5e94681df33d736261d18408b5e9,Merge_failed,78f4341dab43e3ba135feee8ef58161044bc5e94681df33d736261d18408b5e9,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,3f10c3355fc9a0653f2c4ab0f8c2ea391ee574cc52741fa15487e7fadbcd0374,0.04317355155944824,0.04027056694030762,0.04572701454162598,0.0385892391204834,0.04216766357421875,0.018129348754882812,0.04470467567443848,0.1794588565826416,0.042505741119384766,0.10444068908691406,0.10513687133789062,0.1035761833190918,1.1465511322021484,0.2144148349761963 diff --git a/results/combined/merges_timed/northconcepts/event-bus.csv b/results/combined/merges_timed/northconcepts/event-bus.csv index f10ba9a147..f2aea8c09a 100644 --- a/results/combined/merges_timed/northconcepts/event-bus.csv +++ b/results/combined/merges_timed/northconcepts/event-bus.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,c878f8d9161df6ab27628108df79d54bf354cc60,d188a72f4990b2d3b0931c43028727ca22cf1895,19adeecc8b4edb32f39fc8308321459ca481046b,,0673cf54a98166adfb7fcdf423843d0ab105bba55e00e228dfa89378a6eb428c,Tests_passed,efa9ff4d8416969bdc52ffc16b4eb3a2484109770f1a533cad2b993b47ef0a75,Tests_passed,True,True,True,True,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,62dd0031c942640d2a3200597f4e729ce65ed2f08da3eda2237cc89b0d44f213,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,62dd0031c942640d2a3200597f4e729ce65ed2f08da3eda2237cc89b0d44f213,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,cca0342ff70b52bda4d07733454ee2517c43211f2cd41933ac43daccce9efb96,Merge_failed,904f3a8af331378805f0560349b20a402d4918895b9a3150223cd08e1e5bfc63,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,41b4ffd7f4f9c95ce10ebd2304e24aa595687c02d3df284652ea840166a16f00,Merge_failed,645e5ade7499f8bd5d0c09698d18237b36206cd34651cf048b84fd6e028687cc,0.04859781265258789,0.04040837287902832,0.047167301177978516,0.04072928428649902,0.04579353332519531,0.04448342323303223,0.051868438720703125,1.5791490077972412,0.3508477210998535,2.6952829360961914,2.991882801055908,1.3922944068908691,9.710896968841553,0.20317697525024414 +2,refs/heads/master,c878f8d9161df6ab27628108df79d54bf354cc60,d188a72f4990b2d3b0931c43028727ca22cf1895,19adeecc8b4edb32f39fc8308321459ca481046b,,0673cf54a98166adfb7fcdf423843d0ab105bba55e00e228dfa89378a6eb428c,Tests_passed,efa9ff4d8416969bdc52ffc16b4eb3a2484109770f1a533cad2b993b47ef0a75,Tests_passed,True,True,True,True,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,62dd0031c942640d2a3200597f4e729ce65ed2f08da3eda2237cc89b0d44f213,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,62dd0031c942640d2a3200597f4e729ce65ed2f08da3eda2237cc89b0d44f213,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,df9fc981f485f910b77073f1068c5ecdd5efcc61062b009b4f048ceb213ed527,Merge_failed,cca0342ff70b52bda4d07733454ee2517c43211f2cd41933ac43daccce9efb96,Merge_failed,904f3a8af331378805f0560349b20a402d4918895b9a3150223cd08e1e5bfc63,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,41b4ffd7f4f9c95ce10ebd2304e24aa595687c02d3df284652ea840166a16f00,Merge_failed,645e5ade7499f8bd5d0c09698d18237b36206cd34651cf048b84fd6e028687cc,0.04859781265258789,0.04040837287902832,0.047167301177978516,0.04072928428649902,0.04579353332519531,0.04448342323303223,0.051868438720703125,1.5791490077972412,0.3508477210998535,2.585536003112793,2.5748610496520996,1.3922944068908691,9.710896968841553,0.20317697525024414 diff --git a/results/combined/merges_timed/northlander/a.csv b/results/combined/merges_timed/northlander/a.csv index fbb38c425c..68db25ec1f 100644 --- a/results/combined/merges_timed/northlander/a.csv +++ b/results/combined/merges_timed/northlander/a.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -68,refs/heads/master,3497235f96c45ea39d2be68ded078b07a4d1a17c,eb5566450e3912f14b2ac5bb5848f9c6c585d10f,9f94bd9bee386305f046787bbdfb507c9616eb82,,True,True,4482a10f20e79bfdc93bab61f0b9f3faa0aa23c8bc8b9b2dcec74b363eb94ba9,Tests_passed,edc6e9998423a77284e60ca64ccc20ed5ba09ce964236f045bdd8efec148e91d,Tests_passed,True,True,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,0.045340538024902344,0.05103445053100586,0.04937148094177246,0.058156728744506836,0.04775071144104004,0.05816221237182617,0.04204130172729492,0.1711881160736084,0.043251991271972656,0.19093775749206543,0.20023369789123535,0.1081082820892334,1.9339265823364258,0.21377873420715332 +68,refs/heads/master,3497235f96c45ea39d2be68ded078b07a4d1a17c,eb5566450e3912f14b2ac5bb5848f9c6c585d10f,9f94bd9bee386305f046787bbdfb507c9616eb82,,True,True,4482a10f20e79bfdc93bab61f0b9f3faa0aa23c8bc8b9b2dcec74b363eb94ba9,Tests_passed,edc6e9998423a77284e60ca64ccc20ed5ba09ce964236f045bdd8efec148e91d,Tests_passed,True,True,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,0.045340538024902344,0.05103445053100586,0.04937148094177246,0.058156728744506836,0.04775071144104004,0.05816221237182617,0.04204130172729492,0.1711881160736084,0.043251991271972656,0.1862659454345703,0.18592333793640137,0.1081082820892334,1.9339265823364258,0.21377873420715332 diff --git a/results/combined/merges_timed/nuodb/migration-tools.csv b/results/combined/merges_timed/nuodb/migration-tools.csv index b706dd4b0e..50da0a99f1 100644 --- a/results/combined/merges_timed/nuodb/migration-tools.csv +++ b/results/combined/merges_timed/nuodb/migration-tools.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -64,refs/heads/master,2e1f6973c44144fa9b61715b1a4f0b9491d71572,65659386ae60f9c71c6a89e597e767666a523ad1,55d9255f2ba08e2abc92de5754a08c6f5a0cd1e7,,True,True,158571a9755868f3fe875257efe38e9f3e1d83b5b6a6fd4fa909d8cff69dac96,Tests_passed,dbbdbf3b4f9a7b799f469a25fc52ce5ee7af35ec94ec9fcb8ce438a5a61b194a,Tests_passed,True,True,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,85b988e0a208a56d489aa8679412167c1f5da8a1d4ee761924620c992ddc904b,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,6663e31e4e5e03e4fae461a2dbbd257efdc1efa5197fc4c3f7fafda626669d51,Merge_failed,6663e31e4e5e03e4fae461a2dbbd257efdc1efa5197fc4c3f7fafda626669d51,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Merge_failed,6aaa2df1a588435fbb0c2c04ff79a266abcdf44f7bc23e3577c7ada3b20572bc,0.014458179473876953,0.0141143798828125,0.01933431625366211,0.018604278564453125,0.018814563751220703,0.019374847412109375,0.018883943557739258,0.05360579490661621,0.033245086669921875,0.06852483749389648,0.06976819038391113,0.07284140586853027,0.6310319900512695,0.25995779037475586 +64,refs/heads/master,2e1f6973c44144fa9b61715b1a4f0b9491d71572,65659386ae60f9c71c6a89e597e767666a523ad1,55d9255f2ba08e2abc92de5754a08c6f5a0cd1e7,,True,True,158571a9755868f3fe875257efe38e9f3e1d83b5b6a6fd4fa909d8cff69dac96,Tests_passed,dbbdbf3b4f9a7b799f469a25fc52ce5ee7af35ec94ec9fcb8ce438a5a61b194a,Tests_passed,True,True,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,85b988e0a208a56d489aa8679412167c1f5da8a1d4ee761924620c992ddc904b,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,6663e31e4e5e03e4fae461a2dbbd257efdc1efa5197fc4c3f7fafda626669d51,Merge_failed,6663e31e4e5e03e4fae461a2dbbd257efdc1efa5197fc4c3f7fafda626669d51,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Merge_failed,6aaa2df1a588435fbb0c2c04ff79a266abcdf44f7bc23e3577c7ada3b20572bc,0.014458179473876953,0.0141143798828125,0.01933431625366211,0.018604278564453125,0.018814563751220703,0.019374847412109375,0.018883943557739258,0.05360579490661621,0.033245086669921875,0.06855273246765137,0.06938028335571289,0.07284140586853027,0.6310319900512695,0.25995779037475586 diff --git a/results/combined/merges_timed/nurkiewicz/async-retry.csv b/results/combined/merges_timed/nurkiewicz/async-retry.csv index f7ee32b75e..6085ab5603 100644 --- a/results/combined/merges_timed/nurkiewicz/async-retry.csv +++ b/results/combined/merges_timed/nurkiewicz/async-retry.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/java7,27316bb87f8ad572d714cb0907a04ed67cc92d7f,3b3d7b88f079004c1861d67951d154179c545a6c,f573ece398890ae0f53eb29e35ebd3af1e9f70ee,,9b669603feb41bf23ee55817d437ae34fa148d5f751dfe2df0f06ec55e1a9700,Tests_passed,a1c52b0e89e2bca25f8f9c39d50cc88f401fa64464bac6851e060efc693a8394,Tests_passed,True,True,True,True,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,f5496f5f81274ffc1806e0b1070113bff6bbf64c3be13cf31f9372993636f0d7,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,4fc67c16340a7ebd181c478acbf3623dc43dbc3b5478a41a9916a85005f042ac,Merge_failed,4fc67c16340a7ebd181c478acbf3623dc43dbc3b5478a41a9916a85005f042ac,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Merge_failed,57476cbc2690e25446b9c66047197b6c2dcea60af27e190b72ce2b2c2f84ab88,0.03711652755737305,0.030425071716308594,0.042678117752075195,0.04455828666687012,0.03984880447387695,0.042803049087524414,0.03744173049926758,0.23548436164855957,0.06955838203430176,0.20873570442199707,0.21002960205078125,0.16401362419128418,1.2028391361236572,0.21195435523986816 +4,refs/remotes/origin/java7,27316bb87f8ad572d714cb0907a04ed67cc92d7f,3b3d7b88f079004c1861d67951d154179c545a6c,f573ece398890ae0f53eb29e35ebd3af1e9f70ee,,9b669603feb41bf23ee55817d437ae34fa148d5f751dfe2df0f06ec55e1a9700,Tests_passed,a1c52b0e89e2bca25f8f9c39d50cc88f401fa64464bac6851e060efc693a8394,Tests_passed,True,True,True,True,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,f5496f5f81274ffc1806e0b1070113bff6bbf64c3be13cf31f9372993636f0d7,Merge_failed,0e4faa0958cf58dacfa9e40b1bd9309e18799d506a00dffee92580381b253394,Merge_failed,4fc67c16340a7ebd181c478acbf3623dc43dbc3b5478a41a9916a85005f042ac,Merge_failed,4fc67c16340a7ebd181c478acbf3623dc43dbc3b5478a41a9916a85005f042ac,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Merge_failed,57476cbc2690e25446b9c66047197b6c2dcea60af27e190b72ce2b2c2f84ab88,0.03711652755737305,0.030425071716308594,0.042678117752075195,0.04455828666687012,0.03984880447387695,0.042803049087524414,0.03744173049926758,0.23548436164855957,0.06955838203430176,0.20881938934326172,0.20834636688232422,0.16401362419128418,1.2028391361236572,0.21195435523986816 diff --git a/results/combined/merges_timed/nurkiewicz/java8-workshop.csv b/results/combined/merges_timed/nurkiewicz/java8-workshop.csv index 7c52e7c9cc..f39710eb90 100644 --- a/results/combined/merges_timed/nurkiewicz/java8-workshop.csv +++ b/results/combined/merges_timed/nurkiewicz/java8-workshop.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/pull/5,f5918aa79c6e08def4de82ff69f94733e71f7fcd,22ce75de37ea170342618aaacf1bfd7ca9bf31d2,15d67e90921769a92e3e1b597e056f6aa29020b7,,True,True,3b30774e8709a9b0326a72e21d6a72e7c565014cbbe9454bc380283698277226,Tests_passed,7e432992c0e01c3b4cbadfff20a0df4f022d2c33094c967f37a3a05b63f25e31,Tests_passed,True,True,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,0.047316789627075195,0.04183363914489746,0.05511879920959473,0.0494382381439209,0.053025007247924805,0.04347085952758789,0.04852414131164551,0.197113037109375,0.05005812644958496,0.15107941627502441,0.15179944038391113,0.12619829177856445,0.591372013092041,0.2305920124053955 +3,refs/remotes/origin/pull/5,f5918aa79c6e08def4de82ff69f94733e71f7fcd,22ce75de37ea170342618aaacf1bfd7ca9bf31d2,15d67e90921769a92e3e1b597e056f6aa29020b7,,True,True,3b30774e8709a9b0326a72e21d6a72e7c565014cbbe9454bc380283698277226,Tests_passed,7e432992c0e01c3b4cbadfff20a0df4f022d2c33094c967f37a3a05b63f25e31,Tests_passed,True,True,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,0.047316789627075195,0.04183363914489746,0.05511879920959473,0.0494382381439209,0.053025007247924805,0.04347085952758789,0.04852414131164551,0.197113037109375,0.05005812644958496,0.14939260482788086,0.1498579978942871,0.12619829177856445,0.591372013092041,0.2305920124053955 diff --git a/results/combined/merges_timed/nutzam/nutzwx.csv b/results/combined/merges_timed/nutzam/nutzwx.csv index 480dc6bea0..d793c3f540 100644 --- a/results/combined/merges_timed/nutzam/nutzwx.csv +++ b/results/combined/merges_timed/nutzam/nutzwx.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,fec5c5fa38c02162bb262432e6a8b72c281cbfff,845ebabe3c5df9bc20043dd1d1f4c36cd96e92ba,ebecc6c4425f4affd450866dc0e68fa0b6ba2e5b,,True,True,14ac71be239824d618fd35a278df1aa95ba7449d077584f4b6fe2ab6dd2826b1,Tests_passed,b8a1f772d567a34e48c799fe531d7688511a26f39b3b8c4aa8ba000d651fe29a,Tests_passed,True,True,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,8250332f29c286f124766cb6d6191e144325b2a92ee9e49370dd9f7d8e498c1a,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,e64c4a86320d8a5cbb7422101061c93ed5c7bad14087bde0ba7a2282f1fb5ca4,Merge_failed,410754c5555f4101293502bc4ab95ac1b8158d3c49875639630313ec7fbb04e1,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d5c347bc8090ad22d63e7da5b88f6deb089b91c2c8c6a87a102b83509e79dfa0,Merge_failed,e64c4a86320d8a5cbb7422101061c93ed5c7bad14087bde0ba7a2282f1fb5ca4,0.009784460067749023,0.009897470474243164,0.010537147521972656,0.010378122329711914,0.010214090347290039,0.010202884674072266,0.009931087493896484,0.048341989517211914,0.014202594757080078,0.15833258628845215,0.15788483619689941,0.12211942672729492,0.8560028076171875,0.16367506980895996 +20,refs/heads/master,fec5c5fa38c02162bb262432e6a8b72c281cbfff,845ebabe3c5df9bc20043dd1d1f4c36cd96e92ba,ebecc6c4425f4affd450866dc0e68fa0b6ba2e5b,,True,True,14ac71be239824d618fd35a278df1aa95ba7449d077584f4b6fe2ab6dd2826b1,Tests_passed,b8a1f772d567a34e48c799fe531d7688511a26f39b3b8c4aa8ba000d651fe29a,Tests_passed,True,True,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,8250332f29c286f124766cb6d6191e144325b2a92ee9e49370dd9f7d8e498c1a,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,e64c4a86320d8a5cbb7422101061c93ed5c7bad14087bde0ba7a2282f1fb5ca4,Merge_failed,410754c5555f4101293502bc4ab95ac1b8158d3c49875639630313ec7fbb04e1,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d5c347bc8090ad22d63e7da5b88f6deb089b91c2c8c6a87a102b83509e79dfa0,Merge_failed,e64c4a86320d8a5cbb7422101061c93ed5c7bad14087bde0ba7a2282f1fb5ca4,0.009784460067749023,0.009897470474243164,0.010537147521972656,0.010378122329711914,0.010214090347290039,0.010202884674072266,0.009931087493896484,0.048341989517211914,0.014202594757080078,0.15682482719421387,0.15698528289794922,0.12211942672729492,0.8560028076171875,0.16367506980895996 diff --git a/results/combined/merges_timed/nysenate/openlegislation.csv b/results/combined/merges_timed/nysenate/openlegislation.csv index c2cd7c5bbf..953523dc00 100644 --- a/results/combined/merges_timed/nysenate/openlegislation.csv +++ b/results/combined/merges_timed/nysenate/openlegislation.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -152,refs/heads/dev,617199a3390afb9c4607d24820940d0d544d2bb6,3924b1c2492cd9047f0d09368d1d3cefee9d1e9b,844efdd518e615a3e1d6ec15f8df1b12fb875a48,,True,True,f5282d765df57026df2e93e623d0677a09c7c2daea635653064412da4f62e8df,Tests_passed,30cda5931c2fa46f5de116170aef7d2f850bf96ab807cb53df0ecfc3b5e67024,Tests_passed,True,True,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,7f44d11e37f960a129592a81de9c6842d222210e8ece9c73f0f0b351042f161c,Tests_passed,7f44d11e37f960a129592a81de9c6842d222210e8ece9c73f0f0b351042f161c,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,7c73da45ff9619618f3798b48efd20f956ad3dc539de49ed02c36c3b143ac8d4,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,0.06009316444396973,0.06657958030700684,0.09014725685119629,0.08741950988769531,0.09430885314941406,0.09638261795043945,0.09883522987365723,0.24809694290161133,0.06351804733276367,0.19835472106933594,0.19858670234680176,0.1816878318786621,0.9772994518280029,1.3433539867401123 +152,refs/heads/dev,617199a3390afb9c4607d24820940d0d544d2bb6,3924b1c2492cd9047f0d09368d1d3cefee9d1e9b,844efdd518e615a3e1d6ec15f8df1b12fb875a48,,True,True,f5282d765df57026df2e93e623d0677a09c7c2daea635653064412da4f62e8df,Tests_passed,30cda5931c2fa46f5de116170aef7d2f850bf96ab807cb53df0ecfc3b5e67024,Tests_passed,True,True,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,7f44d11e37f960a129592a81de9c6842d222210e8ece9c73f0f0b351042f161c,Tests_passed,7f44d11e37f960a129592a81de9c6842d222210e8ece9c73f0f0b351042f161c,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,7c73da45ff9619618f3798b48efd20f956ad3dc539de49ed02c36c3b143ac8d4,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,0.06009316444396973,0.06657958030700684,0.09014725685119629,0.08741950988769531,0.09430885314941406,0.09638261795043945,0.09883522987365723,0.24809694290161133,0.06351804733276367,0.19808721542358398,0.1978158950805664,0.1816878318786621,0.9772994518280029,1.3433539867401123 diff --git a/results/combined/merges_timed/oaqa/baseqa.csv b/results/combined/merges_timed/oaqa/baseqa.csv index 575fcd41d7..b0061c02d7 100644 --- a/results/combined/merges_timed/oaqa/baseqa.csv +++ b/results/combined/merges_timed/oaqa/baseqa.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/remotes/origin/rankqa_multisource_search,1e0462637505b3a15f7975cf771777118990ce06,8d4a0f584520ba18644bacf34b2726a069664e0c,2ffc27e45b778c9570d9d701f625259945ee05f0,,bd56363e9a95d4c288404ae8e3014c437323d061f27ddaaf78aec3bbcc2e3680,Tests_passed,3d2f4a5b99ffa2582a8310240a50713ded64cffa2604eb1c7900a8f6106b74b9,Tests_passed,True,True,True,True,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,0.05147099494934082,0.039757490158081055,0.06374859809875488,0.05336594581604004,0.06072831153869629,0.049942731857299805,0.05056405067443848,0.1877901554107666,0.04539942741394043,0.17075443267822266,0.17032265663146973,0.11146020889282227,0.7615728378295898,0.25225067138671875 +11,refs/remotes/origin/rankqa_multisource_search,1e0462637505b3a15f7975cf771777118990ce06,8d4a0f584520ba18644bacf34b2726a069664e0c,2ffc27e45b778c9570d9d701f625259945ee05f0,,bd56363e9a95d4c288404ae8e3014c437323d061f27ddaaf78aec3bbcc2e3680,Tests_passed,3d2f4a5b99ffa2582a8310240a50713ded64cffa2604eb1c7900a8f6106b74b9,Tests_passed,True,True,True,True,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,0.05147099494934082,0.039757490158081055,0.06374859809875488,0.05336594581604004,0.06072831153869629,0.049942731857299805,0.05056405067443848,0.1877901554107666,0.04539942741394043,0.16727948188781738,0.16692256927490234,0.11146020889282227,0.7615728378295898,0.25225067138671875 diff --git a/results/combined/merges_timed/oauth-apis/apis.csv b/results/combined/merges_timed/oauth-apis/apis.csv index db4d048e17..ff1b6715cd 100644 --- a/results/combined/merges_timed/oauth-apis/apis.csv +++ b/results/combined/merges_timed/oauth-apis/apis.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,b7324372f050116584267f8d3b14da65d67e74e9,4d29337d5e240051ca530e49b7c85c425ef490ec,0a7301608cc377bc36922ae25f352ad7aab2cc05,,1471a3157ec98d83fe69633e621bd309761d39e4ad7ed94e6bd4801e15e51f48,Tests_passed,32b5269124bbbb956ad0dad71826e168a13abfe1b8fae3c74d0f3c0def5aee8a,Tests_passed,True,True,True,True,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,0.013796329498291016,0.05196690559387207,0.058976173400878906,0.02263927459716797,0.023813247680664062,0.05260205268859863,0.027321815490722656,0.2602975368499756,0.03394675254821777,0.17824625968933105,0.17966365814208984,0.23450231552124023,0.6113884449005127,0.25667428970336914 +6,refs/heads/master,b7324372f050116584267f8d3b14da65d67e74e9,4d29337d5e240051ca530e49b7c85c425ef490ec,0a7301608cc377bc36922ae25f352ad7aab2cc05,,1471a3157ec98d83fe69633e621bd309761d39e4ad7ed94e6bd4801e15e51f48,Tests_passed,32b5269124bbbb956ad0dad71826e168a13abfe1b8fae3c74d0f3c0def5aee8a,Tests_passed,True,True,True,True,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,0.013796329498291016,0.05196690559387207,0.058976173400878906,0.02263927459716797,0.023813247680664062,0.05260205268859863,0.027321815490722656,0.2602975368499756,0.03394675254821777,0.16904258728027344,0.17851495742797852,0.23450231552124023,0.6113884449005127,0.25667428970336914 diff --git a/results/combined/merges_timed/obourgain/elasticsearch-http.csv b/results/combined/merges_timed/obourgain/elasticsearch-http.csv index 13b7cf1934..eef28627ce 100644 --- a/results/combined/merges_timed/obourgain/elasticsearch-http.csv +++ b/results/combined/merges_timed/obourgain/elasticsearch-http.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,37df8773d873cc3155de5231165beff1a7564b99,59f9745528d2834c08fc9eaac05be5ead6698bfb,12b0ce30efc69082dca4af70d660cbbefb1522b1,,True,True,4a2bc4687b7476b7e88ff3b6bf2a0a915aa739de07a35f35294eaf5ba8ceb8b3,Tests_passed,434259f3dd81d9b54f8b3a8af0ed2285ab29672a735f4de7f2cd73b12dfc2447,Tests_passed,True,True,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,a7b36daab93353f94813e49672053cea75710eb85b971877d82010064be6d3f2,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,48195d2d9d55a92140fc65f3e0a4d2d24fde7952084393b2bb04bbf392815a43,Merge_failed,48195d2d9d55a92140fc65f3e0a4d2d24fde7952084393b2bb04bbf392815a43,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Merge_failed,c718c453afde37972e2648b63722f959887918aaab533d165c737fccf5f05f26,0.038735389709472656,0.03929400444030762,0.04864645004272461,0.0405275821685791,0.03846907615661621,0.04492497444152832,0.050650835037231445,0.17865633964538574,0.07464075088500977,0.0716249942779541,0.07097029685974121,0.12567925453186035,0.6965408325195312,0.22614550590515137 +1,refs/heads/master,37df8773d873cc3155de5231165beff1a7564b99,59f9745528d2834c08fc9eaac05be5ead6698bfb,12b0ce30efc69082dca4af70d660cbbefb1522b1,,True,True,4a2bc4687b7476b7e88ff3b6bf2a0a915aa739de07a35f35294eaf5ba8ceb8b3,Tests_passed,434259f3dd81d9b54f8b3a8af0ed2285ab29672a735f4de7f2cd73b12dfc2447,Tests_passed,True,True,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,a7b36daab93353f94813e49672053cea75710eb85b971877d82010064be6d3f2,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,48195d2d9d55a92140fc65f3e0a4d2d24fde7952084393b2bb04bbf392815a43,Merge_failed,48195d2d9d55a92140fc65f3e0a4d2d24fde7952084393b2bb04bbf392815a43,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Merge_failed,c718c453afde37972e2648b63722f959887918aaab533d165c737fccf5f05f26,0.038735389709472656,0.03929400444030762,0.04864645004272461,0.0405275821685791,0.03846907615661621,0.04492497444152832,0.050650835037231445,0.17865633964538574,0.07464075088500977,0.07213115692138672,0.06769609451293945,0.12567925453186035,0.6965408325195312,0.22614550590515137 diff --git a/results/combined/merges_timed/octo-technology/sonar-objective-c.csv b/results/combined/merges_timed/octo-technology/sonar-objective-c.csv index 73aca67f09..1173f7d8ad 100644 --- a/results/combined/merges_timed/octo-technology/sonar-objective-c.csv +++ b/results/combined/merges_timed/octo-technology/sonar-objective-c.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/remotes/origin/pull/104,b836820b107cd3bc5b7501fbccec5233804e39fb,96d4fdd2284122f3b9019d0d02b81ae3793d0d55,e8b0e178bcb565ef6356f732f33c1c9ea5991c3b,,a36f03aef9a42aa4327b69c98c1cee4d0cc5341f763bad51cb8f3517057d75db,Tests_passed,b13a644ba693a782e0d8983d7f8abfd00d4d8d9fcc42118c9186b837425cc3f3,Tests_passed,True,True,True,True,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,d873e576732256913858e84ee1c3f8737ec71d85e125ba6a38d12ac1f19de53a,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,96fa846daa7306388e6390ab9c9885055a8064a27c9877277ec44492d0041099,Merge_failed,96fa846daa7306388e6390ab9c9885055a8064a27c9877277ec44492d0041099,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Merge_failed,ff2c14d110c8c72694dcf79fd30092abda0b85d292c1490f2031e3dee15b5931,0.03889012336730957,0.037157535552978516,0.03292274475097656,0.035321712493896484,0.04157662391662598,0.05319952964782715,0.02937030792236328,0.17003321647644043,0.06652164459228516,0.06844520568847656,0.06818604469299316,0.09879469871520996,0.8279085159301758,0.22103285789489746 +27,refs/remotes/origin/pull/104,b836820b107cd3bc5b7501fbccec5233804e39fb,96d4fdd2284122f3b9019d0d02b81ae3793d0d55,e8b0e178bcb565ef6356f732f33c1c9ea5991c3b,,a36f03aef9a42aa4327b69c98c1cee4d0cc5341f763bad51cb8f3517057d75db,Tests_passed,b13a644ba693a782e0d8983d7f8abfd00d4d8d9fcc42118c9186b837425cc3f3,Tests_passed,True,True,True,True,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,d873e576732256913858e84ee1c3f8737ec71d85e125ba6a38d12ac1f19de53a,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,96fa846daa7306388e6390ab9c9885055a8064a27c9877277ec44492d0041099,Merge_failed,96fa846daa7306388e6390ab9c9885055a8064a27c9877277ec44492d0041099,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Merge_failed,ff2c14d110c8c72694dcf79fd30092abda0b85d292c1490f2031e3dee15b5931,0.03889012336730957,0.037157535552978516,0.03292274475097656,0.035321712493896484,0.04157662391662598,0.05319952964782715,0.02937030792236328,0.17003321647644043,0.06652164459228516,0.0676882266998291,0.06845641136169434,0.09879469871520996,0.8279085159301758,0.22103285789489746 diff --git a/results/combined/merges_timed/okjsp/okmakeover.csv b/results/combined/merges_timed/okjsp/okmakeover.csv index a589486e57..d9a4b21901 100644 --- a/results/combined/merges_timed/okjsp/okmakeover.csv +++ b/results/combined/merges_timed/okjsp/okmakeover.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,db184c42795a9a70b512cda17c9aef80783a12e3,24eb1f27424244ea4f537876612bc369fcca500d,14679576b6f0c1f47bad5b7f82cc7d34933dfe43,,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,4709a0746e4093f15459ef6186bf9ba67141041c827cecd0ec2782421794791f,Tests_passed,True,True,True,True,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,0.014624357223510742,0.03885507583618164,0.03925061225891113,0.0400390625,0.04259133338928223,0.01197195053100586,0.04102969169616699,0.09719228744506836,0.04316210746765137,0.07401680946350098,0.008144378662109375,0.047421932220458984,0.05131864547729492,0.24814963340759277 +18,refs/heads/master,db184c42795a9a70b512cda17c9aef80783a12e3,24eb1f27424244ea4f537876612bc369fcca500d,14679576b6f0c1f47bad5b7f82cc7d34933dfe43,,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,4709a0746e4093f15459ef6186bf9ba67141041c827cecd0ec2782421794791f,Tests_passed,True,True,True,True,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,0.014624357223510742,0.03885507583618164,0.03925061225891113,0.0400390625,0.04259133338928223,0.01197195053100586,0.04102969169616699,0.09719228744506836,0.04316210746765137,0.040435791015625,0.07321357727050781,0.047421932220458984,0.05131864547729492,0.24814963340759277 diff --git a/results/combined/merges_timed/okleine/ncoap.csv b/results/combined/merges_timed/okleine/ncoap.csv index 7d094a73c5..27f844a34b 100644 --- a/results/combined/merges_timed/okleine/ncoap.csv +++ b/results/combined/merges_timed/okleine/ncoap.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/heads/master,c30070ba7131b8a69119638d8e1109f140d22e85,6bcb914a5723ca8d94947558039072f2d3c517b7,ad88f96ad06b9e2856a91bc9ff316b37df250f78,,4f67feea8f5fd0d410dd3d602b35610ccc2cdbd628236a6e0f160d823e1d4bb4,Tests_passed,5eb1bc97eb07f240ee71e8096f1e0797c16be3bf77a24e49b3625d24fc453068,Tests_passed,True,True,True,True,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,3f1bbb7d40e039866900ae39cce5b55e736c4f6494cc733f5e27574e559e5962,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,5db9ba647dfa2649b69b402db43226e5c22215d73d8b73b1e2d16c566bb1ecd4,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,4749b0fabaebdc60f572865db9a85f9eca82c8909b38993373b1d424ca7dbfb8,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,339f8137724528a4d6dc42fa0c76acfc029c61774338909711e261a37e1da2a0,Merge_failed,339f8137724528a4d6dc42fa0c76acfc029c61774338909711e261a37e1da2a0,Merge_failed,c3774edc122c9c17679c34aad3b3403944f6beb9cd1bcaa00500a396a271de9b,Merge_failed,1888df0d24a75df17364335e9996b78c517e8987ab7196dcdd9519f594559e2b,Merge_failed,5988a57483643869e4170bab755b553bc8f9167c6f20a6943785f6f9626da6a9,0.03443169593811035,0.05168962478637695,0.026373624801635742,0.03701472282409668,0.014947652816772461,0.02424001693725586,0.034313201904296875,0.2811319828033447,0.08775901794433594,1.8237855434417725,1.81840181350708,0.7209959030151367,9.971847295761108,0.20426106452941895 +23,refs/heads/master,c30070ba7131b8a69119638d8e1109f140d22e85,6bcb914a5723ca8d94947558039072f2d3c517b7,ad88f96ad06b9e2856a91bc9ff316b37df250f78,,4f67feea8f5fd0d410dd3d602b35610ccc2cdbd628236a6e0f160d823e1d4bb4,Tests_passed,5eb1bc97eb07f240ee71e8096f1e0797c16be3bf77a24e49b3625d24fc453068,Tests_passed,True,True,True,True,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,3f1bbb7d40e039866900ae39cce5b55e736c4f6494cc733f5e27574e559e5962,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,5db9ba647dfa2649b69b402db43226e5c22215d73d8b73b1e2d16c566bb1ecd4,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,4749b0fabaebdc60f572865db9a85f9eca82c8909b38993373b1d424ca7dbfb8,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,339f8137724528a4d6dc42fa0c76acfc029c61774338909711e261a37e1da2a0,Merge_failed,339f8137724528a4d6dc42fa0c76acfc029c61774338909711e261a37e1da2a0,Merge_failed,c3774edc122c9c17679c34aad3b3403944f6beb9cd1bcaa00500a396a271de9b,Merge_failed,1888df0d24a75df17364335e9996b78c517e8987ab7196dcdd9519f594559e2b,Merge_failed,5988a57483643869e4170bab755b553bc8f9167c6f20a6943785f6f9626da6a9,0.03443169593811035,0.05168962478637695,0.026373624801635742,0.03701472282409668,0.014947652816772461,0.02424001693725586,0.034313201904296875,0.2811319828033447,0.08775901794433594,1.802489995956421,1.803175926208496,0.7209959030151367,9.971847295761108,0.20426106452941895 diff --git a/results/combined/merges_timed/oldhu/suunto2nike.csv b/results/combined/merges_timed/oldhu/suunto2nike.csv index 69eb9686cd..e31d52a0f1 100644 --- a/results/combined/merges_timed/oldhu/suunto2nike.csv +++ b/results/combined/merges_timed/oldhu/suunto2nike.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,171bc13151de4b6d205f809d0be56662b49a4920,c2f7c5f4361999291a95718ad44880dff02b2e8a,14135273289c531d1aba5d9299f21daa9fbc89ea,,True,True,2731ff566036bd25b66b4ec890c2fca70b35f2a7636bc13537c1e1ee5ddb689d,Tests_passed,ade76afd7b1e3017c23d1cc8b44dbbfda4b8156fe4a9a3f5dd0d65779e2c7361,Tests_passed,True,True,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,ce6e9ca927262fc8f21cd845a3b0f87356b6f9c8ca4a1de4e8b959055bd45ff6,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,c1430e48b9721a46e97147930eb432379516e66df720637bdef58e6912e0ff84,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,6461fcfdbe7ef8c12b960a147dfd07deeb801948984a3f4836b8d6f5635160e6,Merge_failed,b548962e95646023fc9e7ff13f0733ca787ef47df5bccc7eea87367679a779d6,0.043988943099975586,0.04529237747192383,0.03787636756896973,0.04805946350097656,0.04005908966064453,0.03855752944946289,0.03802132606506348,0.22986125946044922,0.07698941230773926,0.14714932441711426,0.14809513092041016,0.17063236236572266,0.7147586345672607,0.1916062831878662 +1,refs/heads/master,171bc13151de4b6d205f809d0be56662b49a4920,c2f7c5f4361999291a95718ad44880dff02b2e8a,14135273289c531d1aba5d9299f21daa9fbc89ea,,True,True,2731ff566036bd25b66b4ec890c2fca70b35f2a7636bc13537c1e1ee5ddb689d,Tests_passed,ade76afd7b1e3017c23d1cc8b44dbbfda4b8156fe4a9a3f5dd0d65779e2c7361,Tests_passed,True,True,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,ce6e9ca927262fc8f21cd845a3b0f87356b6f9c8ca4a1de4e8b959055bd45ff6,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,c1430e48b9721a46e97147930eb432379516e66df720637bdef58e6912e0ff84,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,6461fcfdbe7ef8c12b960a147dfd07deeb801948984a3f4836b8d6f5635160e6,Merge_failed,b548962e95646023fc9e7ff13f0733ca787ef47df5bccc7eea87367679a779d6,0.043988943099975586,0.04529237747192383,0.03787636756896973,0.04805946350097656,0.04005908966064453,0.03855752944946289,0.03802132606506348,0.22986125946044922,0.07698941230773926,0.14488887786865234,0.14590930938720703,0.17063236236572266,0.7147586345672607,0.1916062831878662 diff --git a/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv b/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv index c0bdceb32c..86e7d6deb3 100644 --- a/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv +++ b/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,True,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,Tests_passed,True,True,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,f0bd0f24957168df3bfb713cf6ec058184de412825cc84773553673f487a9094,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,49b6df8f38a303e765b0f4331314a45f661593c9375bcf488c85ed1b6049023c,Merge_failed,a4516eb7ff27207df652dbbdaea98bc42a47e5f0ccce492c8bfbc524be1e3980,Merge_failed,a4516eb7ff27207df652dbbdaea98bc42a47e5f0ccce492c8bfbc524be1e3980,Merge_failed,d4c3025993c88d20cfa2429927d94818b776423bb4f5eea009e2d2bc37d69d2a,Merge_failed,49527bac28df477a10ef01516de95eb4f143d48d432ce02bb10a9901e0d6759e,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,1c27b4755eb3a412d78da63c56ed36270caadfd78bd922be6dddd7ef74cb75d3,Merge_failed,1c27b4755eb3a412d78da63c56ed36270caadfd78bd922be6dddd7ef74cb75d3,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,0.05584526062011719,0.06443357467651367,0.06381487846374512,0.061077117919921875,0.0633094310760498,0.06451773643493652,0.05006241798400879,2.2430131435394287,0.43747425079345703,2.978907346725464,2.9477927684783936,1.9398653507232666,19.027888774871826,0.2559974193572998 +78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,True,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,Tests_passed,True,True,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,f0bd0f24957168df3bfb713cf6ec058184de412825cc84773553673f487a9094,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,49b6df8f38a303e765b0f4331314a45f661593c9375bcf488c85ed1b6049023c,Merge_failed,a4516eb7ff27207df652dbbdaea98bc42a47e5f0ccce492c8bfbc524be1e3980,Merge_failed,a4516eb7ff27207df652dbbdaea98bc42a47e5f0ccce492c8bfbc524be1e3980,Merge_failed,d4c3025993c88d20cfa2429927d94818b776423bb4f5eea009e2d2bc37d69d2a,Merge_failed,49527bac28df477a10ef01516de95eb4f143d48d432ce02bb10a9901e0d6759e,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,1c27b4755eb3a412d78da63c56ed36270caadfd78bd922be6dddd7ef74cb75d3,Merge_failed,1c27b4755eb3a412d78da63c56ed36270caadfd78bd922be6dddd7ef74cb75d3,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,0.05584526062011719,0.06443357467651367,0.06381487846374512,0.061077117919921875,0.0633094310760498,0.06451773643493652,0.05006241798400879,2.2430131435394287,0.43747425079345703,2.9816315174102783,2.9489355087280273,1.9398653507232666,19.027888774871826,0.2559974193572998 diff --git a/results/combined/merges_timed/olibye/guvna.csv b/results/combined/merges_timed/olibye/guvna.csv index 50e4fdc07f..5d64516f06 100644 --- a/results/combined/merges_timed/olibye/guvna.csv +++ b/results/combined/merges_timed/olibye/guvna.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,34cd63519389f9e2fc0f1a8ec79f770a764e5e69,02579881c322e91d755fb2583d8da6d89c863f70,f8f105277f09d628ecd30871532eb411c2d90103,,True,True,11168fe7094d8567e21bed0a2a82b3fd62ab741d8466b1c2cd0fa13dd70a6fba,Tests_passed,e8a4f3bdc315ef90ef73b6eb2f8626f9e8e60e37309aeda5de0d7a0d6a028bb5,Tests_passed,True,True,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,ce6f3b80d3db1d366b97cc237aa4c620661959140cf28cd6dbc5bc01c0d046e2,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,87d2937d2a01e177bb50ac824d0986e10972359edd9d0d01df8a645a79e82b33,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,255e318c777ea96ccc4672fdc4bba304df0e12e97f7587fb7bd37e2854cc650b,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,f58315421905e1be9a82b69a9c3eb060f4a6dd41d4bb483df14ea6e8d19bb9df,Merge_failed,60090fbac0cf8d8ff2db7730cde9ae638cf0d5c641c0ecdf0a04f1283c08277d,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,228a289486df7d87857c83a942405c7209f19da2e3800c8c61912c52af89c88c,Merge_failed,f49199fc88d2740574e4b9b685a773940c513c63fa19f5d14d5128c498db63bf,0.041321754455566406,0.0423276424407959,0.03586220741271973,0.010725975036621094,0.03398013114929199,0.0406496524810791,0.041594505310058594,0.26343798637390137,0.10915112495422363,0.1987628936767578,0.19992375373840332,0.3589797019958496,1.4761738777160645,0.1678299903869629 +7,refs/heads/master,34cd63519389f9e2fc0f1a8ec79f770a764e5e69,02579881c322e91d755fb2583d8da6d89c863f70,f8f105277f09d628ecd30871532eb411c2d90103,,True,True,11168fe7094d8567e21bed0a2a82b3fd62ab741d8466b1c2cd0fa13dd70a6fba,Tests_passed,e8a4f3bdc315ef90ef73b6eb2f8626f9e8e60e37309aeda5de0d7a0d6a028bb5,Tests_passed,True,True,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,ce6f3b80d3db1d366b97cc237aa4c620661959140cf28cd6dbc5bc01c0d046e2,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,87d2937d2a01e177bb50ac824d0986e10972359edd9d0d01df8a645a79e82b33,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,255e318c777ea96ccc4672fdc4bba304df0e12e97f7587fb7bd37e2854cc650b,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,f58315421905e1be9a82b69a9c3eb060f4a6dd41d4bb483df14ea6e8d19bb9df,Merge_failed,60090fbac0cf8d8ff2db7730cde9ae638cf0d5c641c0ecdf0a04f1283c08277d,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,228a289486df7d87857c83a942405c7209f19da2e3800c8c61912c52af89c88c,Merge_failed,f49199fc88d2740574e4b9b685a773940c513c63fa19f5d14d5128c498db63bf,0.041321754455566406,0.0423276424407959,0.03586220741271973,0.010725975036621094,0.03398013114929199,0.0406496524810791,0.041594505310058594,0.26343798637390137,0.10915112495422363,0.19910740852355957,0.1998002529144287,0.3589797019958496,1.4761738777160645,0.1678299903869629 diff --git a/results/combined/merges_timed/oltpbenchmark/oltpbench.csv b/results/combined/merges_timed/oltpbenchmark/oltpbench.csv index f234c10ede..bec39e17ac 100644 --- a/results/combined/merges_timed/oltpbenchmark/oltpbench.csv +++ b/results/combined/merges_timed/oltpbenchmark/oltpbench.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -160,refs/remotes/origin/oltpbench_tim,61fcfc2877ed46a1d8b36faae932fbb557081511,b61f29da1c16ed829c0dbeee66498adb07692a3c,0af97771b02e48284db1130f2c0aafbd822ccd30,,2ca09b4a834d6b2256898efbd077928fad232d0d28c9a673c9b2e34d449b4c15,Tests_passed,bb9717489bce87787580043b3d2a32e58bda0b359858f18614879c3c8c726c8e,Tests_passed,True,True,True,True,Merge_failed,32448fa4ef4f6cda8fd8fadd7ecf1ca518fe2a709118e3a59e46453cfd27dfec,Merge_failed,8a6fb72fea1e388150ad00db63e4935926826d021706aa4c5d26faf9ce4ecd4c,Merge_failed,2433d680860a9428b041bdf1158cfe652a712037a3a1c92b8ec6e986726ebc01,Merge_failed,a493f7eabad8a61252b0576e9debca3fa0cdc2d40c0534db84b87c6589d3f5ef,Merge_failed,15941015ac74cca582185bed2eb7fa3fa85fc570c746734db461af48803108cf,Merge_failed,15941015ac74cca582185bed2eb7fa3fa85fc570c746734db461af48803108cf,Merge_failed,ba9a49ec80363a3ade195659ad8fab095e91823e730ecd4f0c08acd0da71a929,Merge_failed,83e1100f09c239c5c10ee318bfcd3c0ba8c3d43d357a9336ee7f32d6dc2d9d7d,Merge_failed,32448fa4ef4f6cda8fd8fadd7ecf1ca518fe2a709118e3a59e46453cfd27dfec,Merge_failed,dd830c1595b699929944d9d0df6e83eedae7cce5124f9ad53764c4dbc89597ec,Merge_failed,9c046be7d40d982afa74f043415b049fc18c87435ffabfbbb14e4422f572988b,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,cefedd83547fc4fda65ae3f9a8e2fe3b021975b21988414e7f75fe2ad0f889b8,Merge_failed,954eb93b00a610e853b51763593e918549f56be730e2c57a51671880aa8aed47,1.0552210807800293,1.0621581077575684,1.3386516571044922,1.3309190273284912,1.3351428508758545,1.3272712230682373,1.3289313316345215,4.3607823848724365,1.2038838863372803,1.839214563369751,1.8332197666168213,2.579437732696533,12.972614288330078,2.767204761505127 +160,refs/remotes/origin/oltpbench_tim,61fcfc2877ed46a1d8b36faae932fbb557081511,b61f29da1c16ed829c0dbeee66498adb07692a3c,0af97771b02e48284db1130f2c0aafbd822ccd30,,2ca09b4a834d6b2256898efbd077928fad232d0d28c9a673c9b2e34d449b4c15,Tests_passed,bb9717489bce87787580043b3d2a32e58bda0b359858f18614879c3c8c726c8e,Tests_passed,True,True,True,True,Merge_failed,32448fa4ef4f6cda8fd8fadd7ecf1ca518fe2a709118e3a59e46453cfd27dfec,Merge_failed,8a6fb72fea1e388150ad00db63e4935926826d021706aa4c5d26faf9ce4ecd4c,Merge_failed,2433d680860a9428b041bdf1158cfe652a712037a3a1c92b8ec6e986726ebc01,Merge_failed,a493f7eabad8a61252b0576e9debca3fa0cdc2d40c0534db84b87c6589d3f5ef,Merge_failed,15941015ac74cca582185bed2eb7fa3fa85fc570c746734db461af48803108cf,Merge_failed,15941015ac74cca582185bed2eb7fa3fa85fc570c746734db461af48803108cf,Merge_failed,ba9a49ec80363a3ade195659ad8fab095e91823e730ecd4f0c08acd0da71a929,Merge_failed,83e1100f09c239c5c10ee318bfcd3c0ba8c3d43d357a9336ee7f32d6dc2d9d7d,Merge_failed,32448fa4ef4f6cda8fd8fadd7ecf1ca518fe2a709118e3a59e46453cfd27dfec,Merge_failed,dd830c1595b699929944d9d0df6e83eedae7cce5124f9ad53764c4dbc89597ec,Merge_failed,9c046be7d40d982afa74f043415b049fc18c87435ffabfbbb14e4422f572988b,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,cefedd83547fc4fda65ae3f9a8e2fe3b021975b21988414e7f75fe2ad0f889b8,Merge_failed,954eb93b00a610e853b51763593e918549f56be730e2c57a51671880aa8aed47,1.0552210807800293,1.0621581077575684,1.3386516571044922,1.3309190273284912,1.3351428508758545,1.3272712230682373,1.3289313316345215,4.3607823848724365,1.2038838863372803,1.7708783149719238,1.7582945823669434,2.579437732696533,12.972614288330078,2.767204761505127 diff --git a/results/combined/merges_timed/omnifaces/omnifaces.csv b/results/combined/merges_timed/omnifaces/omnifaces.csv index 1b7559c1f4..fdfdd46925 100644 --- a/results/combined/merges_timed/omnifaces/omnifaces.csv +++ b/results/combined/merges_timed/omnifaces/omnifaces.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -503,refs/heads/4.x,ccb06f87538a97e3bd9a8e73095a978efcafb7eb,9deef84288b08938b16b9ddd0ef0699dde8027e0,2b3b15be92a78784a06fc942214a202316c36a42,,e84b0004155b3617a28d0425a5e5ba86afb87e6fa0271d7da11a45131b1b0ae8,Tests_passed,f0ec9e7775299ebf5531f6b5e1db33ae9a36c115ada5f0c788491ef57169c958,Tests_passed,True,True,True,True,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,aaf5970a94c9f73b9f07d3a5e46ccf3d36c83d2714c843b7e831093f15e0afd5,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,f2502026f9efe655e2a554a315b0bf758d1088dfaef8c525da0118bdbf4bd953,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,8fce2bc8dc29309b0d9f876e70d86d8961ce9efa9fd194c64e9decd1be0ae7c1,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,0.02371072769165039,0.05839896202087402,0.05513429641723633,0.04377436637878418,0.048812150955200195,0.04569864273071289,0.03294658660888672,0.18584656715393066,0.057825565338134766,0.17915105819702148,0.1812763214111328,0.11171364784240723,0.5955595970153809,0.2444443702697754 +503,refs/heads/4.x,ccb06f87538a97e3bd9a8e73095a978efcafb7eb,9deef84288b08938b16b9ddd0ef0699dde8027e0,2b3b15be92a78784a06fc942214a202316c36a42,,e84b0004155b3617a28d0425a5e5ba86afb87e6fa0271d7da11a45131b1b0ae8,Tests_passed,f0ec9e7775299ebf5531f6b5e1db33ae9a36c115ada5f0c788491ef57169c958,Tests_passed,True,True,True,True,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,aaf5970a94c9f73b9f07d3a5e46ccf3d36c83d2714c843b7e831093f15e0afd5,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,f2502026f9efe655e2a554a315b0bf758d1088dfaef8c525da0118bdbf4bd953,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,8fce2bc8dc29309b0d9f876e70d86d8961ce9efa9fd194c64e9decd1be0ae7c1,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,0.02371072769165039,0.05839896202087402,0.05513429641723633,0.04377436637878418,0.048812150955200195,0.04569864273071289,0.03294658660888672,0.18584656715393066,0.057825565338134766,0.17745137214660645,0.17500686645507812,0.11171364784240723,0.5955595970153809,0.2444443702697754 diff --git a/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv b/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv index 40c8f2c1bf..5a801d1724 100644 --- a/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv +++ b/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -66,refs/heads/master,915e2f3ffe763e3e677ddbf3f2454626c11e5e49,7514d3f661d221b7ffda249a0b9562e0770daf15,0aa9e6864e22a83b416ff29752146bb2203a49e1,,404a21aa887a650bc819780fff4f99e7e0d153f0ee01b5779f0ad930e7124183,Tests_passed,1d12ba5241b031cd87c68f7ff401ba18d28a11a2ff991964eb1d874e0fd28124,Tests_passed,True,True,True,True,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,68850c792ce7e15b40c204ef4f3b89d7140df5f015bc530098028291e108251e,Tests_failed,68850c792ce7e15b40c204ef4f3b89d7140df5f015bc530098028291e108251e,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,0.04436802864074707,0.05559659004211426,0.06967949867248535,0.038366079330444336,0.062482357025146484,0.09878873825073242,0.0744774341583252,0.20567059516906738,0.0718240737915039,0.16798782348632812,0.16720104217529297,0.1406726837158203,0.7359962463378906,0.8383617401123047 +66,refs/heads/master,915e2f3ffe763e3e677ddbf3f2454626c11e5e49,7514d3f661d221b7ffda249a0b9562e0770daf15,0aa9e6864e22a83b416ff29752146bb2203a49e1,,404a21aa887a650bc819780fff4f99e7e0d153f0ee01b5779f0ad930e7124183,Tests_passed,1d12ba5241b031cd87c68f7ff401ba18d28a11a2ff991964eb1d874e0fd28124,Tests_passed,True,True,True,True,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,68850c792ce7e15b40c204ef4f3b89d7140df5f015bc530098028291e108251e,Tests_failed,68850c792ce7e15b40c204ef4f3b89d7140df5f015bc530098028291e108251e,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,0.04436802864074707,0.05559659004211426,0.06967949867248535,0.038366079330444336,0.062482357025146484,0.09878873825073242,0.0744774341583252,0.20567059516906738,0.0718240737915039,0.16715192794799805,0.16752171516418457,0.1406726837158203,0.7359962463378906,0.8383617401123047 diff --git a/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv b/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv index f89c4a3de9..406efc538c 100644 --- a/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv +++ b/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/heads/master,0dfc36d5c8bb5baea8656f9c4ea68983a8e0070d,5e20b0ca0ea45255157403cb84b356ea248a5b69,cee1328fa50808ec510d4c1dbc1f8be3ef59beea,,True,True,2cb3bd75e78404454c91415f3cf4782822aa59c55e49be2f795acc0c8b3c891c,Tests_passed,1dd80eb012f77a6d8275b7830b8f13f052764dadb032f8e2beef6b4c84f7bb96,Tests_passed,True,True,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,f19114b4d44b9cc82e2032b19a459984ce02d198d4cabfae61e2793ecb7899f1,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,f19114b4d44b9cc82e2032b19a459984ce02d198d4cabfae61e2793ecb7899f1,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,e5ee42f023485b0012b1c66b98152e279d644bb3405d077db11da27b0278ff03,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,3e77f849176666afac00e524e9dd921e6af09968484f06f89e7860e30a04695b,Merge_failed,ad07da125fec19542cb1bcdfcb9dab8b6c19d477fdfd0923e8888f87db98df7c,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a07261ef575584a18c6d29496642063286f995865a9887c06e2f642e9f3613d5,Merge_failed,1ff28b5cbda4f305f6dfcc74be04317ed6561dae49be6904ef90f1124fe90004,0.053713321685791016,0.059839487075805664,0.06987595558166504,0.0689079761505127,0.05685877799987793,0.06803083419799805,0.052118778228759766,1.0805659294128418,0.21380877494812012,0.7490930557250977,0.7488868236541748,0.9564487934112549,5.525013208389282,0.47811460494995117 +23,refs/heads/master,0dfc36d5c8bb5baea8656f9c4ea68983a8e0070d,5e20b0ca0ea45255157403cb84b356ea248a5b69,cee1328fa50808ec510d4c1dbc1f8be3ef59beea,,True,True,2cb3bd75e78404454c91415f3cf4782822aa59c55e49be2f795acc0c8b3c891c,Tests_passed,1dd80eb012f77a6d8275b7830b8f13f052764dadb032f8e2beef6b4c84f7bb96,Tests_passed,True,True,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,f19114b4d44b9cc82e2032b19a459984ce02d198d4cabfae61e2793ecb7899f1,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,f19114b4d44b9cc82e2032b19a459984ce02d198d4cabfae61e2793ecb7899f1,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,e5ee42f023485b0012b1c66b98152e279d644bb3405d077db11da27b0278ff03,Merge_failed,61980ee2fb19010886f3cec6d097334b0260517143e1fb4f69eeefbfa1228fc8,Merge_failed,3e77f849176666afac00e524e9dd921e6af09968484f06f89e7860e30a04695b,Merge_failed,ad07da125fec19542cb1bcdfcb9dab8b6c19d477fdfd0923e8888f87db98df7c,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a07261ef575584a18c6d29496642063286f995865a9887c06e2f642e9f3613d5,Merge_failed,1ff28b5cbda4f305f6dfcc74be04317ed6561dae49be6904ef90f1124fe90004,0.053713321685791016,0.059839487075805664,0.06987595558166504,0.0689079761505127,0.05685877799987793,0.06803083419799805,0.052118778228759766,1.0805659294128418,0.21380877494812012,0.7433559894561768,0.7414991855621338,0.9564487934112549,5.525013208389282,0.47811460494995117 diff --git a/results/combined/merges_timed/onebusaway/onebusaway-gtfs-realtime-api.csv b/results/combined/merges_timed/onebusaway/onebusaway-gtfs-realtime-api.csv index 225932fbbc..7a289a46a8 100644 --- a/results/combined/merges_timed/onebusaway/onebusaway-gtfs-realtime-api.csv +++ b/results/combined/merges_timed/onebusaway/onebusaway-gtfs-realtime-api.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,96a36bebafe864cf710f1c7d4fb59d6b0f6be102,30c97f6c6318d2c2b21af4b037379a4fc4066005,9cef141e244263ee6b29f6de503c0047573d5933,,True,True,1303a1d689098aaaef350c57cea697928222435bcd0f7f0306f552b840685cb5,Tests_passed,910e326a92598a4aab534d07b2f80bf0d4cd63b3a4ad319ade3b7807a6813e66,Tests_passed,True,True,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,04875702851856d6b96dd33324f25fac2cbce0743668234dac27a73a10f3d70e,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,57af4e55950acc91070ad117643fb70f6a5f7daba29d34e680e73a43ade0c417,Merge_failed,57af4e55950acc91070ad117643fb70f6a5f7daba29d34e680e73a43ade0c417,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Merge_failed,b28e08eea88db87392ba1c0332cd9b82eadc7bbf4443b83c6b5d9417d13714d5,0.05508112907409668,0.049601078033447266,0.05783891677856445,0.04913330078125,0.035987138748168945,0.05079936981201172,0.04881930351257324,0.17983222007751465,0.08320140838623047,0.08527970314025879,0.08580756187438965,0.11239027976989746,0.47074341773986816,0.20157146453857422 +7,refs/heads/master,96a36bebafe864cf710f1c7d4fb59d6b0f6be102,30c97f6c6318d2c2b21af4b037379a4fc4066005,9cef141e244263ee6b29f6de503c0047573d5933,,True,True,1303a1d689098aaaef350c57cea697928222435bcd0f7f0306f552b840685cb5,Tests_passed,910e326a92598a4aab534d07b2f80bf0d4cd63b3a4ad319ade3b7807a6813e66,Tests_passed,True,True,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,04875702851856d6b96dd33324f25fac2cbce0743668234dac27a73a10f3d70e,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,57af4e55950acc91070ad117643fb70f6a5f7daba29d34e680e73a43ade0c417,Merge_failed,57af4e55950acc91070ad117643fb70f6a5f7daba29d34e680e73a43ade0c417,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Merge_failed,b28e08eea88db87392ba1c0332cd9b82eadc7bbf4443b83c6b5d9417d13714d5,0.05508112907409668,0.049601078033447266,0.05783891677856445,0.04913330078125,0.035987138748168945,0.05079936981201172,0.04881930351257324,0.17983222007751465,0.08320140838623047,0.08411931991577148,0.08416557312011719,0.11239027976989746,0.47074341773986816,0.20157146453857422 diff --git a/results/combined/merges_timed/onyxbits/raccoon.csv b/results/combined/merges_timed/onyxbits/raccoon.csv index 2faaeff8cb..6249e68a81 100644 --- a/results/combined/merges_timed/onyxbits/raccoon.csv +++ b/results/combined/merges_timed/onyxbits/raccoon.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,242b60f26dd4783edf092061d17369b2dbad9ac5,1e372cfd6d21de6e607b6354c38788a9619ffecd,73ed5dcb5cfdb1caa59abaa09bd729b68eaec141,,True,True,cfe23c22c36420f01626e8c847674c9c0297dc31ad6ecaf03b458107087cee0b,Tests_passed,a27f8624e3cdfe7167828887807bcf3fa3c4b5462deefebe16646cee2b73496e,Tests_passed,True,True,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,0.09423017501831055,0.09484696388244629,0.12771892547607422,0.05026125907897949,0.1287825107574463,0.01283884048461914,0.12877130508422852,0.17831015586853027,0.09557390213012695,0.23974370956420898,0.19428348541259766,0.12904644012451172,0.11092948913574219,0.2232379913330078 +7,refs/heads/master,242b60f26dd4783edf092061d17369b2dbad9ac5,1e372cfd6d21de6e607b6354c38788a9619ffecd,73ed5dcb5cfdb1caa59abaa09bd729b68eaec141,,True,True,cfe23c22c36420f01626e8c847674c9c0297dc31ad6ecaf03b458107087cee0b,Tests_passed,a27f8624e3cdfe7167828887807bcf3fa3c4b5462deefebe16646cee2b73496e,Tests_passed,True,True,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,0.09423017501831055,0.09484696388244629,0.12771892547607422,0.05026125907897949,0.1287825107574463,0.01283884048461914,0.12877130508422852,0.17831015586853027,0.09557390213012695,0.23166537284851074,0.23072481155395508,0.12904644012451172,0.11092948913574219,0.2232379913330078 diff --git a/results/combined/merges_timed/openapitools/openapi-generator.csv b/results/combined/merges_timed/openapitools/openapi-generator.csv index f808d2e71c..93eb767ec8 100644 --- a/results/combined/merges_timed/openapitools/openapi-generator.csv +++ b/results/combined/merges_timed/openapitools/openapi-generator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3558,refs/remotes/origin/pull/1014,297029e1bd2112e6fbeef1efde0778141a2cdf9c,205fa699e300a47b643ac786334930777c0a37a9,35c3be83f85b36d40d92d2cf6c5d78edf96d1980,,True,True,f535c18b0acb6787bb89ef1a1fe9e8160020b4f0237a4a4675a6649de2fb4ab9,Tests_passed,55355a47d45942c494d2873eff0c94b8208e31fbf15ca3f215dde9b1be8d4686,Tests_passed,True,True,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,10d569eed06d987261631ae742c8ae2efdacae977edcefe4b57bbe14aaaedbb6,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,0.044916629791259766,0.05884194374084473,0.0490260124206543,0.05456686019897461,0.05364537239074707,0.05592966079711914,0.0525360107421875,0.1893613338470459,0.0382695198059082,0.21221399307250977,0.21271300315856934,0.11614823341369629,2.380113363265991,1.7434051036834717 +3558,refs/remotes/origin/pull/1014,297029e1bd2112e6fbeef1efde0778141a2cdf9c,205fa699e300a47b643ac786334930777c0a37a9,35c3be83f85b36d40d92d2cf6c5d78edf96d1980,,True,True,f535c18b0acb6787bb89ef1a1fe9e8160020b4f0237a4a4675a6649de2fb4ab9,Tests_passed,55355a47d45942c494d2873eff0c94b8208e31fbf15ca3f215dde9b1be8d4686,Tests_passed,True,True,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,10d569eed06d987261631ae742c8ae2efdacae977edcefe4b57bbe14aaaedbb6,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,0.044916629791259766,0.05884194374084473,0.0490260124206543,0.05456686019897461,0.05364537239074707,0.05592966079711914,0.0525360107421875,0.1893613338470459,0.0382695198059082,0.2160508632659912,0.21443676948547363,0.11614823341369629,2.380113363265991,1.7434051036834717 diff --git a/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv b/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv index 5e8e745f8b..e08d74fca5 100644 --- a/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv +++ b/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,894661ba0d4f40c02ea56ed56abab760fb13444b,8c4446a91079a1170b5bffd0f3fe9ada035c2b42,8d47769f37e6b4aa01ef3bb9d52aff0da27fb228,,True,True,e6588ca086257abfc5e05b878405eb5ea21b65cf09e92c6caae473f2b37ffae5,Tests_passed,1f4ddf696ac6a2b785eb936ee298d703aab992316a367d0e68761de9b2e87d91,Tests_passed,True,True,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,665da34ddaf56f970b89d5baf38b6afcbf4e45f8f3364fc3b7754a702b002d12,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Tests_failed,fcfd96979e9368bf70367fe0cdbe8545f5102c6bdafcdf80aee252d3de82eefb,Tests_failed,fcfd96979e9368bf70367fe0cdbe8545f5102c6bdafcdf80aee252d3de82eefb,Merge_failed,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Merge_failed,d2435c3f8465d0d51ae8759deda4a6d5a4c9eb7641b423256699f2d91858bf1f,0.04179716110229492,0.04239606857299805,0.009165048599243164,0.03601479530334473,0.03812813758850098,0.040461063385009766,0.032958984375,0.21674275398254395,0.06835126876831055,0.28105998039245605,0.28145813941955566,0.15745091438293457,1.1854372024536133,0.1760411262512207 +18,refs/heads/master,894661ba0d4f40c02ea56ed56abab760fb13444b,8c4446a91079a1170b5bffd0f3fe9ada035c2b42,8d47769f37e6b4aa01ef3bb9d52aff0da27fb228,,True,True,e6588ca086257abfc5e05b878405eb5ea21b65cf09e92c6caae473f2b37ffae5,Tests_passed,1f4ddf696ac6a2b785eb936ee298d703aab992316a367d0e68761de9b2e87d91,Tests_passed,True,True,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,665da34ddaf56f970b89d5baf38b6afcbf4e45f8f3364fc3b7754a702b002d12,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Tests_failed,fcfd96979e9368bf70367fe0cdbe8545f5102c6bdafcdf80aee252d3de82eefb,Tests_failed,fcfd96979e9368bf70367fe0cdbe8545f5102c6bdafcdf80aee252d3de82eefb,Merge_failed,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Merge_failed,d2435c3f8465d0d51ae8759deda4a6d5a4c9eb7641b423256699f2d91858bf1f,0.04179716110229492,0.04239606857299805,0.009165048599243164,0.03601479530334473,0.03812813758850098,0.040461063385009766,0.032958984375,0.21674275398254395,0.06835126876831055,0.27715539932250977,0.2763044834136963,0.15745091438293457,1.1854372024536133,0.1760411262512207 diff --git a/results/combined/merges_timed/openhab/jmdns.csv b/results/combined/merges_timed/openhab/jmdns.csv index 32e0b124f6..08c8f95209 100644 --- a/results/combined/merges_timed/openhab/jmdns.csv +++ b/results/combined/merges_timed/openhab/jmdns.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -23,refs/remotes/origin/pull/142,2c7d1a7405d9d43873f3a78f5373648ef759207e,27329d1d263060bbd6ef18bde3b7620e5edb572f,96a96e12ed57c536cdd105e508188f95fe68fc59,,True,True,c2d276adbb95455f5b89f9e1147069ae8daef8f069d3b37f77ff1479553bc028,Tests_passed,e9b352a0d6f4d105e720e51c3ad42894d85df86bc0507e66a73787cad30c0af0,Tests_passed,True,True,Merge_failed,1fbb6a35c9217a73014deeb8ce5b2af5ad33cbc23c80ac13be15b9b90c70eb9c,Merge_failed,dc62bb15b28b94c2c2563c7ad5741d888953c5b926614ebe5df45301de9ff8cc,Merge_failed,1fbb6a35c9217a73014deeb8ce5b2af5ad33cbc23c80ac13be15b9b90c70eb9c,Merge_failed,28dc9c8c83717d341d26a398e901686856d03b4b3ed81908e4d9126b47407a48,Merge_failed,b00c030c1d325f62f45b04a429b30a402a785c7c561a4eaffdf7a6ca611116fa,Merge_failed,b00c030c1d325f62f45b04a429b30a402a785c7c561a4eaffdf7a6ca611116fa,Merge_failed,4ea4918212e841ddec810dc02af315c9f30aae4e41789f6611494534028d37d3,Merge_failed,302a9f1197f6191ba423f0ba2b1ea869a15fdfad3c4517e1341e68eb8360a1cb,Merge_failed,1fbb6a35c9217a73014deeb8ce5b2af5ad33cbc23c80ac13be15b9b90c70eb9c,Merge_failed,4efaa4eacffc9dfe97744c14780c1aa875b00131a81f324f9067184b38f84a7c,Merge_failed,4efaa4eacffc9dfe97744c14780c1aa875b00131a81f324f9067184b38f84a7c,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,8153d64eb2429b26bdcd3e71f025c0d5487938c2a5c67355d23e6f74cb9879b0,0.06467890739440918,0.05191206932067871,0.06504368782043457,0.06923484802246094,0.04583430290222168,0.08580374717712402,0.0714712142944336,0.9633195400238037,0.10388326644897461,1.2384281158447266,1.233818531036377,0.8730738162994385,12.172288417816162,0.33565735816955566 +23,refs/remotes/origin/pull/142,2c7d1a7405d9d43873f3a78f5373648ef759207e,27329d1d263060bbd6ef18bde3b7620e5edb572f,96a96e12ed57c536cdd105e508188f95fe68fc59,,True,True,c2d276adbb95455f5b89f9e1147069ae8daef8f069d3b37f77ff1479553bc028,Tests_passed,e9b352a0d6f4d105e720e51c3ad42894d85df86bc0507e66a73787cad30c0af0,Tests_passed,True,True,Merge_failed,1fbb6a35c9217a73014deeb8ce5b2af5ad33cbc23c80ac13be15b9b90c70eb9c,Merge_failed,dc62bb15b28b94c2c2563c7ad5741d888953c5b926614ebe5df45301de9ff8cc,Merge_failed,1fbb6a35c9217a73014deeb8ce5b2af5ad33cbc23c80ac13be15b9b90c70eb9c,Merge_failed,28dc9c8c83717d341d26a398e901686856d03b4b3ed81908e4d9126b47407a48,Merge_failed,b00c030c1d325f62f45b04a429b30a402a785c7c561a4eaffdf7a6ca611116fa,Merge_failed,b00c030c1d325f62f45b04a429b30a402a785c7c561a4eaffdf7a6ca611116fa,Merge_failed,4ea4918212e841ddec810dc02af315c9f30aae4e41789f6611494534028d37d3,Merge_failed,302a9f1197f6191ba423f0ba2b1ea869a15fdfad3c4517e1341e68eb8360a1cb,Merge_failed,1fbb6a35c9217a73014deeb8ce5b2af5ad33cbc23c80ac13be15b9b90c70eb9c,Merge_failed,4efaa4eacffc9dfe97744c14780c1aa875b00131a81f324f9067184b38f84a7c,Merge_failed,4efaa4eacffc9dfe97744c14780c1aa875b00131a81f324f9067184b38f84a7c,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,8153d64eb2429b26bdcd3e71f025c0d5487938c2a5c67355d23e6f74cb9879b0,0.06467890739440918,0.05191206932067871,0.06504368782043457,0.06923484802246094,0.04583430290222168,0.08580374717712402,0.0714712142944336,0.9633195400238037,0.10388326644897461,1.2312617301940918,1.2376906871795654,0.8730738162994385,12.172288417816162,0.33565735816955566 diff --git a/results/combined/merges_timed/openhft/chronicle-bytes.csv b/results/combined/merges_timed/openhft/chronicle-bytes.csv index 6b6cf594df..29af9787e4 100644 --- a/results/combined/merges_timed/openhft/chronicle-bytes.csv +++ b/results/combined/merges_timed/openhft/chronicle-bytes.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,True,True,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,Tests_passed,True,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_failed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_failed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,0.029448270797729492,0.028345823287963867,0.03327131271362305,0.028581619262695312,0.0331418514251709,0.0329279899597168,0.032402753829956055,0.08248543739318848,0.028108835220336914,0.35782504081726074,0.357616662979126,0.1366715431213379,2.045332908630371,0.29340648651123047 +26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,True,True,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,Tests_passed,True,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,0.029448270797729492,0.028345823287963867,0.03327131271362305,0.028581619262695312,0.0331418514251709,0.0329279899597168,0.032402753829956055,0.08248543739318848,0.028108835220336914,0.36923837661743164,0.35840630531311035,0.1366715431213379,2.045332908630371,0.29340648651123047 diff --git a/results/combined/merges_timed/openhft/chronicle-network.csv b/results/combined/merges_timed/openhft/chronicle-network.csv index 9fe21fd73b..a2f287eff0 100644 --- a/results/combined/merges_timed/openhft/chronicle-network.csv +++ b/results/combined/merges_timed/openhft/chronicle-network.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/ea,297f43b8f8860335c79d857e7bdddc0ac9f8f0da,705e1e7a01074bdaf1668d53d6974ee1288692d3,17b56d9342ca579875930b1652336638a0f00ab1,,fa9b1521ed0d9c14b01f3e38a9976c0d31e5ddc91ba5add96afe1c399be683d2,Tests_passed,805787c1835f0a9a943d0d5db2d089205b40ffcc43d5636fbf02231155f6af53,Tests_passed,True,True,True,True,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,0.021095991134643555,0.022266149520874023,0.023018836975097656,0.02345895767211914,0.02350306510925293,0.02289891242980957,0.0227813720703125,0.06618690490722656,0.020830869674682617,0.32277655601501465,0.32134079933166504,0.12950968742370605,1.2508831024169922,0.4696054458618164 +6,refs/heads/ea,297f43b8f8860335c79d857e7bdddc0ac9f8f0da,705e1e7a01074bdaf1668d53d6974ee1288692d3,17b56d9342ca579875930b1652336638a0f00ab1,,fa9b1521ed0d9c14b01f3e38a9976c0d31e5ddc91ba5add96afe1c399be683d2,Tests_passed,805787c1835f0a9a943d0d5db2d089205b40ffcc43d5636fbf02231155f6af53,Tests_passed,True,True,True,True,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,0.021095991134643555,0.022266149520874023,0.023018836975097656,0.02345895767211914,0.02350306510925293,0.02289891242980957,0.0227813720703125,0.06618690490722656,0.020830869674682617,0.3216433525085449,0.3216683864593506,0.12950968742370605,1.2508831024169922,0.4696054458618164 diff --git a/results/combined/merges_timed/openhft/chronicle-threads.csv b/results/combined/merges_timed/openhft/chronicle-threads.csv index dccc71a74e..9a804b2d1d 100644 --- a/results/combined/merges_timed/openhft/chronicle-threads.csv +++ b/results/combined/merges_timed/openhft/chronicle-threads.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/heads/ea,c79efe704817535cbb84891bb2048cea21e926a0,a354c888e4c0174d631ffb8934299161055c5b3e,58ac76a7fe6dc52a74258985f9d2bca00c80aa73,,True,True,3bbeb351de56d4020efba79d9b680025a67964cdad15106e90e77683a4d1857a,Tests_passed,1891de40f58767f5a6e308e86d17ef85ce3542f293a4c2b8f138d368e3a61416,Tests_passed,True,True,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,0.011560916900634766,0.011725425720214844,0.011933565139770508,0.011911869049072266,0.011925458908081055,0.01192617416381836,0.01172780990600586,0.037741661071777344,0.01146697998046875,0.1591482162475586,0.16019988059997559,0.06698322296142578,0.8426735401153564,0.18712425231933594 +25,refs/heads/ea,c79efe704817535cbb84891bb2048cea21e926a0,a354c888e4c0174d631ffb8934299161055c5b3e,58ac76a7fe6dc52a74258985f9d2bca00c80aa73,,True,True,3bbeb351de56d4020efba79d9b680025a67964cdad15106e90e77683a4d1857a,Tests_passed,1891de40f58767f5a6e308e86d17ef85ce3542f293a4c2b8f138d368e3a61416,Tests_passed,True,True,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,0.011560916900634766,0.011725425720214844,0.011933565139770508,0.011911869049072266,0.011925458908081055,0.01192617416381836,0.01172780990600586,0.037741661071777344,0.01146697998046875,0.15915942192077637,0.1596517562866211,0.06698322296142578,0.8426735401153564,0.18712425231933594 diff --git a/results/combined/merges_timed/openhft/zero-allocation-hashing.csv b/results/combined/merges_timed/openhft/zero-allocation-hashing.csv index ee4dc156b5..7ddd274d3a 100644 --- a/results/combined/merges_timed/openhft/zero-allocation-hashing.csv +++ b/results/combined/merges_timed/openhft/zero-allocation-hashing.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/remotes/origin/pull/32,0d095dacc71fdff39d82d11674d410941d909e6a,a84b73119da25af70fa05889ff5d2298568ed57b,6daf738c303d538031d65815eebf24ad649c6abb,,True,True,b2014e8890eacfbad9e7b8a2cf09add99c2da49ad21a20a79c40d6a821f79358,Tests_passed,e47a0ead91c88744a4375b6b069bf958dd4d89dca67ecf6e4a62a6cbd9646851,Tests_passed,True,True,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,d1617d29d5df73973e2536488f8be522fc5cc459e41829b2c92f3414a375b489,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,ae5386d0667e7151ccc16f75beffc2604a3b0fef8a46f28edcfdacf80ffa0595,Merge_failed,ae5386d0667e7151ccc16f75beffc2604a3b0fef8a46f28edcfdacf80ffa0595,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,deadb20374b4a01dd7109d120e966a87369800c65c4472f77d1b24b1f404ecff,0.012487411499023438,0.012239217758178711,0.012381315231323242,0.012618303298950195,0.012759923934936523,0.012563705444335938,0.012338876724243164,0.05225539207458496,0.020142316818237305,0.14705634117126465,0.14756536483764648,0.12961888313293457,1.8859987258911133,0.16798973083496094 +17,refs/remotes/origin/pull/32,0d095dacc71fdff39d82d11674d410941d909e6a,a84b73119da25af70fa05889ff5d2298568ed57b,6daf738c303d538031d65815eebf24ad649c6abb,,True,True,b2014e8890eacfbad9e7b8a2cf09add99c2da49ad21a20a79c40d6a821f79358,Tests_passed,e47a0ead91c88744a4375b6b069bf958dd4d89dca67ecf6e4a62a6cbd9646851,Tests_passed,True,True,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,d1617d29d5df73973e2536488f8be522fc5cc459e41829b2c92f3414a375b489,Merge_failed,944ff38278402405ea7fd6179d97dd6fc712f0348706ddf05282e28e65cba4b0,Merge_failed,ae5386d0667e7151ccc16f75beffc2604a3b0fef8a46f28edcfdacf80ffa0595,Merge_failed,ae5386d0667e7151ccc16f75beffc2604a3b0fef8a46f28edcfdacf80ffa0595,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,deadb20374b4a01dd7109d120e966a87369800c65c4472f77d1b24b1f404ecff,0.012487411499023438,0.012239217758178711,0.012381315231323242,0.012618303298950195,0.012759923934936523,0.012563705444335938,0.012338876724243164,0.05225539207458496,0.020142316818237305,0.14643430709838867,0.14606165885925293,0.12961888313293457,1.8859987258911133,0.16798973083496094 diff --git a/results/combined/merges_timed/openmicroscopy/bioformats.csv b/results/combined/merges_timed/openmicroscopy/bioformats.csv index b74290062e..a477ffd54d 100644 --- a/results/combined/merges_timed/openmicroscopy/bioformats.csv +++ b/results/combined/merges_timed/openmicroscopy/bioformats.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3992,refs/remotes/origin/pull/3032,93f990104b3c1fb1ee1ab2a26a0f078c09b5822a,aeb68fb7f320c6f1ca9d0fafac2e6ebfc86f0a64,07b804962bea206361e1ab1a8e56874cf8c68496,,True,True,fc672c93bcc8a2117ac0f906dbf9f2595ee7809f9530400311470d22d7589c26,Tests_passed,01bf3aad3d4d9de585e7a55113b203c837083af67645fdbc3da03627df38cc04,Tests_passed,True,True,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,0.04167342185974121,0.0418848991394043,0.05496978759765625,0.05627608299255371,0.05386519432067871,0.05509042739868164,0.05464887619018555,0.09476923942565918,0.040100812911987305,0.19526886940002441,0.19539737701416016,0.09656882286071777,0.04604172706604004,0.7873709201812744 +3992,refs/remotes/origin/pull/3032,93f990104b3c1fb1ee1ab2a26a0f078c09b5822a,aeb68fb7f320c6f1ca9d0fafac2e6ebfc86f0a64,07b804962bea206361e1ab1a8e56874cf8c68496,,True,True,fc672c93bcc8a2117ac0f906dbf9f2595ee7809f9530400311470d22d7589c26,Tests_passed,01bf3aad3d4d9de585e7a55113b203c837083af67645fdbc3da03627df38cc04,Tests_passed,True,True,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,0.04167342185974121,0.0418848991394043,0.05496978759765625,0.05627608299255371,0.05386519432067871,0.05509042739868164,0.05464887619018555,0.09476923942565918,0.040100812911987305,0.19386029243469238,0.19296717643737793,0.09656882286071777,0.04604172706604004,0.7873709201812744 diff --git a/results/combined/merges_timed/openpnp/openpnp.csv b/results/combined/merges_timed/openpnp/openpnp.csv index 92678269fe..349953e342 100644 --- a/results/combined/merges_timed/openpnp/openpnp.csv +++ b/results/combined/merges_timed/openpnp/openpnp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -468,refs/heads/develop,3cc5b458a4a78bb580e90cd510be43c69f79226e,f2af033914781f4b84f6c13c5d8c6ddfcdb24a29,5cd215a0aa1117758f13e7f850a12c6e648eef37,,True,True,1a299c2cc11e553239f49380cd306b18668691dea04a96961404fe237a06a275,Tests_passed,58972a804488066374207fe385820067eae6c0ae39f15cb1383fe0ff7b10d3ab,Tests_passed,True,True,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,10f474965d3cc515a6bd2a8cda4d29cdd27f376840677d0d11d3f74a54885bb3,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,0.04652905464172363,0.038138389587402344,0.04893016815185547,0.04948782920837402,0.041185617446899414,0.026285648345947266,0.0523221492767334,0.17014122009277344,0.05164289474487305,0.16454434394836426,0.1592543125152588,0.11679816246032715,1.2760038375854492,0.5756282806396484 +468,refs/heads/develop,3cc5b458a4a78bb580e90cd510be43c69f79226e,f2af033914781f4b84f6c13c5d8c6ddfcdb24a29,5cd215a0aa1117758f13e7f850a12c6e648eef37,,True,True,1a299c2cc11e553239f49380cd306b18668691dea04a96961404fe237a06a275,Tests_passed,58972a804488066374207fe385820067eae6c0ae39f15cb1383fe0ff7b10d3ab,Tests_passed,True,True,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,10f474965d3cc515a6bd2a8cda4d29cdd27f376840677d0d11d3f74a54885bb3,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,0.04652905464172363,0.038138389587402344,0.04893016815185547,0.04948782920837402,0.041185617446899414,0.026285648345947266,0.0523221492767334,0.17014122009277344,0.05164289474487305,0.15882229804992676,0.16065216064453125,0.11679816246032715,1.2760038375854492,0.5756282806396484 diff --git a/results/combined/merges_timed/openrefine/openrefine.csv b/results/combined/merges_timed/openrefine/openrefine.csv index 35b6f6a861..768250f665 100644 --- a/results/combined/merges_timed/openrefine/openrefine.csv +++ b/results/combined/merges_timed/openrefine/openrefine.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,Tests_passed,True,True,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,0.049082040786743164,0.06729316711425781,0.06582522392272949,0.05254507064819336,0.05135035514831543,0.06628179550170898,0.05425310134887695,0.16430902481079102,0.05081796646118164,0.18729138374328613,0.18699431419372559,0.10298490524291992,0.07673406600952148,0.9323034286499023 +306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,Tests_passed,True,True,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,0.049082040786743164,0.06729316711425781,0.06582522392272949,0.05254507064819336,0.05135035514831543,0.06628179550170898,0.05425310134887695,0.16430902481079102,0.05081796646118164,0.1813526153564453,0.18154096603393555,0.10298490524291992,0.07673406600952148,0.9323034286499023 diff --git a/results/combined/merges_timed/openskynetwork/java-adsb.csv b/results/combined/merges_timed/openskynetwork/java-adsb.csv index eca14bf89d..152df16351 100644 --- a/results/combined/merges_timed/openskynetwork/java-adsb.csv +++ b/results/combined/merges_timed/openskynetwork/java-adsb.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/master,14f216cddfb325156ee31a3fdebdeadf3e6944fb,85a0255b0de8eb3eaecf8058c285313af1886256,7c4f90789ede736fdbd1161f70f46cdc273a7c89,,5b84b99a1e9525efb6e40415bccafa20284cf7a1fe4598af00333746305f9577,Tests_passed,dbdfe4bf301423794f02465c1e7385409e31266d796b0d961234afd94721643d,Tests_passed,True,True,True,True,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Merge_failed,eedde221ca64048501d82a274be7bb67e0f3331a527ce15b06ee06a325297a04,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,0.04639935493469238,0.039641618728637695,0.05052590370178223,0.03740406036376953,0.0517575740814209,0.04867887496948242,0.04800248146057129,0.2120685577392578,0.018850088119506836,0.28742527961730957,0.2864203453063965,0.17331218719482422,1.058089256286621,0.1885993480682373 +16,refs/heads/master,14f216cddfb325156ee31a3fdebdeadf3e6944fb,85a0255b0de8eb3eaecf8058c285313af1886256,7c4f90789ede736fdbd1161f70f46cdc273a7c89,,5b84b99a1e9525efb6e40415bccafa20284cf7a1fe4598af00333746305f9577,Tests_passed,dbdfe4bf301423794f02465c1e7385409e31266d796b0d961234afd94721643d,Tests_passed,True,True,True,True,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Merge_failed,eedde221ca64048501d82a274be7bb67e0f3331a527ce15b06ee06a325297a04,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,0.04639935493469238,0.039641618728637695,0.05052590370178223,0.03740406036376953,0.0517575740814209,0.04867887496948242,0.04800248146057129,0.2120685577392578,0.018850088119506836,0.29003334045410156,0.28869056701660156,0.17331218719482422,1.058089256286621,0.1885993480682373 diff --git a/results/combined/merges_timed/opentosca/container.csv b/results/combined/merges_timed/opentosca/container.csv index dfdd366bca..5fbff1ebec 100644 --- a/results/combined/merges_timed/opentosca/container.csv +++ b/results/combined/merges_timed/opentosca/container.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -255,refs/remotes/origin/pull/252,294305d0a87dbda54b1dca1962fe45988851a096,bd7ecb1c7af4d5bfbbc825493497fb6885f8eca1,e3e986b86de0061e502da0c5e31b645386f3d813,,90c0f8554c337383b6dc066894b5b73fbfe9272ca56ae84e4f7d756557554a27,Tests_passed,3f5f3a7741e5cc1116ce0ec0c40ca45df77af9c46f7967d357a78a9fc376dcc9,Tests_passed,True,True,True,True,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,0.07596325874328613,0.06953811645507812,0.09201359748840332,0.08049774169921875,0.08815169334411621,0.08267688751220703,0.09023332595825195,0.2190854549407959,0.07920503616333008,0.2120828628540039,0.20701122283935547,0.20937061309814453,0.09394526481628418,1.3786511421203613 +255,refs/remotes/origin/pull/252,294305d0a87dbda54b1dca1962fe45988851a096,bd7ecb1c7af4d5bfbbc825493497fb6885f8eca1,e3e986b86de0061e502da0c5e31b645386f3d813,,90c0f8554c337383b6dc066894b5b73fbfe9272ca56ae84e4f7d756557554a27,Tests_passed,3f5f3a7741e5cc1116ce0ec0c40ca45df77af9c46f7967d357a78a9fc376dcc9,Tests_passed,True,True,True,True,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,0.07596325874328613,0.06953811645507812,0.09201359748840332,0.08049774169921875,0.08815169334411621,0.08267688751220703,0.09023332595825195,0.2190854549407959,0.07920503616333008,0.21387529373168945,0.21567440032958984,0.20937061309814453,0.09394526481628418,1.3786511421203613 diff --git a/results/combined/merges_timed/openzipkin/zipkin.csv b/results/combined/merges_timed/openzipkin/zipkin.csv index 6415d9c5f6..271c7dd5bf 100644 --- a/results/combined/merges_timed/openzipkin/zipkin.csv +++ b/results/combined/merges_timed/openzipkin/zipkin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -817,refs/remotes/origin/pull/3437,cc301700a10142e2d7f5f46da869c93197b58b4b,b121d46945d70759a1e1a330831c3085dc406d8b,070afe27beb2d9fa3ffd38780119fb63705534a6,,True,True,bf7714846c403c012dd78282285973c68203482a81c8540a7b472986f7656a09,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,True,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,0.0516207218170166,0.04362034797668457,0.013971090316772461,0.013147592544555664,0.013854503631591797,0.013248205184936523,0.01787114143371582,0.17997264862060547,0.052214860916137695,0.16550350189208984,0.16614747047424316,0.07423019409179688,0.028954744338989258,0.32126426696777344 +817,refs/remotes/origin/pull/3437,cc301700a10142e2d7f5f46da869c93197b58b4b,b121d46945d70759a1e1a330831c3085dc406d8b,070afe27beb2d9fa3ffd38780119fb63705534a6,,True,True,bf7714846c403c012dd78282285973c68203482a81c8540a7b472986f7656a09,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,True,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,0.0516207218170166,0.04362034797668457,0.013971090316772461,0.013147592544555664,0.013854503631591797,0.013248205184936523,0.01787114143371582,0.17997264862060547,0.052214860916137695,0.16301536560058594,0.1616075038909912,0.07423019409179688,0.028954744338989258,0.32126426696777344 diff --git a/results/combined/merges_timed/ops4j/org.ops4j.pax.swissbox.csv b/results/combined/merges_timed/ops4j/org.ops4j.pax.swissbox.csv index 944983ef51..e42a1ca903 100644 --- a/results/combined/merges_timed/ops4j/org.ops4j.pax.swissbox.csv +++ b/results/combined/merges_timed/ops4j/org.ops4j.pax.swissbox.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,22aec8b7af2d3e207cd3db06e71a7ed130c1ab49,a4a563b9b8227e617f88e56fd9219562caf81d70,916b285f03483c22cf58b7efaffac807259bfaf8,,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Tests_passed,ba04c9d476f7f588f34a228312991b3c38ba4d1fb01fb50b5a9c6117bcc959ba,Tests_passed,True,True,True,True,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Merge_failed,16fbd5da53165c279352ffe83f47f33b07e439773ed3f87280037c1286b7f807,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,dd6ac8bdd3e3f7f959a372421c972a664fcf0072b03605799779d6f4cc345f17,0.036847591400146484,0.037848472595214844,0.039073944091796875,0.03537940979003906,0.05757331848144531,0.0389862060546875,0.03901195526123047,0.15761876106262207,0.05935931205749512,0.16460013389587402,0.1636672019958496,0.11438775062561035,0.7093546390533447,0.20037198066711426 +9,refs/heads/master,22aec8b7af2d3e207cd3db06e71a7ed130c1ab49,a4a563b9b8227e617f88e56fd9219562caf81d70,916b285f03483c22cf58b7efaffac807259bfaf8,,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Tests_passed,ba04c9d476f7f588f34a228312991b3c38ba4d1fb01fb50b5a9c6117bcc959ba,Tests_passed,True,True,True,True,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Merge_failed,16fbd5da53165c279352ffe83f47f33b07e439773ed3f87280037c1286b7f807,Merge_failed,28ff7c83d6e55a594529a8fe46cd4d15333c29c55826cca8bf8ebfd830c3bf23,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,dd6ac8bdd3e3f7f959a372421c972a664fcf0072b03605799779d6f4cc345f17,0.036847591400146484,0.037848472595214844,0.039073944091796875,0.03537940979003906,0.05757331848144531,0.0389862060546875,0.03901195526123047,0.15761876106262207,0.05935931205749512,0.16286969184875488,0.16405630111694336,0.11438775062561035,0.7093546390533447,0.20037198066711426 diff --git a/results/combined/merges_timed/optimaize/language-detector.csv b/results/combined/merges_timed/optimaize/language-detector.csv index 8fd6f42c96..5686582c9e 100644 --- a/results/combined/merges_timed/optimaize/language-detector.csv +++ b/results/combined/merges_timed/optimaize/language-detector.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,3420609a2503b56ec82d0ef6fa3b3b642111b55f,a588b7fbac2d321697f16815c2dd4fc6f1d686e4,cbecb11909365f6e999af39554e7af855d2bd1db,,True,True,ce93c25b2e4b3f8d75011a0bef34e185a07a33c3bd2e8db5b78d7d80db5eea1e,Tests_passed,184934be0ba8bc2c54ef413acece0a5ff82ba2413cb2ec7c4301a14d897f732b,Tests_passed,True,True,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,0.044165849685668945,0.02484130859375,0.010926485061645508,0.046509742736816406,0.03673148155212402,0.01009368896484375,0.009894847869873047,0.14533305168151855,0.03838038444519043,0.1570751667022705,0.1823422908782959,0.09202194213867188,0.8287889957427979,0.19183564186096191 +7,refs/heads/master,3420609a2503b56ec82d0ef6fa3b3b642111b55f,a588b7fbac2d321697f16815c2dd4fc6f1d686e4,cbecb11909365f6e999af39554e7af855d2bd1db,,True,True,ce93c25b2e4b3f8d75011a0bef34e185a07a33c3bd2e8db5b78d7d80db5eea1e,Tests_passed,184934be0ba8bc2c54ef413acece0a5ff82ba2413cb2ec7c4301a14d897f732b,Tests_passed,True,True,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,0.044165849685668945,0.02484130859375,0.010926485061645508,0.046509742736816406,0.03673148155212402,0.01009368896484375,0.009894847869873047,0.14533305168151855,0.03838038444519043,0.17948055267333984,0.17903375625610352,0.09202194213867188,0.8287889957427979,0.19183564186096191 diff --git a/results/combined/merges_timed/orctom/was-maven-plugin.csv b/results/combined/merges_timed/orctom/was-maven-plugin.csv index 10f6163d5e..20208ee57d 100644 --- a/results/combined/merges_timed/orctom/was-maven-plugin.csv +++ b/results/combined/merges_timed/orctom/was-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,98acec132ed7b3670db4c82820dcf584e9f83354,b3267ad21ed199e657a05671480240e748357c36,81477d902b56176c611dadb875ce5da8c01fdad6,,True,True,29ef75aca47fe40811cd701b950dbf21975fdf682988feed5df5e90df1da8ec9,Tests_passed,3c3fe5a0e154f90251e15a2ac8600ce8fa979ff2a18f54bd6a5f2e15d3a6b7e2,Tests_passed,True,True,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,0.042169809341430664,0.037450313568115234,0.04598641395568848,0.03565073013305664,0.042571067810058594,0.044773101806640625,0.04275798797607422,0.16681814193725586,0.04141736030578613,0.14753460884094238,0.14851045608520508,0.11370038986206055,0.6157257556915283,0.18953275680541992 +7,refs/heads/master,98acec132ed7b3670db4c82820dcf584e9f83354,b3267ad21ed199e657a05671480240e748357c36,81477d902b56176c611dadb875ce5da8c01fdad6,,True,True,29ef75aca47fe40811cd701b950dbf21975fdf682988feed5df5e90df1da8ec9,Tests_passed,3c3fe5a0e154f90251e15a2ac8600ce8fa979ff2a18f54bd6a5f2e15d3a6b7e2,Tests_passed,True,True,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,0.042169809341430664,0.037450313568115234,0.04598641395568848,0.03565073013305664,0.042571067810058594,0.044773101806640625,0.04275798797607422,0.16681814193725586,0.04141736030578613,0.14536023139953613,0.14474201202392578,0.11370038986206055,0.6157257556915283,0.18953275680541992 diff --git a/results/combined/merges_timed/orien/bean-matchers.csv b/results/combined/merges_timed/orien/bean-matchers.csv index 454570c19a..9dd507d28c 100644 --- a/results/combined/merges_timed/orien/bean-matchers.csv +++ b/results/combined/merges_timed/orien/bean-matchers.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/main,258563a1b3e3ecac55c4d8c38742eaa1c019b7db,2eb1107603f2ee1ed902aa2874df09d30758f908,4280131224e1d2701288f3ca59413a17731fe2b4,,True,True,44c4c4811c450da3b46bcc1e8b8251da13e9f5ddb4c445f410023130bc1c5584,Tests_passed,b074acc1c25939184f4f865ca7f56e59e25cefeda93d825ba58594e10fcc6867,Tests_passed,True,True,Merge_failed,66783fbc5dfbf67cd5521caaf2a3d3fa8fb79b2c87215cfd8abcd214bcb5b611,Merge_failed,d0d8a6042a79c0fadc44a157873ff38a5c66b0036e144060805c9f18b517c8a2,Merge_failed,66783fbc5dfbf67cd5521caaf2a3d3fa8fb79b2c87215cfd8abcd214bcb5b611,Merge_failed,d0d8a6042a79c0fadc44a157873ff38a5c66b0036e144060805c9f18b517c8a2,Merge_failed,e59cc55c838fa22e10692eb832051477f06308858b2b4ab411aae1e6d3b7b283,Merge_failed,e59cc55c838fa22e10692eb832051477f06308858b2b4ab411aae1e6d3b7b283,Merge_failed,e59cc55c838fa22e10692eb832051477f06308858b2b4ab411aae1e6d3b7b283,Merge_failed,62ab30714986412816b5bf874bdedfbdc618d01f13a00cb82eaee7edcbce56d4,Merge_failed,66783fbc5dfbf67cd5521caaf2a3d3fa8fb79b2c87215cfd8abcd214bcb5b611,Merge_failed,26fa823d574f15c72c104a4ea094a94c72cc9164be2dff730b05a697532e38d7,Merge_failed,26fa823d574f15c72c104a4ea094a94c72cc9164be2dff730b05a697532e38d7,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Merge_failed,e04910370cd75e3979af1a85ec8945071341292d11d2785b6927cff5a363d5bd,0.05687856674194336,0.05084562301635742,0.05061745643615723,0.05538797378540039,0.056932687759399414,0.05561542510986328,0.049146413803100586,0.17970681190490723,0.07539200782775879,0.08787250518798828,0.08785557746887207,0.12222504615783691,0.6077532768249512,0.27905750274658203 +14,refs/heads/main,258563a1b3e3ecac55c4d8c38742eaa1c019b7db,2eb1107603f2ee1ed902aa2874df09d30758f908,4280131224e1d2701288f3ca59413a17731fe2b4,,True,True,44c4c4811c450da3b46bcc1e8b8251da13e9f5ddb4c445f410023130bc1c5584,Tests_passed,b074acc1c25939184f4f865ca7f56e59e25cefeda93d825ba58594e10fcc6867,Tests_passed,True,True,Merge_failed,66783fbc5dfbf67cd5521caaf2a3d3fa8fb79b2c87215cfd8abcd214bcb5b611,Merge_failed,d0d8a6042a79c0fadc44a157873ff38a5c66b0036e144060805c9f18b517c8a2,Merge_failed,66783fbc5dfbf67cd5521caaf2a3d3fa8fb79b2c87215cfd8abcd214bcb5b611,Merge_failed,d0d8a6042a79c0fadc44a157873ff38a5c66b0036e144060805c9f18b517c8a2,Merge_failed,e59cc55c838fa22e10692eb832051477f06308858b2b4ab411aae1e6d3b7b283,Merge_failed,e59cc55c838fa22e10692eb832051477f06308858b2b4ab411aae1e6d3b7b283,Merge_failed,e59cc55c838fa22e10692eb832051477f06308858b2b4ab411aae1e6d3b7b283,Merge_failed,62ab30714986412816b5bf874bdedfbdc618d01f13a00cb82eaee7edcbce56d4,Merge_failed,66783fbc5dfbf67cd5521caaf2a3d3fa8fb79b2c87215cfd8abcd214bcb5b611,Merge_failed,26fa823d574f15c72c104a4ea094a94c72cc9164be2dff730b05a697532e38d7,Merge_failed,26fa823d574f15c72c104a4ea094a94c72cc9164be2dff730b05a697532e38d7,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Merge_failed,e04910370cd75e3979af1a85ec8945071341292d11d2785b6927cff5a363d5bd,0.05687856674194336,0.05084562301635742,0.05061745643615723,0.05538797378540039,0.056932687759399414,0.05561542510986328,0.049146413803100586,0.17970681190490723,0.07539200782775879,0.08672451972961426,0.08694148063659668,0.12222504615783691,0.6077532768249512,0.27905750274658203 diff --git a/results/combined/merges_timed/orientechnologies/orientdb-etl.csv b/results/combined/merges_timed/orientechnologies/orientdb-etl.csv index 787340f02c..3d736fd06c 100644 --- a/results/combined/merges_timed/orientechnologies/orientdb-etl.csv +++ b/results/combined/merges_timed/orientechnologies/orientdb-etl.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,889e65b57d07559f507bcef0e966f6f0612ae9dd,976e3dfeee348acdffb27f3ff0f405aa4aa91891,9a1e630ba893b0fdbe95839bda9238cd89bd2183,,True,True,41176f373379e6bb5255cc76c94cc131f7189ac76923a9f81418c20c784c3554,Tests_passed,106bf5a5477aa831b6d33829c9d4386da75f4959f2b72ff88ac2dda1c8042091,Tests_passed,True,True,Merge_failed,395fff2a9358671e1bffb2141d6e293dd1bdf65a0fe34403b924c1e3cd5581e7,Merge_failed,eb1e16cea85772bc58e2361175e054632c8b3e993398e79f2de0cb6ab3c1ba8d,Merge_failed,395fff2a9358671e1bffb2141d6e293dd1bdf65a0fe34403b924c1e3cd5581e7,Merge_failed,0bff1c4c0a19bb8160c7e57ba6dc8d8a3599ea7b326c5e97251ec476ab22ae02,Merge_failed,2e5ab8528aeecde67da5fac64c04d01d82eb2bdbdac4fc317595d53790141fd9,Merge_failed,2e5ab8528aeecde67da5fac64c04d01d82eb2bdbdac4fc317595d53790141fd9,Merge_failed,705c4c9549eb1fae9e809d3460412153f22878443f1215334182b7d8777acfce,Merge_failed,4a836b100ee2d8add030b041d41d1033d60f7025973250961d77f674dc7fce15,Merge_failed,395fff2a9358671e1bffb2141d6e293dd1bdf65a0fe34403b924c1e3cd5581e7,Merge_failed,323cb726874e3793d418a66d07d7caee392263cd8ee5cde5799edd31f0b4a3ae,Merge_failed,323cb726874e3793d418a66d07d7caee392263cd8ee5cde5799edd31f0b4a3ae,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,2d04a3d9f05acb902530173e5d110e1c1a4fcc5d8c38576d39d483b80f60a979,Merge_failed,7bf27dddb965a28a12db02a0d512c9c7ade248c8264cea9e7968c6564d40af93,0.013128280639648438,0.013209342956542969,0.012944221496582031,0.013256072998046875,0.013128042221069336,0.013079404830932617,0.013139963150024414,0.08809709548950195,0.022492170333862305,0.5471067428588867,0.5377950668334961,0.30446934700012207,3.7994775772094727,0.20577049255371094 +1,refs/heads/master,889e65b57d07559f507bcef0e966f6f0612ae9dd,976e3dfeee348acdffb27f3ff0f405aa4aa91891,9a1e630ba893b0fdbe95839bda9238cd89bd2183,,True,True,41176f373379e6bb5255cc76c94cc131f7189ac76923a9f81418c20c784c3554,Tests_passed,106bf5a5477aa831b6d33829c9d4386da75f4959f2b72ff88ac2dda1c8042091,Tests_passed,True,True,Merge_failed,395fff2a9358671e1bffb2141d6e293dd1bdf65a0fe34403b924c1e3cd5581e7,Merge_failed,eb1e16cea85772bc58e2361175e054632c8b3e993398e79f2de0cb6ab3c1ba8d,Merge_failed,395fff2a9358671e1bffb2141d6e293dd1bdf65a0fe34403b924c1e3cd5581e7,Merge_failed,0bff1c4c0a19bb8160c7e57ba6dc8d8a3599ea7b326c5e97251ec476ab22ae02,Merge_failed,2e5ab8528aeecde67da5fac64c04d01d82eb2bdbdac4fc317595d53790141fd9,Merge_failed,2e5ab8528aeecde67da5fac64c04d01d82eb2bdbdac4fc317595d53790141fd9,Merge_failed,705c4c9549eb1fae9e809d3460412153f22878443f1215334182b7d8777acfce,Merge_failed,4a836b100ee2d8add030b041d41d1033d60f7025973250961d77f674dc7fce15,Merge_failed,395fff2a9358671e1bffb2141d6e293dd1bdf65a0fe34403b924c1e3cd5581e7,Merge_failed,323cb726874e3793d418a66d07d7caee392263cd8ee5cde5799edd31f0b4a3ae,Merge_failed,323cb726874e3793d418a66d07d7caee392263cd8ee5cde5799edd31f0b4a3ae,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,2d04a3d9f05acb902530173e5d110e1c1a4fcc5d8c38576d39d483b80f60a979,Merge_failed,7bf27dddb965a28a12db02a0d512c9c7ade248c8264cea9e7968c6564d40af93,0.013128280639648438,0.013209342956542969,0.012944221496582031,0.013256072998046875,0.013128042221069336,0.013079404830932617,0.013139963150024414,0.08809709548950195,0.022492170333862305,0.5489428043365479,0.5470316410064697,0.30446934700012207,3.7994775772094727,0.20577049255371094 diff --git a/results/combined/merges_timed/oripa/oripa.csv b/results/combined/merges_timed/oripa/oripa.csv index 2456a7247d..0254fbb2ac 100644 --- a/results/combined/merges_timed/oripa/oripa.csv +++ b/results/combined/merges_timed/oripa/oripa.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -53,refs/heads/master,25e1fea57c97de9aa64f142cda6b22ed297dbc41,930f2deaaafe7efcf267b3f7e852b6d5ac1bbf7f,82115e639094e2344560ce153a01db190704cc2e,,True,True,c6e140ef4dd3f47fbc5c3996d529e906ab6026b45e597f582094faaf6af31e9b,Tests_passed,d4e91e2455f29039364addf890e824c193b4044c28826cef1a358adf584867cd,Tests_passed,True,True,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,0.03892326354980469,0.05414319038391113,0.062259674072265625,0.05934023857116699,0.05315566062927246,0.05780172348022461,0.053087711334228516,0.20013022422790527,0.04147815704345703,0.1885054111480713,0.18864178657531738,0.12045001983642578,1.87746000289917,0.29015660285949707 +53,refs/heads/master,25e1fea57c97de9aa64f142cda6b22ed297dbc41,930f2deaaafe7efcf267b3f7e852b6d5ac1bbf7f,82115e639094e2344560ce153a01db190704cc2e,,True,True,c6e140ef4dd3f47fbc5c3996d529e906ab6026b45e597f582094faaf6af31e9b,Tests_passed,d4e91e2455f29039364addf890e824c193b4044c28826cef1a358adf584867cd,Tests_passed,True,True,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,0.03892326354980469,0.05414319038391113,0.062259674072265625,0.05934023857116699,0.05315566062927246,0.05780172348022461,0.053087711334228516,0.20013022422790527,0.04147815704345703,0.1962594985961914,0.18403983116149902,0.12045001983642578,1.87746000289917,0.29015660285949707 diff --git a/results/combined/merges_timed/oskopek/javaanpr.csv b/results/combined/merges_timed/oskopek/javaanpr.csv index 833a41d3bd..a4d99f87be 100644 --- a/results/combined/merges_timed/oskopek/javaanpr.csv +++ b/results/combined/merges_timed/oskopek/javaanpr.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,d8e3efe215d03370603b5f74c2cde7761bda9eec,8738dcd19876a92ef2f84746471bd9df055ed0c8,6f1735d0c9d701c91cbf76ced9f2ebdd211ab8ed,,True,True,2ebc928da4059bbb6123846d0c5a53eb9a351bcbe3a3c275da92b883bf88450b,Tests_passed,5d84845fc36fb3b254ef9317230a76e3260857a09fbd8f445e49ec9b5e3b40f1,Tests_passed,True,True,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,de677c57f8faedfa60a9c8c5c1009a1b0cd7c65d0bc7bbf5f4977d77a31af2df,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,82e569145dfd359466d3e3c5a7b8fca75bd3c0b47ada569695107d4dbcefde36,Merge_failed,82e569145dfd359466d3e3c5a7b8fca75bd3c0b47ada569695107d4dbcefde36,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,07ef5c870a0364d195ebeea99362bc7bfac27a9cb4d11cccf96deeac869a9471,Merge_failed,07ef5c870a0364d195ebeea99362bc7bfac27a9cb4d11cccf96deeac869a9471,0.05127120018005371,0.051033735275268555,0.061676025390625,0.010232686996459961,0.06185483932495117,0.06167292594909668,0.06154346466064453,0.10267281532287598,0.020415306091308594,0.0652151107788086,0.10657691955566406,0.11104345321655273,0.05410504341125488,0.22982144355773926 +20,refs/heads/master,d8e3efe215d03370603b5f74c2cde7761bda9eec,8738dcd19876a92ef2f84746471bd9df055ed0c8,6f1735d0c9d701c91cbf76ced9f2ebdd211ab8ed,,True,True,2ebc928da4059bbb6123846d0c5a53eb9a351bcbe3a3c275da92b883bf88450b,Tests_passed,5d84845fc36fb3b254ef9317230a76e3260857a09fbd8f445e49ec9b5e3b40f1,Tests_passed,True,True,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,de677c57f8faedfa60a9c8c5c1009a1b0cd7c65d0bc7bbf5f4977d77a31af2df,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,82e569145dfd359466d3e3c5a7b8fca75bd3c0b47ada569695107d4dbcefde36,Merge_failed,82e569145dfd359466d3e3c5a7b8fca75bd3c0b47ada569695107d4dbcefde36,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,07ef5c870a0364d195ebeea99362bc7bfac27a9cb4d11cccf96deeac869a9471,Merge_failed,07ef5c870a0364d195ebeea99362bc7bfac27a9cb4d11cccf96deeac869a9471,0.05127120018005371,0.051033735275268555,0.061676025390625,0.010232686996459961,0.06185483932495117,0.06167292594909668,0.06154346466064453,0.10267281532287598,0.020415306091308594,0.10833144187927246,0.1072390079498291,0.11104345321655273,0.05410504341125488,0.22982144355773926 diff --git a/results/combined/merges_timed/outbrain/ob1k.csv b/results/combined/merges_timed/outbrain/ob1k.csv index d5c6ca7598..62c315e246 100644 --- a/results/combined/merges_timed/outbrain/ob1k.csv +++ b/results/combined/merges_timed/outbrain/ob1k.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -65,refs/heads/master,8b2c257efe1aa01d49cc595d4af6f8d386d9b535,95c48c0fde2cbf37c4f074a0f38201acd2c7eae2,59da0517716f701678301ecb4cdb88f7046c8d26,,True,True,f145b2ae80a7ea5341bcb8457cd401440a0ff2199a11922d2a1341dcb7cd270d,Tests_passed,a6a20fdb76c4dd47788113f767bd7d533858319364d44fda4211f89eca78d96d,Tests_passed,True,True,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,460c06e1d80c310d8283982ab2e16bcdbe37306d56ab7682870a5938fad5d53b,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,703c714d0beb4c3dc91b5b4dd2ed262fd6f89032635641fc68cad9b7a32a18fe,Merge_failed,703c714d0beb4c3dc91b5b4dd2ed262fd6f89032635641fc68cad9b7a32a18fe,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,4d69243853cd7bb4a39daa9eed68b1dec4c9b7e4e3dfc5541fe8ea0111c142d1,0.02040243148803711,0.020055532455444336,0.013815879821777344,0.022133588790893555,0.02260112762451172,0.014535903930664062,0.02242302894592285,0.05239534378051758,0.026862144470214844,0.0772252082824707,0.06907796859741211,0.08128786087036133,0.504547119140625,0.25948548316955566 +65,refs/heads/master,8b2c257efe1aa01d49cc595d4af6f8d386d9b535,95c48c0fde2cbf37c4f074a0f38201acd2c7eae2,59da0517716f701678301ecb4cdb88f7046c8d26,,True,True,f145b2ae80a7ea5341bcb8457cd401440a0ff2199a11922d2a1341dcb7cd270d,Tests_passed,a6a20fdb76c4dd47788113f767bd7d533858319364d44fda4211f89eca78d96d,Tests_passed,True,True,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,460c06e1d80c310d8283982ab2e16bcdbe37306d56ab7682870a5938fad5d53b,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,703c714d0beb4c3dc91b5b4dd2ed262fd6f89032635641fc68cad9b7a32a18fe,Merge_failed,703c714d0beb4c3dc91b5b4dd2ed262fd6f89032635641fc68cad9b7a32a18fe,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,4d69243853cd7bb4a39daa9eed68b1dec4c9b7e4e3dfc5541fe8ea0111c142d1,0.02040243148803711,0.020055532455444336,0.013815879821777344,0.022133588790893555,0.02260112762451172,0.014535903930664062,0.02242302894592285,0.05239534378051758,0.026862144470214844,0.07661604881286621,0.0753626823425293,0.08128786087036133,0.504547119140625,0.25948548316955566 diff --git a/results/combined/merges_timed/overturetool/overture.csv b/results/combined/merges_timed/overturetool/overture.csv index 05dcdcbe8f..3f1342c220 100644 --- a/results/combined/merges_timed/overturetool/overture.csv +++ b/results/combined/merges_timed/overturetool/overture.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -28,refs/heads/development,183044a608970fa550c097fdd98216a182cc895d,e26838e2314cf90205c0a7ce585ff32e36e094c7,b74341db16ec8531f59a05cf585979e5fee8787f,,True,True,d858bc6f5d2452adc0be0ae78cde16890176b452dd14798e88f6cb5f6c4de24f,Tests_passed,45a87b3dfd9994dafc029a2f3e20f0f9042725ff9f06e5d3b283fb6260ff2feb,Tests_passed,True,True,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,0.09988856315612793,0.10146570205688477,0.12189722061157227,0.12436246871948242,0.12240982055664062,0.1214902400970459,0.1262073516845703,0.40166163444519043,0.1004340648651123,1.8756623268127441,1.8789548873901367,0.6319694519042969,0.10422801971435547,5.365729331970215 +28,refs/heads/development,183044a608970fa550c097fdd98216a182cc895d,e26838e2314cf90205c0a7ce585ff32e36e094c7,b74341db16ec8531f59a05cf585979e5fee8787f,,True,True,d858bc6f5d2452adc0be0ae78cde16890176b452dd14798e88f6cb5f6c4de24f,Tests_passed,45a87b3dfd9994dafc029a2f3e20f0f9042725ff9f06e5d3b283fb6260ff2feb,Tests_passed,True,True,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,0.09988856315612793,0.10146570205688477,0.12189722061157227,0.12436246871948242,0.12240982055664062,0.1214902400970459,0.1262073516845703,0.40166163444519043,0.1004340648651123,1.8474071025848389,1.8531596660614014,0.6319694519042969,0.10422801971435547,5.365729331970215 diff --git a/results/combined/merges_timed/oxo42/stateless4j.csv b/results/combined/merges_timed/oxo42/stateless4j.csv index c3483a20b7..1187e4401f 100644 --- a/results/combined/merges_timed/oxo42/stateless4j.csv +++ b/results/combined/merges_timed/oxo42/stateless4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,7024c77da6e879210442dfc38327f1aac8d00916,57c2134c01d9d66e19410f0322c8ca9a9f362ca5,6b6dd4a788a4eb9d3e0542634cf1fc587d1fb58b,,True,True,c892f00d53dd4912601be5883ccc7fe003935a44842ff932d18d3dc04e919c09,Tests_passed,5f23ce7410ccecc5c86db3beee1764ef814b107abe899af96c8e446eb23d936f,Tests_passed,True,True,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,f27ed3b1992c9fdcb18968c4516d883587373285982a64d1058e357b00ca6727,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,017001bd380723ee2a497f93c893ec6fd61117eecfc62604f6b33759fc8af136,Merge_failed,017001bd380723ee2a497f93c893ec6fd61117eecfc62604f6b33759fc8af136,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,0808ce0f2744120173ffb2a40826bb334aa123c2fb6adc4f797a4ae3694d5d7f,0.013473033905029297,0.03914332389831543,0.011664390563964844,0.047911882400512695,0.04710578918457031,0.04133200645446777,0.04819345474243164,0.0589754581451416,0.07100677490234375,0.22668910026550293,0.21969890594482422,0.15472054481506348,1.7773280143737793,0.21730899810791016 +2,refs/heads/master,7024c77da6e879210442dfc38327f1aac8d00916,57c2134c01d9d66e19410f0322c8ca9a9f362ca5,6b6dd4a788a4eb9d3e0542634cf1fc587d1fb58b,,True,True,c892f00d53dd4912601be5883ccc7fe003935a44842ff932d18d3dc04e919c09,Tests_passed,5f23ce7410ccecc5c86db3beee1764ef814b107abe899af96c8e446eb23d936f,Tests_passed,True,True,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,f27ed3b1992c9fdcb18968c4516d883587373285982a64d1058e357b00ca6727,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,017001bd380723ee2a497f93c893ec6fd61117eecfc62604f6b33759fc8af136,Merge_failed,017001bd380723ee2a497f93c893ec6fd61117eecfc62604f6b33759fc8af136,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,0808ce0f2744120173ffb2a40826bb334aa123c2fb6adc4f797a4ae3694d5d7f,0.013473033905029297,0.03914332389831543,0.011664390563964844,0.047911882400512695,0.04710578918457031,0.04133200645446777,0.04819345474243164,0.0589754581451416,0.07100677490234375,0.2161548137664795,0.2268354892730713,0.15472054481506348,1.7773280143737793,0.21730899810791016 diff --git a/results/combined/merges_timed/pablissimo/sonartsplugin.csv b/results/combined/merges_timed/pablissimo/sonartsplugin.csv index 260a1c798e..abb32a6709 100644 --- a/results/combined/merges_timed/pablissimo/sonartsplugin.csv +++ b/results/combined/merges_timed/pablissimo/sonartsplugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,21c5ac9cfd807b5575685ea58ea31f243afeb018,83fb48d7c14e86b310a38ae7b59201678db9583a,63c9fea3fce9e42d6c1303ee4cd1e05ea53fe9ba,,True,True,272cf78fa4a833425a7668420e3a1393a4a21114b99b4b15b8641947d840e296,Tests_passed,05e66d8eeae44e91d5493390c40e15d5df73852c230dbbdd2d7a6b59f72eba1e,Tests_passed,True,True,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,f8011f3261e21fe035c7449dac46cd0fef389a7e7b1eea43c33229d8afe33c1c,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,e9ff7611659e133b1730900363aff4d8335067e2096cc1410b822b1fabec200a,Merge_failed,a06c3af1448702c4f4c88b072cd3014d952b276cf62029d4715fc96216d869de,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,85c6007d783c4b71caf76e22e7cb94b84b46e69834b9dada237c3879dd2942d4,Merge_failed,85c6007d783c4b71caf76e22e7cb94b84b46e69834b9dada237c3879dd2942d4,Merge_failed,6c57d66728ef2eea131c2abf90e90c740dcac5c31ebc54b728387ebdb3d9041b,Tests_failed,886646bf8a6d0aa492a5c533919b4e5d75e9d8f016f389a38370e6ffe38b9828,Merge_failed,66aff4927abec456854ded97b6a517f572837b04bf6b258de05ac5e20ab240c9,0.01019597053527832,0.01032876968383789,0.01031041145324707,0.01037740707397461,0.010779380798339844,0.010555505752563477,0.010591268539428711,0.07050776481628418,0.017496109008789062,0.4624292850494385,0.46433544158935547,0.2378370761871338,3.1889634132385254,0.18998932838439941 +13,refs/heads/master,21c5ac9cfd807b5575685ea58ea31f243afeb018,83fb48d7c14e86b310a38ae7b59201678db9583a,63c9fea3fce9e42d6c1303ee4cd1e05ea53fe9ba,,True,True,272cf78fa4a833425a7668420e3a1393a4a21114b99b4b15b8641947d840e296,Tests_passed,05e66d8eeae44e91d5493390c40e15d5df73852c230dbbdd2d7a6b59f72eba1e,Tests_passed,True,True,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,f8011f3261e21fe035c7449dac46cd0fef389a7e7b1eea43c33229d8afe33c1c,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,e9ff7611659e133b1730900363aff4d8335067e2096cc1410b822b1fabec200a,Merge_failed,a06c3af1448702c4f4c88b072cd3014d952b276cf62029d4715fc96216d869de,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,85c6007d783c4b71caf76e22e7cb94b84b46e69834b9dada237c3879dd2942d4,Merge_failed,85c6007d783c4b71caf76e22e7cb94b84b46e69834b9dada237c3879dd2942d4,Merge_failed,6c57d66728ef2eea131c2abf90e90c740dcac5c31ebc54b728387ebdb3d9041b,Tests_failed,886646bf8a6d0aa492a5c533919b4e5d75e9d8f016f389a38370e6ffe38b9828,Merge_failed,66aff4927abec456854ded97b6a517f572837b04bf6b258de05ac5e20ab240c9,0.01019597053527832,0.01032876968383789,0.01031041145324707,0.01037740707397461,0.010779380798339844,0.010555505752563477,0.010591268539428711,0.07050776481628418,0.017496109008789062,0.46213579177856445,0.46640682220458984,0.2378370761871338,3.1889634132385254,0.18998932838439941 diff --git a/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv b/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv index 3ba422ac36..b2e5d86762 100644 --- a/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv +++ b/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,8182846c13c90ee486dbbe62bec51705e8fd3f83,8961063ccaebbcb71e3ea627ab90a8c25bcdd75b,be523bc4b471c78a89108bffc9c3f7bf88cdf69c,,True,True,c82ff8a978d8c2c2ffcda1ea65c82c082dfbf2206a8352126a7034eb8550cd02,Tests_passed,b8cbe942156d6c5c0d7d6015d59acfee188dc713b4f283f6fd03906c520f83ef,Tests_passed,True,True,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,0.040831804275512695,0.041558265686035156,0.05763840675354004,0.02368450164794922,0.05775141716003418,0.02333521842956543,0.05723166465759277,0.05316472053527832,0.04219794273376465,0.19396281242370605,0.18859505653381348,0.07686138153076172,0.9904115200042725,0.3719148635864258 +3,refs/heads/master,8182846c13c90ee486dbbe62bec51705e8fd3f83,8961063ccaebbcb71e3ea627ab90a8c25bcdd75b,be523bc4b471c78a89108bffc9c3f7bf88cdf69c,,True,True,c82ff8a978d8c2c2ffcda1ea65c82c082dfbf2206a8352126a7034eb8550cd02,Tests_passed,b8cbe942156d6c5c0d7d6015d59acfee188dc713b4f283f6fd03906c520f83ef,Tests_passed,True,True,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,0.040831804275512695,0.041558265686035156,0.05763840675354004,0.02368450164794922,0.05775141716003418,0.02333521842956543,0.05723166465759277,0.05316472053527832,0.04219794273376465,0.1876537799835205,0.1864454746246338,0.07686138153076172,0.9904115200042725,0.3719148635864258 diff --git a/results/combined/merges_timed/pandcorps/pandam.csv b/results/combined/merges_timed/pandcorps/pandam.csv index c614b4ad10..af79df102a 100644 --- a/results/combined/merges_timed/pandcorps/pandam.csv +++ b/results/combined/merges_timed/pandcorps/pandam.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/remotes/origin/pull/4,e736609b61dd04e3f96861471d01ae60cc1a2a17,30964f94cc1b51cbcce298f904db4b8ffe4e4b92,75dbac355e592d1e833162770e5a10dcd855a6f7,,True,True,4163be707dba47263e222b36826e25c78ec7591130d0e139cc7b76c376f2b871,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,True,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,0.04679727554321289,0.050315141677856445,0.06716060638427734,0.06342411041259766,0.06045174598693848,0.04166388511657715,0.0744321346282959,0.20893239974975586,0.07489728927612305,0.207550048828125,0.2077038288116455,0.12561917304992676,2.8711061477661133,0.30565738677978516 +20,refs/remotes/origin/pull/4,e736609b61dd04e3f96861471d01ae60cc1a2a17,30964f94cc1b51cbcce298f904db4b8ffe4e4b92,75dbac355e592d1e833162770e5a10dcd855a6f7,,True,True,4163be707dba47263e222b36826e25c78ec7591130d0e139cc7b76c376f2b871,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,True,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,0.04679727554321289,0.050315141677856445,0.06716060638427734,0.06342411041259766,0.06045174598693848,0.04166388511657715,0.0744321346282959,0.20893239974975586,0.07489728927612305,0.2109086513519287,0.20564007759094238,0.12561917304992676,2.8711061477661133,0.30565738677978516 diff --git a/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv b/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv index 10ba87ea91..994bfa77b7 100644 --- a/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv +++ b/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,3ce571f04ef9f3edd662c1de88ce5031fe700fd5,6d92e44549d058b29ab9d5364655d07ed522cbe1,0229efddf3f332210b4ca3f071e3d0d0160ba39a,,28c8f53d23357fbb6114098f4789b14497f750ef57c8e179ffe9ff98c44e1961,Tests_passed,24b23da3ffa9aaca3c8f982daf70d7b1babe0d27de17607e60c692f678e2bd3f,Tests_passed,True,True,True,True,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,0.03734540939331055,0.03682994842529297,0.03758955001831055,0.03486919403076172,0.04068350791931152,0.03925800323486328,0.036895036697387695,0.10448431968688965,0.03913426399230957,0.15614748001098633,0.1566603183746338,0.11121034622192383,0.7201402187347412,0.15545010566711426 +1,refs/heads/master,3ce571f04ef9f3edd662c1de88ce5031fe700fd5,6d92e44549d058b29ab9d5364655d07ed522cbe1,0229efddf3f332210b4ca3f071e3d0d0160ba39a,,28c8f53d23357fbb6114098f4789b14497f750ef57c8e179ffe9ff98c44e1961,Tests_passed,24b23da3ffa9aaca3c8f982daf70d7b1babe0d27de17607e60c692f678e2bd3f,Tests_passed,True,True,True,True,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,0.03734540939331055,0.03682994842529297,0.03758955001831055,0.03486919403076172,0.04068350791931152,0.03925800323486328,0.036895036697387695,0.10448431968688965,0.03913426399230957,0.15464520454406738,0.15435481071472168,0.11121034622192383,0.7201402187347412,0.15545010566711426 diff --git a/results/combined/merges_timed/paulosuzart/jtornado.csv b/results/combined/merges_timed/paulosuzart/jtornado.csv index 7c256d5c16..05f4ab5af0 100644 --- a/results/combined/merges_timed/paulosuzart/jtornado.csv +++ b/results/combined/merges_timed/paulosuzart/jtornado.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,9422d8460228615b9a4e005a44ee70d022eab1e4,cf843699996539a0fc61bdaa6854ff4f65ffabff,e6790e95d502a20445aad19b2770ff36ea365932,,True,True,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,5d294e257ae9233daf5b86ddcae1d21da2ff5f30a14d8e0ac82af6b70328c26d,Tests_passed,True,True,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,152a1d15a19594fc1752345a6912ab253d866815521d8a04586581eb62a3c5ae,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,eebee9ef0c90b6591bf847bb6b1ba7b423d742fdf0f48b51e876602846172a3c,Merge_failed,eebee9ef0c90b6591bf847bb6b1ba7b423d742fdf0f48b51e876602846172a3c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Merge_failed,e6762b1142082acb13705e80d07f486c4fd4277f8dce96b436dcf9ddde5205f8,0.039136409759521484,0.042028188705444336,0.037821054458618164,0.043111324310302734,0.03915047645568848,0.03924441337585449,0.031238317489624023,0.16216182708740234,0.06323075294494629,0.07335710525512695,0.07380247116088867,0.1154944896697998,1.0975360870361328,0.1806926727294922 +3,refs/heads/master,9422d8460228615b9a4e005a44ee70d022eab1e4,cf843699996539a0fc61bdaa6854ff4f65ffabff,e6790e95d502a20445aad19b2770ff36ea365932,,True,True,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,5d294e257ae9233daf5b86ddcae1d21da2ff5f30a14d8e0ac82af6b70328c26d,Tests_passed,True,True,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,152a1d15a19594fc1752345a6912ab253d866815521d8a04586581eb62a3c5ae,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,eebee9ef0c90b6591bf847bb6b1ba7b423d742fdf0f48b51e876602846172a3c,Merge_failed,eebee9ef0c90b6591bf847bb6b1ba7b423d742fdf0f48b51e876602846172a3c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Merge_failed,e6762b1142082acb13705e80d07f486c4fd4277f8dce96b436dcf9ddde5205f8,0.039136409759521484,0.042028188705444336,0.037821054458618164,0.043111324310302734,0.03915047645568848,0.03924441337585449,0.031238317489624023,0.16216182708740234,0.06323075294494629,0.07193803787231445,0.07218551635742188,0.1154944896697998,1.0975360870361328,0.1806926727294922 diff --git a/results/combined/merges_timed/pax95/camel-ironmq.csv b/results/combined/merges_timed/pax95/camel-ironmq.csv index c82ee37848..e70f7fa287 100644 --- a/results/combined/merges_timed/pax95/camel-ironmq.csv +++ b/results/combined/merges_timed/pax95/camel-ironmq.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,7b8e755aa410ddd2841a5471f78bf5256a647b76,99829bacd2e267749b108a0f43d791aff9c73961,2f1b5ad99c6b72f8e20e336c7d3dd2dc1b65abf2,,e4f3b91ad8e832a90f5c2b0148860f7e21b51b0706800fc2741d9a5baaecdd36,Tests_passed,98bcac037fb4c79e39fa1777ec31e445378cbff424321345108d18c5f41bd722,Tests_passed,True,True,True,True,Merge_failed,d671450f69c0b84ae807de6d24b7c3951ebebe7520737e88bf60a1b1b04f800c,Merge_failed,41ef6953d46279696ad0aa9ab44e65128e6bd7ff230cee64b80347036b8978f6,Merge_failed,d671450f69c0b84ae807de6d24b7c3951ebebe7520737e88bf60a1b1b04f800c,Merge_failed,bbe687d43d44ee4922b430cd9321c10e46832c2503a3a0d7c1c1e4c89e7f6a11,Merge_failed,a5f40424a05f4c20baf5125f883982ed7a3f19793698722ce8c04d24621e0714,Merge_failed,a5f40424a05f4c20baf5125f883982ed7a3f19793698722ce8c04d24621e0714,Merge_failed,d671450f69c0b84ae807de6d24b7c3951ebebe7520737e88bf60a1b1b04f800c,Merge_failed,0c46ff6eeeba046394b21d42591e1131de91d22bd678acb5f0bb20f4bfe063ca,Merge_failed,d671450f69c0b84ae807de6d24b7c3951ebebe7520737e88bf60a1b1b04f800c,Merge_failed,739fecc530463e8511e7eb2dc770cb6a6f6ca484b804cc7df87936813f5d3695,Merge_failed,947f08f17597776bf7dae5f109e067f34e535caa135e8e4ecc0ef493a0e6670b,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,e058ee915396897c34c409293d8be54f2f52936fd2925fc9fd348f30f3660bfd,Merge_failed,8e5c76fd46add4ac468e9323562bcb40462ba2485ffb92079649c0bdf1a30df1,0.009878158569335938,0.0095977783203125,0.009421110153198242,0.00876307487487793,0.008942127227783203,0.008879661560058594,0.008962154388427734,0.07873725891113281,0.019568681716918945,0.41300106048583984,0.41403865814208984,0.2902796268463135,2.179783344268799,0.16744518280029297 +1,refs/heads/master,7b8e755aa410ddd2841a5471f78bf5256a647b76,99829bacd2e267749b108a0f43d791aff9c73961,2f1b5ad99c6b72f8e20e336c7d3dd2dc1b65abf2,,e4f3b91ad8e832a90f5c2b0148860f7e21b51b0706800fc2741d9a5baaecdd36,Tests_passed,98bcac037fb4c79e39fa1777ec31e445378cbff424321345108d18c5f41bd722,Tests_passed,True,True,True,True,Merge_failed,d671450f69c0b84ae807de6d24b7c3951ebebe7520737e88bf60a1b1b04f800c,Merge_failed,41ef6953d46279696ad0aa9ab44e65128e6bd7ff230cee64b80347036b8978f6,Merge_failed,d671450f69c0b84ae807de6d24b7c3951ebebe7520737e88bf60a1b1b04f800c,Merge_failed,bbe687d43d44ee4922b430cd9321c10e46832c2503a3a0d7c1c1e4c89e7f6a11,Merge_failed,a5f40424a05f4c20baf5125f883982ed7a3f19793698722ce8c04d24621e0714,Merge_failed,a5f40424a05f4c20baf5125f883982ed7a3f19793698722ce8c04d24621e0714,Merge_failed,d671450f69c0b84ae807de6d24b7c3951ebebe7520737e88bf60a1b1b04f800c,Merge_failed,0c46ff6eeeba046394b21d42591e1131de91d22bd678acb5f0bb20f4bfe063ca,Merge_failed,d671450f69c0b84ae807de6d24b7c3951ebebe7520737e88bf60a1b1b04f800c,Merge_failed,739fecc530463e8511e7eb2dc770cb6a6f6ca484b804cc7df87936813f5d3695,Merge_failed,947f08f17597776bf7dae5f109e067f34e535caa135e8e4ecc0ef493a0e6670b,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,e058ee915396897c34c409293d8be54f2f52936fd2925fc9fd348f30f3660bfd,Merge_failed,8e5c76fd46add4ac468e9323562bcb40462ba2485ffb92079649c0bdf1a30df1,0.009878158569335938,0.0095977783203125,0.009421110153198242,0.00876307487487793,0.008942127227783203,0.008879661560058594,0.008962154388427734,0.07873725891113281,0.019568681716918945,0.41526269912719727,0.4125630855560303,0.2902796268463135,2.179783344268799,0.16744518280029297 diff --git a/results/combined/merges_timed/pedrovgs/algorithms.csv b/results/combined/merges_timed/pedrovgs/algorithms.csv index e3aa23b7c1..12e58a93ce 100644 --- a/results/combined/merges_timed/pedrovgs/algorithms.csv +++ b/results/combined/merges_timed/pedrovgs/algorithms.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,f19931ca02a3dea15a502859251c2361252bf79b80945ff12a235522b5421e4d,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,0.03966784477233887,0.045026302337646484,0.026703596115112305,0.030169010162353516,0.03470635414123535,0.014301300048828125,0.04409193992614746,0.2263469696044922,0.07664608955383301,0.15924620628356934,0.15944790840148926,0.16540098190307617,0.8052289485931396,0.18524503707885742 +19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,f19931ca02a3dea15a502859251c2361252bf79b80945ff12a235522b5421e4d,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,0.03966784477233887,0.045026302337646484,0.026703596115112305,0.030169010162353516,0.03470635414123535,0.014301300048828125,0.04409193992614746,0.2263469696044922,0.07664608955383301,0.15964102745056152,0.15875744819641113,0.16540098190307617,0.8052289485931396,0.18524503707885742 diff --git a/results/combined/merges_timed/peterisp/morphology.csv b/results/combined/merges_timed/peterisp/morphology.csv index e0ffe132b6..28fbb0286e 100644 --- a/results/combined/merges_timed/peterisp/morphology.csv +++ b/results/combined/merges_timed/peterisp/morphology.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,a6926c1c59e119a57a1b37a5a896bddb02cd5ef9,fc238776a6699ed0e57b7a2660b05020c80fb170,100aa04cee519d67271e308427467c03d852ad8c,,86456b028f28be961d7e6ebeb547e6b33ffdf27b7d2f02f080b813d071368865,Tests_passed,11a7cb449fc3a5d86fc81f324fca40bef6f0fb929604e610fe2901494bd30dc8,Tests_passed,True,True,True,True,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,1fadf64544c6e26caead6e333ef5e344dbc4538309cc952e6b78394cd3da381c,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,aa1f845ce74d40b7c0215f603dc0ab92344cfe3ad5ef6d99c5cab66d4515b929,Merge_failed,aa1f845ce74d40b7c0215f603dc0ab92344cfe3ad5ef6d99c5cab66d4515b929,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Merge_failed,e0ca52e6e15dec7f64eee1ca33c239940e113770702f47246f6a36d1fb79f3ec,0.414808988571167,0.4120800495147705,0.47051215171813965,0.4759857654571533,0.48722004890441895,0.48494553565979004,0.47371888160705566,0.6412079334259033,0.47696995735168457,0.5528442859649658,0.5480961799621582,0.469799280166626,3.270989418029785,1.8204009532928467 +4,refs/heads/master,a6926c1c59e119a57a1b37a5a896bddb02cd5ef9,fc238776a6699ed0e57b7a2660b05020c80fb170,100aa04cee519d67271e308427467c03d852ad8c,,86456b028f28be961d7e6ebeb547e6b33ffdf27b7d2f02f080b813d071368865,Tests_passed,11a7cb449fc3a5d86fc81f324fca40bef6f0fb929604e610fe2901494bd30dc8,Tests_passed,True,True,True,True,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,1fadf64544c6e26caead6e333ef5e344dbc4538309cc952e6b78394cd3da381c,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,aa1f845ce74d40b7c0215f603dc0ab92344cfe3ad5ef6d99c5cab66d4515b929,Merge_failed,aa1f845ce74d40b7c0215f603dc0ab92344cfe3ad5ef6d99c5cab66d4515b929,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Merge_failed,e0ca52e6e15dec7f64eee1ca33c239940e113770702f47246f6a36d1fb79f3ec,0.414808988571167,0.4120800495147705,0.47051215171813965,0.4759857654571533,0.48722004890441895,0.48494553565979004,0.47371888160705566,0.6412079334259033,0.47696995735168457,0.5144405364990234,0.5115900039672852,0.469799280166626,3.270989418029785,1.8204009532928467 diff --git a/results/combined/merges_timed/petitparser/java-petitparser.csv b/results/combined/merges_timed/petitparser/java-petitparser.csv index 10ab3450cf..ae9c913474 100644 --- a/results/combined/merges_timed/petitparser/java-petitparser.csv +++ b/results/combined/merges_timed/petitparser/java-petitparser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,Tests_passed,True,True,True,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,b9409c9a6ce2e440f7a37c1038d7ce4f40df7a40ce1a0e0011480efb3c02bdb6,Merge_failed,b9409c9a6ce2e440f7a37c1038d7ce4f40df7a40ce1a0e0011480efb3c02bdb6,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,65fe63f9cfb6d201cdb21c20b260b20b76a721b163b0ff5dfd35245e653887fe,0.039159297943115234,0.04037356376647949,0.04064679145812988,0.015861988067626953,0.04466891288757324,0.033734798431396484,0.01953268051147461,0.30957603454589844,0.06604170799255371,0.33998680114746094,0.34033823013305664,0.22362327575683594,1.4305689334869385,0.23619794845581055 +8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,Tests_passed,True,True,True,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,b9409c9a6ce2e440f7a37c1038d7ce4f40df7a40ce1a0e0011480efb3c02bdb6,Merge_failed,b9409c9a6ce2e440f7a37c1038d7ce4f40df7a40ce1a0e0011480efb3c02bdb6,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,65fe63f9cfb6d201cdb21c20b260b20b76a721b163b0ff5dfd35245e653887fe,0.039159297943115234,0.04037356376647949,0.04064679145812988,0.015861988067626953,0.04466891288757324,0.033734798431396484,0.01953268051147461,0.30957603454589844,0.06604170799255371,0.34107184410095215,0.34371161460876465,0.22362327575683594,1.4305689334869385,0.23619794845581055 diff --git a/results/combined/merges_timed/phaed420/simpleclans.csv b/results/combined/merges_timed/phaed420/simpleclans.csv index fe57c40716..21db10fd67 100644 --- a/results/combined/merges_timed/phaed420/simpleclans.csv +++ b/results/combined/merges_timed/phaed420/simpleclans.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -111,refs/remotes/origin/pull/578,a30dbb49985fd1da095e49ef9afe95b8857d0377,b331e2c236735dc0d9497d8214b16debd4fd1b14,baf71a449293a07b34179e49ee0de1bc9e7c7928,,True,True,762fe5002aa077cfcf3f7780ff3f95ed590c0badd0f944b35f16f72f73de587b,Tests_passed,8406011eca89cd6e530fdc63cbf413e753335818655784ac102c4c6b3f2ff0c1,Tests_passed,True,True,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a478081f3e78accac49e1e5dcea57fc77b6420635eb1a59d00fa9e7c1f4ae442,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,1638ca3869f7ac64df9aa9c53bc707cde74188ca272daa4ac3a7913f7a2852d2,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,3af903d5c239a61ee36f060ede655ae558e8d2ddbc41abcdd24c3270bb79a3e3,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,94f1b75d839451eb18f6bc071c402483b50796b5c80940989921142a2b65be5e,Merge_failed,94f1b75d839451eb18f6bc071c402483b50796b5c80940989921142a2b65be5e,Merge_failed,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,141949ab537fc49e25b64d8a57da96a142796467dfe693500c4ceb91886279bd,0.016922712326049805,0.017435550689697266,0.018819808959960938,0.018440961837768555,0.01875925064086914,0.018866777420043945,0.018762826919555664,0.11476302146911621,0.02919936180114746,0.7297055721282959,0.729698657989502,0.3520810604095459,3.8980796337127686,0.21886801719665527 +111,refs/remotes/origin/pull/578,a30dbb49985fd1da095e49ef9afe95b8857d0377,b331e2c236735dc0d9497d8214b16debd4fd1b14,baf71a449293a07b34179e49ee0de1bc9e7c7928,,True,True,762fe5002aa077cfcf3f7780ff3f95ed590c0badd0f944b35f16f72f73de587b,Tests_passed,8406011eca89cd6e530fdc63cbf413e753335818655784ac102c4c6b3f2ff0c1,Tests_passed,True,True,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a478081f3e78accac49e1e5dcea57fc77b6420635eb1a59d00fa9e7c1f4ae442,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,1638ca3869f7ac64df9aa9c53bc707cde74188ca272daa4ac3a7913f7a2852d2,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,3af903d5c239a61ee36f060ede655ae558e8d2ddbc41abcdd24c3270bb79a3e3,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,94f1b75d839451eb18f6bc071c402483b50796b5c80940989921142a2b65be5e,Merge_failed,94f1b75d839451eb18f6bc071c402483b50796b5c80940989921142a2b65be5e,Merge_failed,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,141949ab537fc49e25b64d8a57da96a142796467dfe693500c4ceb91886279bd,0.016922712326049805,0.017435550689697266,0.018819808959960938,0.018440961837768555,0.01875925064086914,0.018866777420043945,0.018762826919555664,0.11476302146911621,0.02919936180114746,0.7266242504119873,0.7658507823944092,0.3520810604095459,3.8980796337127686,0.21886801719665527 diff --git a/results/combined/merges_timed/phantomydn/wicket-orientdb.csv b/results/combined/merges_timed/phantomydn/wicket-orientdb.csv index a042bed3e6..1d3c885b84 100644 --- a/results/combined/merges_timed/phantomydn/wicket-orientdb.csv +++ b/results/combined/merges_timed/phantomydn/wicket-orientdb.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -42,refs/heads/master,19e9f8c8ff01f4ef6b39006032470baa83079eff,b7ebfd2dd8fc973b786f7c9222ab16a02db04750,ffa22e555317de565ad621df69faad83764e6d45,,True,True,b2122492e7f0bc3e18ed7ce1df53cd90bb523f70c9186a3cdadadd949ddd6799,Tests_passed,e08cff51a5db84e0837c335f6c5cb3e9dd96d2ad114d121f2cb2d56ba23c34ec,Tests_passed,True,True,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,ccac1cf65d870a8b3eb46ac0209a83b7372bfc1bd45e52c477967123013b800e,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,2e0766d6ab9762bbc1b0e6f3bc0796892990e062f7c47588c7e7f4fc878d7589,Merge_failed,2e0766d6ab9762bbc1b0e6f3bc0796892990e062f7c47588c7e7f4fc878d7589,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Merge_failed,8869e8681ebc425028985d5b08a2a78d8750869ab80cd03366b6435ef1f7fc11,0.011815786361694336,0.011629819869995117,0.012526750564575195,0.01177215576171875,0.012380123138427734,0.012618303298950195,0.012526750564575195,0.038996219635009766,0.01799917221069336,0.06737256050109863,0.06823539733886719,0.07094645500183105,0.7312419414520264,0.17400050163269043 +42,refs/heads/master,19e9f8c8ff01f4ef6b39006032470baa83079eff,b7ebfd2dd8fc973b786f7c9222ab16a02db04750,ffa22e555317de565ad621df69faad83764e6d45,,True,True,b2122492e7f0bc3e18ed7ce1df53cd90bb523f70c9186a3cdadadd949ddd6799,Tests_passed,e08cff51a5db84e0837c335f6c5cb3e9dd96d2ad114d121f2cb2d56ba23c34ec,Tests_passed,True,True,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,ccac1cf65d870a8b3eb46ac0209a83b7372bfc1bd45e52c477967123013b800e,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,2e0766d6ab9762bbc1b0e6f3bc0796892990e062f7c47588c7e7f4fc878d7589,Merge_failed,2e0766d6ab9762bbc1b0e6f3bc0796892990e062f7c47588c7e7f4fc878d7589,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Merge_failed,8869e8681ebc425028985d5b08a2a78d8750869ab80cd03366b6435ef1f7fc11,0.011815786361694336,0.011629819869995117,0.012526750564575195,0.01177215576171875,0.012380123138427734,0.012618303298950195,0.012526750564575195,0.038996219635009766,0.01799917221069336,0.06761980056762695,0.06815910339355469,0.07094645500183105,0.7312419414520264,0.17400050163269043 diff --git a/results/combined/merges_timed/phax/jcodemodel.csv b/results/combined/merges_timed/phax/jcodemodel.csv index d054b0a66c..99c17b70a7 100644 --- a/results/combined/merges_timed/phax/jcodemodel.csv +++ b/results/combined/merges_timed/phax/jcodemodel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,32486470c55c2a6b332600c7c693c47c9a91e7d5,3c1f47480aa985b1082bcc745d32f4651a507f00,b8d8fc639b766319a36039a4823d6d90767254ba,,True,True,f3ad7992197e97651fa975e95f4937615305d406301f7634661f014bb637f613,Tests_passed,eff388f4e1cd024d8b49700d9e4b226bce4d04e54da8d397de0b20af92f9ab79,Tests_passed,True,True,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,0.0571746826171875,0.04491162300109863,0.0561518669128418,0.05173611640930176,0.05363059043884277,0.056411027908325195,0.05794382095336914,0.18787217140197754,0.042469024658203125,0.16169023513793945,0.1612076759338379,0.11075305938720703,0.04973888397216797,0.3802924156188965 +1,refs/heads/master,32486470c55c2a6b332600c7c693c47c9a91e7d5,3c1f47480aa985b1082bcc745d32f4651a507f00,b8d8fc639b766319a36039a4823d6d90767254ba,,True,True,f3ad7992197e97651fa975e95f4937615305d406301f7634661f014bb637f613,Tests_passed,eff388f4e1cd024d8b49700d9e4b226bce4d04e54da8d397de0b20af92f9ab79,Tests_passed,True,True,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,0.0571746826171875,0.04491162300109863,0.0561518669128418,0.05173611640930176,0.05363059043884277,0.056411027908325195,0.05794382095336914,0.18787217140197754,0.042469024658203125,0.1591942310333252,0.15998530387878418,0.11075305938720703,0.04973888397216797,0.3802924156188965 diff --git a/results/combined/merges_timed/pholser/jopt-simple.csv b/results/combined/merges_timed/pholser/jopt-simple.csv index 19091cec9a..a87106cef3 100644 --- a/results/combined/merges_timed/pholser/jopt-simple.csv +++ b/results/combined/merges_timed/pholser/jopt-simple.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,bdcb06831908b4976afc88a67289839a25e7b826,b6e7208e6f31aef4caf048d85a9ee3dd635a44fc,57d378a716c24651b9226e600031ada43fdc4b40,,True,True,f5efd32cc9e53141f7a40a8398d82906162e50c92af11371ffb0ff305c172886,Tests_passed,3b0c81509fa20ef47627200900cdab74556dd22b90b915fbddb3856e9524140e,Tests_passed,True,True,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,dabc628a2a769e7c46b2e15740ae76d983e454357012c4631d58ee397b04e705,Tests_passed,dabc628a2a769e7c46b2e15740ae76d983e454357012c4631d58ee397b04e705,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,0.018728256225585938,0.01936793327331543,0.020748138427734375,0.021966934204101562,0.02269744873046875,0.022199392318725586,0.022182226181030273,0.09647417068481445,0.019201278686523438,0.5785856246948242,0.5735785961151123,0.24457192420959473,2.4191038608551025,0.32737231254577637 +14,refs/heads/master,bdcb06831908b4976afc88a67289839a25e7b826,b6e7208e6f31aef4caf048d85a9ee3dd635a44fc,57d378a716c24651b9226e600031ada43fdc4b40,,True,True,f5efd32cc9e53141f7a40a8398d82906162e50c92af11371ffb0ff305c172886,Tests_passed,3b0c81509fa20ef47627200900cdab74556dd22b90b915fbddb3856e9524140e,Tests_passed,True,True,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,dabc628a2a769e7c46b2e15740ae76d983e454357012c4631d58ee397b04e705,Tests_passed,dabc628a2a769e7c46b2e15740ae76d983e454357012c4631d58ee397b04e705,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,0.018728256225585938,0.01936793327331543,0.020748138427734375,0.021966934204101562,0.02269744873046875,0.022199392318725586,0.022182226181030273,0.09647417068481445,0.019201278686523438,0.5710968971252441,0.5708427429199219,0.24457192420959473,2.4191038608551025,0.32737231254577637 diff --git a/results/combined/merges_timed/pholser/junit-quickcheck.csv b/results/combined/merges_timed/pholser/junit-quickcheck.csv index c1d03e3aae..be1841f7be 100644 --- a/results/combined/merges_timed/pholser/junit-quickcheck.csv +++ b/results/combined/merges_timed/pholser/junit-quickcheck.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -50,refs/heads/master,82018eb390ce060d8e32a32961554f77973a92eb,d41d56b567fe3ddcb2da98f6a199d31c0fed5765,670a37e18b46b93c691cceea314f16ba719d2a47,,True,True,9788013b7efd4478965bbb84574c7b0274f51196e3c50306d5045739419d844e,Tests_passed,a7f5b56a9eb53f57e29671109c9cb74b400b5716c585d68f1d22f4b5cb58fe39,Tests_passed,True,True,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,6aa03c286849c7f1c3c5357b2f1952b6d4d043a421b9da1bd316b66fb39fb1ca,Tests_timedout,6aa03c286849c7f1c3c5357b2f1952b6d4d043a421b9da1bd316b66fb39fb1ca,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_passed,bfdf8808866ca6ac28039a36f2d64920998fc73fc9faee3ebbe9fd5a655b81d9,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,0.03385615348815918,0.04625105857849121,0.05042719841003418,0.0514223575592041,0.049298763275146484,0.053858041763305664,0.05949211120605469,0.3568844795227051,0.03752255439758301,0.629737138748169,0.630833625793457,0.29055333137512207,3.0934879779815674,0.9432897567749023 +50,refs/heads/master,82018eb390ce060d8e32a32961554f77973a92eb,d41d56b567fe3ddcb2da98f6a199d31c0fed5765,670a37e18b46b93c691cceea314f16ba719d2a47,,True,True,9788013b7efd4478965bbb84574c7b0274f51196e3c50306d5045739419d844e,Tests_passed,a7f5b56a9eb53f57e29671109c9cb74b400b5716c585d68f1d22f4b5cb58fe39,Tests_passed,True,True,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_timedout,6aa03c286849c7f1c3c5357b2f1952b6d4d043a421b9da1bd316b66fb39fb1ca,Tests_timedout,6aa03c286849c7f1c3c5357b2f1952b6d4d043a421b9da1bd316b66fb39fb1ca,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,Tests_passed,bfdf8808866ca6ac28039a36f2d64920998fc73fc9faee3ebbe9fd5a655b81d9,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,0.03385615348815918,0.04625105857849121,0.05042719841003418,0.0514223575592041,0.049298763275146484,0.053858041763305664,0.05949211120605469,0.3568844795227051,0.03752255439758301,0.6259684562683105,0.6330130100250244,0.29055333137512207,3.0934879779815674,0.9432897567749023 diff --git a/results/combined/merges_timed/pires/obd-java-api.csv b/results/combined/merges_timed/pires/obd-java-api.csv index 64fb714e5c..08947a7ab3 100644 --- a/results/combined/merges_timed/pires/obd-java-api.csv +++ b/results/combined/merges_timed/pires/obd-java-api.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -51,refs/remotes/origin/pull/80,f755208227503c01478c10a0912fd469d0ec5d79,fb2058698022dc891446c1367a27a8be2356bb4b,8d61fd4c32fb3bf9d99c44b078fab8c8087b4b98,,True,True,1e4e159a11ce06872aff10b6d1b59802a5e35c8d63b814d27778d3be6e0feb7d,Tests_passed,1c1ee8480eb4263a22ce92a609098eb0f6820b9a05a8291b1daf4401c368bbb8,Tests_passed,True,True,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,91b86953b2253e0abb54447a8d71dcfe3dca5ac887612fa2ccfe0cb61236a0d4,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,91b86953b2253e0abb54447a8d71dcfe3dca5ac887612fa2ccfe0cb61236a0d4,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,37298e4c4a3da6c86f65e7914737cde8482f66ee5abe11396af4e7a18bc0d8ac,Merge_failed,37298e4c4a3da6c86f65e7914737cde8482f66ee5abe11396af4e7a18bc0d8ac,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,f03dbfa05a0d36e7c029ea282f742bde703f929e510c466c916f5ecdd3ab69c2,0.041791677474975586,0.043460845947265625,0.0485539436340332,0.04334521293640137,0.04042387008666992,0.04159355163574219,0.0474400520324707,0.3143136501312256,0.06490182876586914,0.3718712329864502,0.37965941429138184,0.23618769645690918,1.6029725074768066,0.21122384071350098 +51,refs/remotes/origin/pull/80,f755208227503c01478c10a0912fd469d0ec5d79,fb2058698022dc891446c1367a27a8be2356bb4b,8d61fd4c32fb3bf9d99c44b078fab8c8087b4b98,,True,True,1e4e159a11ce06872aff10b6d1b59802a5e35c8d63b814d27778d3be6e0feb7d,Tests_passed,1c1ee8480eb4263a22ce92a609098eb0f6820b9a05a8291b1daf4401c368bbb8,Tests_passed,True,True,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,91b86953b2253e0abb54447a8d71dcfe3dca5ac887612fa2ccfe0cb61236a0d4,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,91b86953b2253e0abb54447a8d71dcfe3dca5ac887612fa2ccfe0cb61236a0d4,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,8ee3b3feb7235188e1bf19fd6a8dd4e8fc2559d111e007e12ed0b8793dd172de,Merge_failed,37298e4c4a3da6c86f65e7914737cde8482f66ee5abe11396af4e7a18bc0d8ac,Merge_failed,37298e4c4a3da6c86f65e7914737cde8482f66ee5abe11396af4e7a18bc0d8ac,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,f03dbfa05a0d36e7c029ea282f742bde703f929e510c466c916f5ecdd3ab69c2,0.041791677474975586,0.043460845947265625,0.0485539436340332,0.04334521293640137,0.04042387008666992,0.04159355163574219,0.0474400520324707,0.3143136501312256,0.06490182876586914,0.3895540237426758,0.3681638240814209,0.23618769645690918,1.6029725074768066,0.21122384071350098 diff --git a/results/combined/merges_timed/plaid/plaid-java.csv b/results/combined/merges_timed/plaid/plaid-java.csv index 4d68f6f043..9be742f2de 100644 --- a/results/combined/merges_timed/plaid/plaid-java.csv +++ b/results/combined/merges_timed/plaid/plaid-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -72,refs/remotes/origin/pull/130,5f856fdd6d1f3b51ce203c9ad056bc91471d939f,0bd56626ceb3d18c9d876dc91c1f4ae758eef0a8,abbf5df9c62aaa286ca14bacd418d05a55e9f8b7,,c2c0e699cba818ee07aea888e5712469387d269bf32360cf5868de182e867eb4,Tests_passed,7efcfaed7d06ec6cd6d37cb4255c6ac00cab370f6905c5252a5107c2284b0584,Tests_passed,True,True,True,True,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,0.05514383316040039,0.04605984687805176,0.03869152069091797,0.048285484313964844,0.01608896255493164,0.050669193267822266,0.03977680206298828,0.16525006294250488,0.05402779579162598,0.15909147262573242,0.1580798625946045,0.11487770080566406,0.8094010353088379,0.2482008934020996 +72,refs/remotes/origin/pull/130,5f856fdd6d1f3b51ce203c9ad056bc91471d939f,0bd56626ceb3d18c9d876dc91c1f4ae758eef0a8,abbf5df9c62aaa286ca14bacd418d05a55e9f8b7,,c2c0e699cba818ee07aea888e5712469387d269bf32360cf5868de182e867eb4,Tests_passed,7efcfaed7d06ec6cd6d37cb4255c6ac00cab370f6905c5252a5107c2284b0584,Tests_passed,True,True,True,True,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,0.05514383316040039,0.04605984687805176,0.03869152069091797,0.048285484313964844,0.01608896255493164,0.050669193267822266,0.03977680206298828,0.16525006294250488,0.05402779579162598,0.15855813026428223,0.15844941139221191,0.11487770080566406,0.8094010353088379,0.2482008934020996 diff --git a/results/combined/merges_timed/plum-umd/rubah.csv b/results/combined/merges_timed/plum-umd/rubah.csv index 0e17e383ba..d130774ab5 100644 --- a/results/combined/merges_timed/plum-umd/rubah.csv +++ b/results/combined/merges_timed/plum-umd/rubah.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/remotes/origin/pull/1,384485219562438c5abd5db59fdd0bc56061ae10,0d76b2beb5a7ea23a061221127be6e7b3ba30139,52adba8bdaf39255e685b0fee48887ccd1c4dd2f,,78704f4ae6b8ef79870011f2a7bb2bf3c9a3db32d7453848720d0262ef2f55a3,Tests_passed,b1a3a400daa2a5ffbe89e49c0fc9c886134027b526fa0ff42975a2b060af8de3,Tests_passed,True,True,True,True,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,0.05342674255371094,0.03730154037475586,0.051659345626831055,0.061933040618896484,0.05410456657409668,0.0503230094909668,0.05350828170776367,0.17432117462158203,0.04241037368774414,0.16047334671020508,0.15997004508972168,0.12256169319152832,0.7606844902038574,0.2437138557434082 +1,refs/remotes/origin/pull/1,384485219562438c5abd5db59fdd0bc56061ae10,0d76b2beb5a7ea23a061221127be6e7b3ba30139,52adba8bdaf39255e685b0fee48887ccd1c4dd2f,,78704f4ae6b8ef79870011f2a7bb2bf3c9a3db32d7453848720d0262ef2f55a3,Tests_passed,b1a3a400daa2a5ffbe89e49c0fc9c886134027b526fa0ff42975a2b060af8de3,Tests_passed,True,True,True,True,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,0.05342674255371094,0.03730154037475586,0.051659345626831055,0.061933040618896484,0.05410456657409668,0.0503230094909668,0.05350828170776367,0.17432117462158203,0.04241037368774414,0.16106963157653809,0.16035008430480957,0.12256169319152832,0.7606844902038574,0.2437138557434082 diff --git a/results/combined/merges_timed/plutext/docx4j.csv b/results/combined/merges_timed/plutext/docx4j.csv index 87a578ec42..9ec9d72747 100644 --- a/results/combined/merges_timed/plutext/docx4j.csv +++ b/results/combined/merges_timed/plutext/docx4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -129,refs/remotes/origin/pull/378,aa42a5b3f77c350916c1b790b26cb2633e9aa31c,80a43b991b62ac742367c51306a8aef824e5f415,6ee32d1afde00a15e72212e119322d81c4423deb,,True,True,2cdc23ee00a42fb287a38c24bc72aabd44e3daa5ee565c63e097c5337141c80e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,True,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Merge_failed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,0.03621029853820801,0.03673434257507324,0.049668312072753906,0.049480438232421875,0.04985618591308594,0.049483537673950195,0.04905056953430176,0.05588817596435547,0.036351919174194336,0.03417682647705078,0.03515195846557617,0.037664175033569336,0.03977847099304199,2.168488025665283 +129,refs/remotes/origin/pull/378,aa42a5b3f77c350916c1b790b26cb2633e9aa31c,80a43b991b62ac742367c51306a8aef824e5f415,6ee32d1afde00a15e72212e119322d81c4423deb,,True,True,2cdc23ee00a42fb287a38c24bc72aabd44e3daa5ee565c63e097c5337141c80e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,True,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Merge_failed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,0.03621029853820801,0.03673434257507324,0.049668312072753906,0.049480438232421875,0.04985618591308594,0.049483537673950195,0.04905056953430176,0.05588817596435547,0.036351919174194336,0.034886837005615234,0.03550982475280762,0.037664175033569336,0.03977847099304199,2.168488025665283 diff --git a/results/combined/merges_timed/pmd/pmd.csv b/results/combined/merges_timed/pmd/pmd.csv index 926177403f..8c16ec4b61 100644 --- a/results/combined/merges_timed/pmd/pmd.csv +++ b/results/combined/merges_timed/pmd/pmd.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1042,refs/heads/master,15a82f0ddb19fe060331dc1ec56075fe4a4b871c,6dbcf77953e9ee91780d1aea3d90074daaf21126,1c08f946917a938669cfcf011e238dae028b3898,,True,True,22b63a86da4cfa6a87f4432125e0da5e71a8836aebaae855ae4f0488f6aadee5,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,Tests_passed,True,True,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,0.04955315589904785,0.04905509948730469,0.06485319137573242,0.06600189208984375,0.06580257415771484,0.06609106063842773,0.06555461883544922,0.1255786418914795,0.048784494400024414,0.18501830101013184,0.18534302711486816,0.1633446216583252,0.7231693267822266,2.482933282852173 +1042,refs/heads/master,15a82f0ddb19fe060331dc1ec56075fe4a4b871c,6dbcf77953e9ee91780d1aea3d90074daaf21126,1c08f946917a938669cfcf011e238dae028b3898,,True,True,22b63a86da4cfa6a87f4432125e0da5e71a8836aebaae855ae4f0488f6aadee5,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,Tests_passed,True,True,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,0.04955315589904785,0.04905509948730469,0.06485319137573242,0.06600189208984375,0.06580257415771484,0.06609106063842773,0.06555461883544922,0.1255786418914795,0.048784494400024414,0.18507122993469238,0.1855170726776123,0.1633446216583252,0.7231693267822266,2.482933282852173 diff --git a/results/combined/merges_timed/poetix/protonpack.csv b/results/combined/merges_timed/poetix/protonpack.csv index 6d3cadac30..7b9e89b4b4 100644 --- a/results/combined/merges_timed/poetix/protonpack.csv +++ b/results/combined/merges_timed/poetix/protonpack.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,7f6e8773f8a428c8fbcee81aeaf42e04b45144c4,740db1ba99cc80ee8a2c54916e8e6975b629a276,65d9207fe1a022ef6151aaf0eff8a939c9083e12,,fe1585c6430d0c6b8311be21f6957611b614db27f5337be349f76ad40d237de0,Tests_passed,8a4c04bec613b1a495bbb92ed4c4145aadce30e7553c6bbed6d91bbe8e409ced,Tests_passed,True,True,True,True,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,0a03ef217a02207bb20a3085d3f285a54a8c6b6c308131c6c533c7ceae5e065a,Tests_passed,0a03ef217a02207bb20a3085d3f285a54a8c6b6c308131c6c533c7ceae5e065a,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,0.03695416450500488,0.03446793556213379,0.04493856430053711,0.04324054718017578,0.0479588508605957,0.04027962684631348,0.0364227294921875,0.16062402725219727,0.041690826416015625,0.1567387580871582,0.15744757652282715,0.10717511177062988,0.8181695938110352,0.19144535064697266 +15,refs/heads/master,7f6e8773f8a428c8fbcee81aeaf42e04b45144c4,740db1ba99cc80ee8a2c54916e8e6975b629a276,65d9207fe1a022ef6151aaf0eff8a939c9083e12,,fe1585c6430d0c6b8311be21f6957611b614db27f5337be349f76ad40d237de0,Tests_passed,8a4c04bec613b1a495bbb92ed4c4145aadce30e7553c6bbed6d91bbe8e409ced,Tests_passed,True,True,True,True,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,0a03ef217a02207bb20a3085d3f285a54a8c6b6c308131c6c533c7ceae5e065a,Tests_passed,0a03ef217a02207bb20a3085d3f285a54a8c6b6c308131c6c533c7ceae5e065a,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,0.03695416450500488,0.03446793556213379,0.04493856430053711,0.04324054718017578,0.0479588508605957,0.04027962684631348,0.0364227294921875,0.16062402725219727,0.041690826416015625,0.1564493179321289,0.15743803977966309,0.10717511177062988,0.8181695938110352,0.19144535064697266 diff --git a/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv b/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv index ffb8871f7d..8d6c5ca2e6 100644 --- a/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv +++ b/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,bfc17aa246a1ff1e7c301d5a90f4101f82f8ec12,57be9f5949522592799d85e9760e748bc472a098,429f5db8ddccfba6827b259b8131eb64cbca7db2,,da2a3914d2a8517695f29bf304ba892035004dcf7e960e27337e5a6f8931174c,Tests_passed,261126bb0dffb3e5730b1a54f72cdeb0945419aed050c1252ba9638e331fd87a,Tests_passed,True,True,True,True,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,0.031856536865234375,0.04558539390563965,0.03905224800109863,0.06144881248474121,0.02948760986328125,0.05935382843017578,0.024600982666015625,0.1719648838043213,0.03537774085998535,0.16536474227905273,0.1610279083251953,0.10637426376342773,0.8127665519714355,0.1886897087097168 +2,refs/heads/master,bfc17aa246a1ff1e7c301d5a90f4101f82f8ec12,57be9f5949522592799d85e9760e748bc472a098,429f5db8ddccfba6827b259b8131eb64cbca7db2,,da2a3914d2a8517695f29bf304ba892035004dcf7e960e27337e5a6f8931174c,Tests_passed,261126bb0dffb3e5730b1a54f72cdeb0945419aed050c1252ba9638e331fd87a,Tests_passed,True,True,True,True,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,0.031856536865234375,0.04558539390563965,0.03905224800109863,0.06144881248474121,0.02948760986328125,0.05935382843017578,0.024600982666015625,0.1719648838043213,0.03537774085998535,0.15461206436157227,0.1536092758178711,0.10637426376342773,0.8127665519714355,0.1886897087097168 diff --git a/results/combined/merges_timed/pragmatists/junitparams.csv b/results/combined/merges_timed/pragmatists/junitparams.csv index b635b3a13a..d632e8bc5d 100644 --- a/results/combined/merges_timed/pragmatists/junitparams.csv +++ b/results/combined/merges_timed/pragmatists/junitparams.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -46,refs/heads/master,8f6c13ae04b9f525f36e55c1dd881be14a246b59,4c5658534e52bb9da9b8d56d6c36890a91e21db3,1e33e02a72bcdee753a5bffcc10d4a35b75c2199,,True,True,a216f59d9eeb40209d459cfaf936509e52c81c7b6c6a0a73067acc5b38c7f271,Tests_passed,531693458bda96633abc2bedb8b04c3219da1f1dbfbd0789218188866fdba637,Tests_passed,True,True,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,84f12f8fd9e01a82fbfb611f120bfea1ab89a54b8be67b11003b210f5579160b,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,477777b7c47923919759bdebdfbf707c936d0d3b060e51a51d90829f3b322ac6,Merge_failed,477777b7c47923919759bdebdfbf707c936d0d3b060e51a51d90829f3b322ac6,Merge_failed,9e2c8a007aa9520294d052d208fa346500f6992e691bdb2872feb15991f9e60f,Tests_passed,d7c5d0ea6dcd60a12f705998975be2faa3fc9774a356d67fa8b7b563eaf2a75f,Merge_failed,38e5b3ca2d251a20be6a202f98a8628d1f80b59fb53ff4db0f91b5c129e706c5,0.04014158248901367,0.01605701446533203,0.0214688777923584,0.03995704650878906,0.04335331916809082,0.039109230041503906,0.04449963569641113,0.15265321731567383,0.06554889678955078,0.06772994995117188,0.06815576553344727,0.1311655044555664,0.5802152156829834,0.21223092079162598 +46,refs/heads/master,8f6c13ae04b9f525f36e55c1dd881be14a246b59,4c5658534e52bb9da9b8d56d6c36890a91e21db3,1e33e02a72bcdee753a5bffcc10d4a35b75c2199,,True,True,a216f59d9eeb40209d459cfaf936509e52c81c7b6c6a0a73067acc5b38c7f271,Tests_passed,531693458bda96633abc2bedb8b04c3219da1f1dbfbd0789218188866fdba637,Tests_passed,True,True,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,84f12f8fd9e01a82fbfb611f120bfea1ab89a54b8be67b11003b210f5579160b,Merge_failed,8440d527d7edae1d7e966c578e7244b4cb7949502310cea143e19353037ebc70,Merge_failed,477777b7c47923919759bdebdfbf707c936d0d3b060e51a51d90829f3b322ac6,Merge_failed,477777b7c47923919759bdebdfbf707c936d0d3b060e51a51d90829f3b322ac6,Merge_failed,9e2c8a007aa9520294d052d208fa346500f6992e691bdb2872feb15991f9e60f,Tests_passed,d7c5d0ea6dcd60a12f705998975be2faa3fc9774a356d67fa8b7b563eaf2a75f,Merge_failed,38e5b3ca2d251a20be6a202f98a8628d1f80b59fb53ff4db0f91b5c129e706c5,0.04014158248901367,0.01605701446533203,0.0214688777923584,0.03995704650878906,0.04335331916809082,0.039109230041503906,0.04449963569641113,0.15265321731567383,0.06554889678955078,0.06736993789672852,0.06728410720825195,0.1311655044555664,0.5802152156829834,0.21223092079162598 diff --git a/results/combined/merges_timed/premium-minds/billy.csv b/results/combined/merges_timed/premium-minds/billy.csv index 78ea874895..05023d077e 100644 --- a/results/combined/merges_timed/premium-minds/billy.csv +++ b/results/combined/merges_timed/premium-minds/billy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -50,refs/heads/master,b34f1fc12b6717091254cc8f8c6bc313bd2a3e38,4d7c765f34c6bd796695bded10da84ee2816d819,d113a54f81e5649a8137cb49e45313689ba7836d,,True,True,7a11d2e79a1e3c09fa09674d26a46c79f386723ca13c68692d6a6534091cec08,Tests_passed,56561ebe92a2edad87948ea6cd1104ada423f36bfb6b22fbec7e5e6e3266325f,Tests_passed,True,True,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,0.017379283905029297,0.01732778549194336,0.019989728927612305,0.020926952362060547,0.01982426643371582,0.02013230323791504,0.020589351654052734,0.08220624923706055,0.017786741256713867,0.584132194519043,0.5779175758361816,0.1791839599609375,5.928813934326172,0.28514575958251953 +50,refs/heads/master,b34f1fc12b6717091254cc8f8c6bc313bd2a3e38,4d7c765f34c6bd796695bded10da84ee2816d819,d113a54f81e5649a8137cb49e45313689ba7836d,,True,True,7a11d2e79a1e3c09fa09674d26a46c79f386723ca13c68692d6a6534091cec08,Tests_passed,56561ebe92a2edad87948ea6cd1104ada423f36bfb6b22fbec7e5e6e3266325f,Tests_passed,True,True,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_failed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,0.017379283905029297,0.01732778549194336,0.019989728927612305,0.020926952362060547,0.01982426643371582,0.02013230323791504,0.020589351654052734,0.08220624923706055,0.017786741256713867,0.5683248043060303,0.5755391120910645,0.1791839599609375,5.928813934326172,0.28514575958251953 diff --git a/results/combined/merges_timed/premium-minds/pm-wicket-utils.csv b/results/combined/merges_timed/premium-minds/pm-wicket-utils.csv index dfbba52d87..654e400f20 100644 --- a/results/combined/merges_timed/premium-minds/pm-wicket-utils.csv +++ b/results/combined/merges_timed/premium-minds/pm-wicket-utils.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -94,refs/heads/master,a73b5bf686d93a29daa3513d0e62422111b3f4b6,212b95bc3d85dfec1d2d2b27ac5d5b8a4aa06fc5,2d452fa3a767f08154527af54210a8ad5805df8f,,True,True,fc764aa3f192b9fd407e04f01935db53dfd1f9717c171532598a11b078e9ee0f,Tests_passed,5908c5716fb0b2b2f61dd4c09596f8c033f8348170303b8f404464df31fdb921,Tests_passed,True,True,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,75a1f68499badb8d65ecdcbd678870be39e444722ab6a390c41f27568616cb12,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,Merge_failed,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,fdfbf64a53a31570235ac037f6f092b13a6c69b4ac6c9b4f6124735484de2d47,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,0.02253890037536621,0.022507429122924805,0.024704456329345703,0.024053573608398438,0.01761770248413086,0.02482008934020996,0.024268388748168945,0.08472084999084473,0.030541419982910156,0.31570959091186523,0.318204402923584,0.24028968811035156,1.3886172771453857,0.2641770839691162 +94,refs/heads/master,a73b5bf686d93a29daa3513d0e62422111b3f4b6,212b95bc3d85dfec1d2d2b27ac5d5b8a4aa06fc5,2d452fa3a767f08154527af54210a8ad5805df8f,,True,True,fc764aa3f192b9fd407e04f01935db53dfd1f9717c171532598a11b078e9ee0f,Tests_passed,5908c5716fb0b2b2f61dd4c09596f8c033f8348170303b8f404464df31fdb921,Tests_passed,True,True,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,75a1f68499badb8d65ecdcbd678870be39e444722ab6a390c41f27568616cb12,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,Merge_failed,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,fdfbf64a53a31570235ac037f6f092b13a6c69b4ac6c9b4f6124735484de2d47,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,0.02253890037536621,0.022507429122924805,0.024704456329345703,0.024053573608398438,0.01761770248413086,0.02482008934020996,0.024268388748168945,0.08472084999084473,0.030541419982910156,0.3191854953765869,0.3187241554260254,0.24028968811035156,1.3886172771453857,0.2641770839691162 diff --git a/results/combined/merges_timed/prism/prism-bukkit.csv b/results/combined/merges_timed/prism/prism-bukkit.csv index e3f552bfa8..0920deba48 100644 --- a/results/combined/merges_timed/prism/prism-bukkit.csv +++ b/results/combined/merges_timed/prism/prism-bukkit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -33,refs/heads/master,c9fd69aac937051cc93bbc7b62a22245e0ea33cd,4b5d8a5f750a9cbe1a58cf3f67be4d025cee8182,e99fcdd4ae5a93d7185c8b575d5f14e2d15e7a56,,f1c99d40af6b068f88c0020020babe2d879bf3f0d172935054618aefbd5c57ee,Tests_passed,ac53fd399251fd9e5b9f928255372dbfc1d699060b1abef16bbe395986c83ddf,Tests_passed,True,True,True,True,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_passed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_passed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,afe76c72e561928c929d4144aa319bc7cd8c88cf9d819d6d1467a8e812fbac66,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,e5a24702f61581117717fb51b9d7eb66ebe3f484f1f88e0e71028d682b3c0271,Merge_failed,e5a24702f61581117717fb51b9d7eb66ebe3f484f1f88e0e71028d682b3c0271,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,62f288082642215af32434a6f7179ebe385d6fd9bde1d09f73ffeba8a476bee3,0.017651081085205078,0.01960158348083496,0.019744157791137695,0.023189306259155273,0.019907236099243164,0.019655942916870117,0.02040576934814453,0.0937964916229248,0.02679300308227539,0.5241940021514893,0.5256097316741943,0.2356414794921875,3.619046926498413,0.22137713432312012 +33,refs/heads/master,c9fd69aac937051cc93bbc7b62a22245e0ea33cd,4b5d8a5f750a9cbe1a58cf3f67be4d025cee8182,e99fcdd4ae5a93d7185c8b575d5f14e2d15e7a56,,f1c99d40af6b068f88c0020020babe2d879bf3f0d172935054618aefbd5c57ee,Tests_passed,ac53fd399251fd9e5b9f928255372dbfc1d699060b1abef16bbe395986c83ddf,Tests_passed,True,True,True,True,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_passed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_passed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,afe76c72e561928c929d4144aa319bc7cd8c88cf9d819d6d1467a8e812fbac66,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,e5a24702f61581117717fb51b9d7eb66ebe3f484f1f88e0e71028d682b3c0271,Merge_failed,e5a24702f61581117717fb51b9d7eb66ebe3f484f1f88e0e71028d682b3c0271,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,62f288082642215af32434a6f7179ebe385d6fd9bde1d09f73ffeba8a476bee3,0.017651081085205078,0.01960158348083496,0.019744157791137695,0.023189306259155273,0.019907236099243164,0.019655942916870117,0.02040576934814453,0.0937964916229248,0.02679300308227539,0.5297234058380127,0.5279190540313721,0.2356414794921875,3.619046926498413,0.22137713432312012 diff --git a/results/combined/merges_timed/progether/jadventure.csv b/results/combined/merges_timed/progether/jadventure.csv index 12bb9d64ed..bfb400b11a 100644 --- a/results/combined/merges_timed/progether/jadventure.csv +++ b/results/combined/merges_timed/progether/jadventure.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,7deca2169f09a5cc2f3701736396132d5f36f2a2,1628bc864e5bd45e8d99a75484adf7d317dada07,22eddd9a0a61f8c44eb2f504762cd811b54344f2,,True,True,44973629f349af797bf1793a4ae08e5d130889e9d95c6c11b1cc1953fcc243ea,Tests_passed,5a626ac617c5fe94755cb45b8431e707543b176c34e89e8f96f99f3c2c873938,Tests_passed,True,True,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,0.012983322143554688,0.012844562530517578,0.014133930206298828,0.01381373405456543,0.014107465744018555,0.014664173126220703,0.014070987701416016,0.042209625244140625,0.01339578628540039,0.1733236312866211,0.17349553108215332,0.07049870491027832,0.8336226940155029,0.16989493370056152 +6,refs/heads/master,7deca2169f09a5cc2f3701736396132d5f36f2a2,1628bc864e5bd45e8d99a75484adf7d317dada07,22eddd9a0a61f8c44eb2f504762cd811b54344f2,,True,True,44973629f349af797bf1793a4ae08e5d130889e9d95c6c11b1cc1953fcc243ea,Tests_passed,5a626ac617c5fe94755cb45b8431e707543b176c34e89e8f96f99f3c2c873938,Tests_passed,True,True,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,0.012983322143554688,0.012844562530517578,0.014133930206298828,0.01381373405456543,0.014107465744018555,0.014664173126220703,0.014070987701416016,0.042209625244140625,0.01339578628540039,0.1642305850982666,0.16544294357299805,0.07049870491027832,0.8336226940155029,0.16989493370056152 diff --git a/results/combined/merges_timed/projectblueshift/blueshiftapi.csv b/results/combined/merges_timed/projectblueshift/blueshiftapi.csv index 1887132e95..d1dabfc349 100644 --- a/results/combined/merges_timed/projectblueshift/blueshiftapi.csv +++ b/results/combined/merges_timed/projectblueshift/blueshiftapi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,Tests_passed,True,True,True,True,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,cc061f9e29c6ae65aa4b9d4de56cf3a418992c3332db1513f346948c32ee8a5d,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,c982c747a949bdb646e414e79e2cd24fb3671360158ae7575fe194c53f97abb2,Merge_failed,c982c747a949bdb646e414e79e2cd24fb3671360158ae7575fe194c53f97abb2,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,0.047301292419433594,0.04222846031188965,0.04514932632446289,0.040122032165527344,0.03235435485839844,0.045581817626953125,0.046633243560791016,0.34291505813598633,0.10840439796447754,0.26784825325012207,0.2651197910308838,0.29395461082458496,1.6473522186279297,0.22954797744750977 +4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,Tests_passed,True,True,True,True,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,cc061f9e29c6ae65aa4b9d4de56cf3a418992c3332db1513f346948c32ee8a5d,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,c982c747a949bdb646e414e79e2cd24fb3671360158ae7575fe194c53f97abb2,Merge_failed,c982c747a949bdb646e414e79e2cd24fb3671360158ae7575fe194c53f97abb2,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,0.047301292419433594,0.04222846031188965,0.04514932632446289,0.040122032165527344,0.03235435485839844,0.045581817626953125,0.046633243560791016,0.34291505813598633,0.10840439796447754,0.26978158950805664,0.2696573734283447,0.29395461082458496,1.6473522186279297,0.22954797744750977 diff --git a/results/combined/merges_timed/projectdanube/xdi2.csv b/results/combined/merges_timed/projectdanube/xdi2.csv index cad706212d..4629dfbd76 100644 --- a/results/combined/merges_timed/projectdanube/xdi2.csv +++ b/results/combined/merges_timed/projectdanube/xdi2.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -53,refs/heads/master,e9b5fa658b6b5429239c768233df8b2134740542,aa25d13cf1e1149ae2ead3b868a9ddbf904248d9,f0c3462c6222bfac8e95801e772edc20d7af740e,,True,True,7a21ef5e8f6497e2c7fdbf2e055f79219ba718fc6779192fdba7350e0738a779,Tests_passed,af50781b94a9a3e1e6d431f0ba405fc4102e578b58552273829b0e0d4f452301,Tests_passed,True,True,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,57ba904c7447fff9b9bcc03dc19e566735928029558801172bdceae762977c5e,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,ee0417a4e03956c2f7b3ae392c23891c1841bba5905d6ce43f9748926dfbcfab,Merge_failed,ee0417a4e03956c2f7b3ae392c23891c1841bba5905d6ce43f9748926dfbcfab,Tests_passed,08839471bdba29828c0a035685b5a926df7dad0f1d7a4116d6e5429a6987b0ef,Tests_passed,1167ac88c3f1125a3a0936ff711185027122b96ca49bc9c7350e52f1e34a4d37,Merge_failed,4edc78b261ea51202faecca0aaed927675f5b10077e6eb968d6112ab1654fad8,0.054694414138793945,0.05677056312561035,0.05607295036315918,0.06301498413085938,0.0504155158996582,0.05533456802368164,0.055222511291503906,0.22943449020385742,0.09153151512145996,0.07043004035949707,0.0713801383972168,0.12304878234863281,0.8093924522399902,0.3675529956817627 +53,refs/heads/master,e9b5fa658b6b5429239c768233df8b2134740542,aa25d13cf1e1149ae2ead3b868a9ddbf904248d9,f0c3462c6222bfac8e95801e772edc20d7af740e,,True,True,7a21ef5e8f6497e2c7fdbf2e055f79219ba718fc6779192fdba7350e0738a779,Tests_passed,af50781b94a9a3e1e6d431f0ba405fc4102e578b58552273829b0e0d4f452301,Tests_passed,True,True,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,57ba904c7447fff9b9bcc03dc19e566735928029558801172bdceae762977c5e,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,ee0417a4e03956c2f7b3ae392c23891c1841bba5905d6ce43f9748926dfbcfab,Merge_failed,ee0417a4e03956c2f7b3ae392c23891c1841bba5905d6ce43f9748926dfbcfab,Tests_passed,08839471bdba29828c0a035685b5a926df7dad0f1d7a4116d6e5429a6987b0ef,Tests_passed,1167ac88c3f1125a3a0936ff711185027122b96ca49bc9c7350e52f1e34a4d37,Merge_failed,4edc78b261ea51202faecca0aaed927675f5b10077e6eb968d6112ab1654fad8,0.054694414138793945,0.05677056312561035,0.05607295036315918,0.06301498413085938,0.0504155158996582,0.05533456802368164,0.055222511291503906,0.22943449020385742,0.09153151512145996,0.07082414627075195,0.07035517692565918,0.12304878234863281,0.8093924522399902,0.3675529956817627 diff --git a/results/combined/merges_timed/projectkorra/projectkorra.csv b/results/combined/merges_timed/projectkorra/projectkorra.csv index 6d5ec418ac..60352ffa29 100644 --- a/results/combined/merges_timed/projectkorra/projectkorra.csv +++ b/results/combined/merges_timed/projectkorra/projectkorra.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -701,refs/remotes/origin/pull/961,dd6d1252c9301ab42113fcc18f215eaf8fc6eb96,a9c8c47cda20149f10db486d3dfb5139641864e7,b05b5122854df1818e39515742d15f11e6b840b3,,True,True,a3895f4dba5e6155d6dc6c8b3f8a24d02d919068a4e4ec3f9e47278474667bec,Tests_passed,2f57d90a2ea360bb259e42f77de2bbc42c9ecc1c363a8bab42c7d8b06c05d6a7,Tests_passed,True,True,Merge_failed,5069390fa819368928be13b98f8015dea348b5881e8d56553844392771b86d53,Merge_failed,018205ea1635228343376ebd9fa2859561b41c3b40db3f7da883bd9f8c3bf5c5,Merge_failed,5069390fa819368928be13b98f8015dea348b5881e8d56553844392771b86d53,Merge_failed,018205ea1635228343376ebd9fa2859561b41c3b40db3f7da883bd9f8c3bf5c5,Merge_failed,99083d4deb42c645301f56ae6fe3239ae918f02854658c57753b48fc8311bff8,Merge_failed,99083d4deb42c645301f56ae6fe3239ae918f02854658c57753b48fc8311bff8,Merge_failed,6ebd29092ca002cdb3c841b3a8bb61bba58bb18d0e9d1b4754bf170af636891f,Merge_failed,77a393eda18f05aa1ddadea0c33325f3a77f1cb16132ae33782070f4c4fca71d,Merge_failed,5069390fa819368928be13b98f8015dea348b5881e8d56553844392771b86d53,Merge_failed,65e430c2abec693472f767c069735a0914fd6b73ffe434739f281c4f6fe89536,Merge_failed,65e430c2abec693472f767c069735a0914fd6b73ffe434739f281c4f6fe89536,Merge_failed,5d2fe22231461c0182612d572c60467acb522cb90fa7b6557502cb38bbd64ebd,Merge_failed,92d47e002f78107cc425a9ed44e34cdb712990bf7fc093bc1e19a373e561f689,Merge_failed,bcc90d9e4dd6e9a9e8ace9ae0177c39c9e5a53e01f1a036fd1a1dca45c37256d,0.032308101654052734,0.02655315399169922,0.025826692581176758,0.042574167251586914,0.031633853912353516,0.03948259353637695,0.024959802627563477,0.3701155185699463,0.13684940338134766,0.24635624885559082,0.24557924270629883,0.21459197998046875,3.6153440475463867,0.5017282962799072 +701,refs/remotes/origin/pull/961,dd6d1252c9301ab42113fcc18f215eaf8fc6eb96,a9c8c47cda20149f10db486d3dfb5139641864e7,b05b5122854df1818e39515742d15f11e6b840b3,,True,True,a3895f4dba5e6155d6dc6c8b3f8a24d02d919068a4e4ec3f9e47278474667bec,Tests_passed,2f57d90a2ea360bb259e42f77de2bbc42c9ecc1c363a8bab42c7d8b06c05d6a7,Tests_passed,True,True,Merge_failed,5069390fa819368928be13b98f8015dea348b5881e8d56553844392771b86d53,Merge_failed,018205ea1635228343376ebd9fa2859561b41c3b40db3f7da883bd9f8c3bf5c5,Merge_failed,5069390fa819368928be13b98f8015dea348b5881e8d56553844392771b86d53,Merge_failed,018205ea1635228343376ebd9fa2859561b41c3b40db3f7da883bd9f8c3bf5c5,Merge_failed,99083d4deb42c645301f56ae6fe3239ae918f02854658c57753b48fc8311bff8,Merge_failed,99083d4deb42c645301f56ae6fe3239ae918f02854658c57753b48fc8311bff8,Merge_failed,6ebd29092ca002cdb3c841b3a8bb61bba58bb18d0e9d1b4754bf170af636891f,Merge_failed,77a393eda18f05aa1ddadea0c33325f3a77f1cb16132ae33782070f4c4fca71d,Merge_failed,5069390fa819368928be13b98f8015dea348b5881e8d56553844392771b86d53,Merge_failed,65e430c2abec693472f767c069735a0914fd6b73ffe434739f281c4f6fe89536,Merge_failed,65e430c2abec693472f767c069735a0914fd6b73ffe434739f281c4f6fe89536,Merge_failed,5d2fe22231461c0182612d572c60467acb522cb90fa7b6557502cb38bbd64ebd,Merge_failed,92d47e002f78107cc425a9ed44e34cdb712990bf7fc093bc1e19a373e561f689,Merge_failed,bcc90d9e4dd6e9a9e8ace9ae0177c39c9e5a53e01f1a036fd1a1dca45c37256d,0.032308101654052734,0.02655315399169922,0.025826692581176758,0.042574167251586914,0.031633853912353516,0.03948259353637695,0.024959802627563477,0.3701155185699463,0.13684940338134766,0.2523212432861328,0.2441704273223877,0.21459197998046875,3.6153440475463867,0.5017282962799072 diff --git a/results/combined/merges_timed/ptgoetz/storm-hdfs.csv b/results/combined/merges_timed/ptgoetz/storm-hdfs.csv index 33db5ace9d..cd95a6d07e 100644 --- a/results/combined/merges_timed/ptgoetz/storm-hdfs.csv +++ b/results/combined/merges_timed/ptgoetz/storm-hdfs.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/remotes/origin/pull/14,563b4340f350a93c9efb6a6991b8028d16144345,8007c40b349f8cdedbf10f95bd480db1cdbc86a3,be5eae3bcc07cfbaf49c19c57da42dac1351a3e3,,True,True,e65dcd2daa1f316f295653444319c789f75f86ef6d433bc6803de8e994e81f27,Tests_passed,23795b9ee2753e1d584e00ec6fba7972b95b74e61d5218279564f331688d9f85,Tests_passed,True,True,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,0.03601527214050293,0.04451775550842285,0.041697025299072266,0.0526881217956543,0.04684734344482422,0.048070430755615234,0.04725837707519531,0.2977323532104492,0.044463157653808594,0.4369962215423584,0.4363539218902588,0.2156987190246582,1.6960506439208984,0.19941282272338867 +2,refs/remotes/origin/pull/14,563b4340f350a93c9efb6a6991b8028d16144345,8007c40b349f8cdedbf10f95bd480db1cdbc86a3,be5eae3bcc07cfbaf49c19c57da42dac1351a3e3,,True,True,e65dcd2daa1f316f295653444319c789f75f86ef6d433bc6803de8e994e81f27,Tests_passed,23795b9ee2753e1d584e00ec6fba7972b95b74e61d5218279564f331688d9f85,Tests_passed,True,True,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,0.03601527214050293,0.04451775550842285,0.041697025299072266,0.0526881217956543,0.04684734344482422,0.048070430755615234,0.04725837707519531,0.2977323532104492,0.044463157653808594,0.4316720962524414,0.4324047565460205,0.2156987190246582,1.6960506439208984,0.19941282272338867 diff --git a/results/combined/merges_timed/pydio/pydio-sdk-java.csv b/results/combined/merges_timed/pydio/pydio-sdk-java.csv index 48078fa611..2720bd1ae6 100644 --- a/results/combined/merges_timed/pydio/pydio-sdk-java.csv +++ b/results/combined/merges_timed/pydio/pydio-sdk-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/develop,29da20204a34f94644314baa2da9f9c436c3597f,dc81ee556594723f2ee47b2d264bd74f2874d3f5,5f7420e9df2f3a9a6b9908f0cada5be9930a5f27,,55187d38795f66b3594e2b1931f9e059bc7a8cd51948c799ba88fca72a959767,Tests_passed,3a040643ace61f3a5682c6def579f7805282f5645df08f17344d2da32a436a5a,Tests_passed,True,True,True,True,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,31d332f640664ab9ba7fc9b176e04cad5ef5b6ba7dd14d5550d420a4e55d81e5,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,0.03952503204345703,0.037337303161621094,0.0434873104095459,0.04748988151550293,0.0398409366607666,0.04028034210205078,0.04524064064025879,0.17040705680847168,0.044708967208862305,0.16514039039611816,0.16497564315795898,0.11426711082458496,1.32769775390625,0.1881556510925293 +3,refs/remotes/origin/develop,29da20204a34f94644314baa2da9f9c436c3597f,dc81ee556594723f2ee47b2d264bd74f2874d3f5,5f7420e9df2f3a9a6b9908f0cada5be9930a5f27,,55187d38795f66b3594e2b1931f9e059bc7a8cd51948c799ba88fca72a959767,Tests_passed,3a040643ace61f3a5682c6def579f7805282f5645df08f17344d2da32a436a5a,Tests_passed,True,True,True,True,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,31d332f640664ab9ba7fc9b176e04cad5ef5b6ba7dd14d5550d420a4e55d81e5,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,0.03952503204345703,0.037337303161621094,0.0434873104095459,0.04748988151550293,0.0398409366607666,0.04028034210205078,0.04524064064025879,0.17040705680847168,0.044708967208862305,0.1607344150543213,0.16560816764831543,0.11426711082458496,1.32769775390625,0.1881556510925293 diff --git a/results/combined/merges_timed/pyknic/codegen.csv b/results/combined/merges_timed/pyknic/codegen.csv index dc08338e6a..a9a08c9486 100644 --- a/results/combined/merges_timed/pyknic/codegen.csv +++ b/results/combined/merges_timed/pyknic/codegen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,3e0d4067f68ebf4163e850c7031571271b4893e0,c0a3be22b99918411b41e1e075253e928079c2ea,cc625538048bd84c0763de49f8cceda5f40b9cc7,,e5b84acceeb2830bb1ab1d622d07db01610bb2f3b652ac09dbfd2f729aefb7a0,Tests_passed,746c55dcd348adf7169a334ad98e005a4205ec95baa1657ddd17fdef75ba84f4,Tests_passed,True,True,True,True,Merge_failed,f817b81cce09e1138e782ac7c64497cb3f7ea9253c340dfcab657aacb551a022,Merge_failed,9eb168e847955241749af36beb030e69f83667dca5f34501d31213ba0ece8e8a,Merge_failed,f817b81cce09e1138e782ac7c64497cb3f7ea9253c340dfcab657aacb551a022,Merge_failed,3558746ef209d130faf41f035cf3298312986a4cc4642fa6d85eac1d8807c07c,Merge_failed,8d20553f1b49e85fe2beea693b6200cf63e3edac57c94d9bd3793320bc970c32,Merge_failed,8d20553f1b49e85fe2beea693b6200cf63e3edac57c94d9bd3793320bc970c32,Merge_failed,5b72dfe7935a5ea435b550f8836089a69316b51dc03ee7fe642aece4bb377705,Merge_failed,614f0a559a6a7fbf0aa809bbe01287323111d009647a5d578130054b92d82d21,Merge_failed,f817b81cce09e1138e782ac7c64497cb3f7ea9253c340dfcab657aacb551a022,Merge_failed,ede5e8cf6488b55e274bc5d745e621c0ad33d6473306e41f0de777bdf6e795fd,Merge_failed,ede5e8cf6488b55e274bc5d745e621c0ad33d6473306e41f0de777bdf6e795fd,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Merge_failed,fb5d5b84814c528b23e5042e2bbfdd50618509851da19dcbf08da374d91434d0,0.03583264350891113,0.03908681869506836,0.019222259521484375,0.018906354904174805,0.01874256134033203,0.0185849666595459,0.018709421157836914,0.8446898460388184,0.11554312705993652,2.0728919506073,2.076662302017212,1.1810507774353027,10.156453371047974,0.280881404876709 +1,refs/heads/master,3e0d4067f68ebf4163e850c7031571271b4893e0,c0a3be22b99918411b41e1e075253e928079c2ea,cc625538048bd84c0763de49f8cceda5f40b9cc7,,e5b84acceeb2830bb1ab1d622d07db01610bb2f3b652ac09dbfd2f729aefb7a0,Tests_passed,746c55dcd348adf7169a334ad98e005a4205ec95baa1657ddd17fdef75ba84f4,Tests_passed,True,True,True,True,Merge_failed,f817b81cce09e1138e782ac7c64497cb3f7ea9253c340dfcab657aacb551a022,Merge_failed,9eb168e847955241749af36beb030e69f83667dca5f34501d31213ba0ece8e8a,Merge_failed,f817b81cce09e1138e782ac7c64497cb3f7ea9253c340dfcab657aacb551a022,Merge_failed,3558746ef209d130faf41f035cf3298312986a4cc4642fa6d85eac1d8807c07c,Merge_failed,8d20553f1b49e85fe2beea693b6200cf63e3edac57c94d9bd3793320bc970c32,Merge_failed,8d20553f1b49e85fe2beea693b6200cf63e3edac57c94d9bd3793320bc970c32,Merge_failed,5b72dfe7935a5ea435b550f8836089a69316b51dc03ee7fe642aece4bb377705,Merge_failed,614f0a559a6a7fbf0aa809bbe01287323111d009647a5d578130054b92d82d21,Merge_failed,f817b81cce09e1138e782ac7c64497cb3f7ea9253c340dfcab657aacb551a022,Merge_failed,ede5e8cf6488b55e274bc5d745e621c0ad33d6473306e41f0de777bdf6e795fd,Merge_failed,ede5e8cf6488b55e274bc5d745e621c0ad33d6473306e41f0de777bdf6e795fd,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Merge_failed,fb5d5b84814c528b23e5042e2bbfdd50618509851da19dcbf08da374d91434d0,0.03583264350891113,0.03908681869506836,0.019222259521484375,0.018906354904174805,0.01874256134033203,0.0185849666595459,0.018709421157836914,0.8446898460388184,0.11554312705993652,2.051175355911255,2.056896686553955,1.1810507774353027,10.156453371047974,0.280881404876709 diff --git a/results/combined/merges_timed/qcadoo/mes.csv b/results/combined/merges_timed/qcadoo/mes.csv index a7573ed214..f844db440a 100644 --- a/results/combined/merges_timed/qcadoo/mes.csv +++ b/results/combined/merges_timed/qcadoo/mes.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1544,refs/heads/master,5a3300ac9087e80293dbab93d59b7bf559fb509a,9cbec5446d2c3392b8157222c8647612cd334d10,8d80a80050e179194d2592eb31cb9b78050d0c08,,True,True,089bb19bf37d52e1b2fe510387735908704f583bf5423373db1ce3fa0c265ad4,Tests_passed,6e695137456e4fc2b462063091281316b5b8edad35d1ac259012452092746a2a,Tests_passed,True,True,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,3748fda02f177071531da5a7169b02a5a6a9339303d2950716d6096e965bcd56,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,0.01837301254272461,0.011696577072143555,0.02417898178100586,0.02376103401184082,0.023353099822998047,0.02355027198791504,0.011115074157714844,0.05362439155578613,0.018732070922851562,0.16721224784851074,0.16473388671875,0.07412385940551758,0.8565731048583984,0.2788882255554199 +1544,refs/heads/master,5a3300ac9087e80293dbab93d59b7bf559fb509a,9cbec5446d2c3392b8157222c8647612cd334d10,8d80a80050e179194d2592eb31cb9b78050d0c08,,True,True,089bb19bf37d52e1b2fe510387735908704f583bf5423373db1ce3fa0c265ad4,Tests_passed,6e695137456e4fc2b462063091281316b5b8edad35d1ac259012452092746a2a,Tests_passed,True,True,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,3748fda02f177071531da5a7169b02a5a6a9339303d2950716d6096e965bcd56,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,0.01837301254272461,0.011696577072143555,0.02417898178100586,0.02376103401184082,0.023353099822998047,0.02355027198791504,0.011115074157714844,0.05362439155578613,0.018732070922851562,0.1644742488861084,0.16343474388122559,0.07412385940551758,0.8565731048583984,0.2788882255554199 diff --git a/results/combined/merges_timed/qihoo360/xlearning.csv b/results/combined/merges_timed/qihoo360/xlearning.csv index 8ea3e7ade0..6eee9a7848 100644 --- a/results/combined/merges_timed/qihoo360/xlearning.csv +++ b/results/combined/merges_timed/qihoo360/xlearning.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,93be0646a1cb67bbb6e1117f941151ba14fc7607,be65c5d4b8f92b368953b35409694935906ba113,a136019bb34dcd33c7317dd6a256f6d4ea0f0a19,,True,True,9d882f247fe89083eaa0c8a705148f46f059117e1a79faec1d8f31a54dc63357,Tests_passed,66f9ad3fe492a495ad660819ee85e059199a1717583f4e1160ff88de7131743a,Tests_passed,True,True,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,0.04380655288696289,0.04984688758850098,0.05139327049255371,0.04793262481689453,0.04714512825012207,0.04538917541503906,0.054291486740112305,0.16465163230895996,0.04244565963745117,0.19204974174499512,0.18924927711486816,0.12756013870239258,2.479236125946045,0.7491292953491211 +5,refs/heads/master,93be0646a1cb67bbb6e1117f941151ba14fc7607,be65c5d4b8f92b368953b35409694935906ba113,a136019bb34dcd33c7317dd6a256f6d4ea0f0a19,,True,True,9d882f247fe89083eaa0c8a705148f46f059117e1a79faec1d8f31a54dc63357,Tests_passed,66f9ad3fe492a495ad660819ee85e059199a1717583f4e1160ff88de7131743a,Tests_passed,True,True,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,0.04380655288696289,0.04984688758850098,0.05139327049255371,0.04793262481689453,0.04714512825012207,0.04538917541503906,0.054291486740112305,0.16465163230895996,0.04244565963745117,0.1871490478515625,0.1886758804321289,0.12756013870239258,2.479236125946045,0.7491292953491211 diff --git a/results/combined/merges_timed/qubole/presto-udfs.csv b/results/combined/merges_timed/qubole/presto-udfs.csv index 644f5b6c50..773242f7a5 100644 --- a/results/combined/merges_timed/qubole/presto-udfs.csv +++ b/results/combined/merges_timed/qubole/presto-udfs.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/6,4079746bcf5db1be249f4cab5cc8dfdd71961c4c,ea67e78dbcb8e5814bef147200ca386140286494,d178b8e62619906b2405b974facb07d565a0e26c,,True,True,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Tests_passed,c09e3820fb0eaabc87977c3bce3c15bb23692857af2c578944fe8056b690745c,Tests_passed,True,True,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,fc159d71c10b719f57099ac6cbc51ba7d1a9b5969896f0f3552849ac81105548,Merge_failed,fc159d71c10b719f57099ac6cbc51ba7d1a9b5969896f0f3552849ac81105548,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,b1ce8b983657c6d6b72a193668b73355e15a20f3806ac7a1c6c82c34fd8aede0,0.007806301116943359,0.008121252059936523,0.007941007614135742,0.007681608200073242,0.007650613784790039,0.007485389709472656,0.007800102233886719,0.03119635581970215,0.012808799743652344,0.08736944198608398,0.08784627914428711,0.06455469131469727,0.6087543964385986,0.1500709056854248 +4,refs/remotes/origin/pull/6,4079746bcf5db1be249f4cab5cc8dfdd71961c4c,ea67e78dbcb8e5814bef147200ca386140286494,d178b8e62619906b2405b974facb07d565a0e26c,,True,True,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Tests_passed,c09e3820fb0eaabc87977c3bce3c15bb23692857af2c578944fe8056b690745c,Tests_passed,True,True,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,9b1fa3e31ab503fba1725704dfacc932421d1c55bef741b762987135d95f763d,Merge_failed,fc159d71c10b719f57099ac6cbc51ba7d1a9b5969896f0f3552849ac81105548,Merge_failed,fc159d71c10b719f57099ac6cbc51ba7d1a9b5969896f0f3552849ac81105548,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,b1ce8b983657c6d6b72a193668b73355e15a20f3806ac7a1c6c82c34fd8aede0,0.007806301116943359,0.008121252059936523,0.007941007614135742,0.007681608200073242,0.007650613784790039,0.007485389709472656,0.007800102233886719,0.03119635581970215,0.012808799743652344,0.08686709403991699,0.08657145500183105,0.06455469131469727,0.6087543964385986,0.1500709056854248 diff --git a/results/combined/merges_timed/querydsl/apt-maven-plugin.csv b/results/combined/merges_timed/querydsl/apt-maven-plugin.csv index 57a4cf1336..6fe55a682a 100644 --- a/results/combined/merges_timed/querydsl/apt-maven-plugin.csv +++ b/results/combined/merges_timed/querydsl/apt-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,a665fd53a68969af9effa507810b58a4f3aa5f8b,dbb7382379247c709a4b6194e0789a7f9d4bbe39,ba0b58a11190f93a62992908bbdc2bb201ce57bd,,True,True,e99cdecd632bb5bcab00d309f785e200449f0ce754412ae2d6e29a3dde0c0803,Tests_passed,1a926c173a71ba675eb682ecf9b40e8784211a5d8ec731343c50373a50a5a090,Tests_passed,True,True,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,0.039708852767944336,0.04330086708068848,0.04273343086242676,0.03950619697570801,0.04420661926269531,0.04340076446533203,0.04450249671936035,0.09470343589782715,0.04292893409729004,0.14508771896362305,0.14587712287902832,0.09827828407287598,0.8316278457641602,0.16857624053955078 +14,refs/heads/master,a665fd53a68969af9effa507810b58a4f3aa5f8b,dbb7382379247c709a4b6194e0789a7f9d4bbe39,ba0b58a11190f93a62992908bbdc2bb201ce57bd,,True,True,e99cdecd632bb5bcab00d309f785e200449f0ce754412ae2d6e29a3dde0c0803,Tests_passed,1a926c173a71ba675eb682ecf9b40e8784211a5d8ec731343c50373a50a5a090,Tests_passed,True,True,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,0.039708852767944336,0.04330086708068848,0.04273343086242676,0.03950619697570801,0.04420661926269531,0.04340076446533203,0.04450249671936035,0.09470343589782715,0.04292893409729004,0.14332151412963867,0.14363646507263184,0.09827828407287598,0.8316278457641602,0.16857624053955078 diff --git a/results/combined/merges_timed/qunarcorp/qmq.csv b/results/combined/merges_timed/qunarcorp/qmq.csv index 4f79f3d1b8..30a6ddeb1f 100644 --- a/results/combined/merges_timed/qunarcorp/qmq.csv +++ b/results/combined/merges_timed/qunarcorp/qmq.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -60,refs/remotes/origin/pull/110,6a8eb4126c66b523da574d008c077fb35426d9a8,6a39e0ac27afd06532a3b69cbc347138ed440eb0,4721e7b153c012f282b28728121a90f7aac9a341,,True,True,3b9c64e2680c301c5cad0abba71f38420f91096ca50eb4fff09b68d06b428981,Tests_passed,607691dcc4fc8e8c6c8ffdc73977be4d1f36fe6b6b9bf15dcf8a36fa75b95cc5,Tests_passed,True,True,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,6bf187bb1f9f17744328185f25a5af5102a0e5362f19eae8fcae9730e19962c0,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,5aceef0ed2efbfe027572fbdbcacedf5d89da544e783663ca059143615712a9e,Merge_failed,5aceef0ed2efbfe027572fbdbcacedf5d89da544e783663ca059143615712a9e,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Merge_failed,a60e221529b49e11ef8dd544d16c5d7051e7da6c973ff186d4f0b5408ba7629a,0.06831073760986328,0.0698542594909668,0.08614349365234375,0.08961105346679688,0.07843828201293945,0.08429408073425293,0.08479857444763184,0.15212368965148926,0.08537530899047852,0.11588907241821289,0.11492133140563965,0.1692051887512207,0.6770317554473877,1.4313361644744873 +60,refs/remotes/origin/pull/110,6a8eb4126c66b523da574d008c077fb35426d9a8,6a39e0ac27afd06532a3b69cbc347138ed440eb0,4721e7b153c012f282b28728121a90f7aac9a341,,True,True,3b9c64e2680c301c5cad0abba71f38420f91096ca50eb4fff09b68d06b428981,Tests_passed,607691dcc4fc8e8c6c8ffdc73977be4d1f36fe6b6b9bf15dcf8a36fa75b95cc5,Tests_passed,True,True,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,6bf187bb1f9f17744328185f25a5af5102a0e5362f19eae8fcae9730e19962c0,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,5aceef0ed2efbfe027572fbdbcacedf5d89da544e783663ca059143615712a9e,Merge_failed,5aceef0ed2efbfe027572fbdbcacedf5d89da544e783663ca059143615712a9e,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Merge_failed,a60e221529b49e11ef8dd544d16c5d7051e7da6c973ff186d4f0b5408ba7629a,0.06831073760986328,0.0698542594909668,0.08614349365234375,0.08961105346679688,0.07843828201293945,0.08429408073425293,0.08479857444763184,0.15212368965148926,0.08537530899047852,0.11521124839782715,0.11624932289123535,0.1692051887512207,0.6770317554473877,1.4313361644744873 diff --git a/results/combined/merges_timed/quux00/simplecsv.csv b/results/combined/merges_timed/quux00/simplecsv.csv index 26716c4cd1..ec1295cb9b 100644 --- a/results/combined/merges_timed/quux00/simplecsv.csv +++ b/results/combined/merges_timed/quux00/simplecsv.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,e0ad6010aa7bdb86ac4b59bbf90337b6929108d9,7d4cfeea2f8674d55c5cd2227b0f4150460c4a60,b91e64b85fbd567d874906f36548c2a91328e864,,True,True,40551650259b743df2cedd556d58d694ee4e582fba58504a3b68e0a7ef471ea9,Tests_passed,b03ea54f5b4eba5d65b1b6aa57df08d733a189a99feeb63336de75039ceb8555,Tests_passed,True,True,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,cf30a0b2be3d0cbe095ccdc27219ff655bd6623328493de6145062326de8c4fb,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,7dc0cf538f787d57f54b143a10ce6f318b75a574da0fc47cf8c8bc26dd919a28,Merge_failed,effa7aceb35ba9a8a380c2f0cad8c4e30029dad1e615f9ae01bc3145d7d431cd,Merge_failed,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,30004cf94dc5b6d5be669fac6c9b459f1dc5c14933b0ace2da57deea79657205,Merge_failed,0c5192b7b128a28c50366525934924ca41442e9ed06832e0315eefeab79a5af9,0.05243182182312012,0.042519330978393555,0.06344962120056152,0.043267250061035156,0.05979609489440918,0.06010103225708008,0.03376460075378418,0.3076045513153076,0.08601069450378418,0.09599471092224121,0.09481048583984375,0.23326587677001953,0.7271168231964111,0.256803035736084 +1,refs/heads/master,e0ad6010aa7bdb86ac4b59bbf90337b6929108d9,7d4cfeea2f8674d55c5cd2227b0f4150460c4a60,b91e64b85fbd567d874906f36548c2a91328e864,,True,True,40551650259b743df2cedd556d58d694ee4e582fba58504a3b68e0a7ef471ea9,Tests_passed,b03ea54f5b4eba5d65b1b6aa57df08d733a189a99feeb63336de75039ceb8555,Tests_passed,True,True,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,cf30a0b2be3d0cbe095ccdc27219ff655bd6623328493de6145062326de8c4fb,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,7dc0cf538f787d57f54b143a10ce6f318b75a574da0fc47cf8c8bc26dd919a28,Merge_failed,effa7aceb35ba9a8a380c2f0cad8c4e30029dad1e615f9ae01bc3145d7d431cd,Merge_failed,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,30004cf94dc5b6d5be669fac6c9b459f1dc5c14933b0ace2da57deea79657205,Merge_failed,0c5192b7b128a28c50366525934924ca41442e9ed06832e0315eefeab79a5af9,0.05243182182312012,0.042519330978393555,0.06344962120056152,0.043267250061035156,0.05979609489440918,0.06010103225708008,0.03376460075378418,0.3076045513153076,0.08601069450378418,0.09554839134216309,0.09501862525939941,0.23326587677001953,0.7271168231964111,0.256803035736084 diff --git a/results/combined/merges_timed/rackerlabs/blueflood.csv b/results/combined/merges_timed/rackerlabs/blueflood.csv index 531daac526..4a94f51a1d 100644 --- a/results/combined/merges_timed/rackerlabs/blueflood.csv +++ b/results/combined/merges_timed/rackerlabs/blueflood.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -40,refs/heads/master,f83485d6abdaef72cf27abda4ee7f1a7951f6063,8133bf7948e95ae843ec029b268d7409bf2152ba,859a6a9ae5b584fc1969e84ce7e3c41f0f22678a,,True,True,c0961f8c5ecae697c6650457c732ba77254effd5d1fa7624aaa036c8619847e9,Tests_passed,391766fae545cc73b60975f58b7abb6a4a63bd86ff12d8b9efbc213fdec4cd4e,Tests_passed,True,True,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,0.04640769958496094,0.04857301712036133,0.04402756690979004,0.036324262619018555,0.05599665641784668,0.05721306800842285,0.06047868728637695,0.18665623664855957,0.04794716835021973,0.2437756061553955,0.16158795356750488,0.11330151557922363,0.8167831897735596,0.31805968284606934 +40,refs/heads/master,f83485d6abdaef72cf27abda4ee7f1a7951f6063,8133bf7948e95ae843ec029b268d7409bf2152ba,859a6a9ae5b584fc1969e84ce7e3c41f0f22678a,,True,True,c0961f8c5ecae697c6650457c732ba77254effd5d1fa7624aaa036c8619847e9,Tests_passed,391766fae545cc73b60975f58b7abb6a4a63bd86ff12d8b9efbc213fdec4cd4e,Tests_passed,True,True,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,0.04640769958496094,0.04857301712036133,0.04402756690979004,0.036324262619018555,0.05599665641784668,0.05721306800842285,0.06047868728637695,0.18665623664855957,0.04794716835021973,0.15973615646362305,0.16111993789672852,0.11330151557922363,0.8167831897735596,0.31805968284606934 diff --git a/results/combined/merges_timed/radkovo/cssbox.csv b/results/combined/merges_timed/radkovo/cssbox.csv index 36a18d16a4..e38fb087f0 100644 --- a/results/combined/merges_timed/radkovo/cssbox.csv +++ b/results/combined/merges_timed/radkovo/cssbox.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/master,a43ab1df773cd86623a45610d396e2d3048efb6a,fe025ed3eb78c1d09be279b1ff43a81269e6def2,71087dd6359c906ef07d42c80d7d0d76ae1d99ca,,642adc7bd4d53f9a21c66f7ded2c0b4b342554fe7ffe665a10b777f0d64966dc,Tests_passed,d90d53cd2dbc93ec0047a45a7e442fb2b0d48c4bc7bf387ad381684e4e41e997,Tests_passed,True,True,True,True,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,0.061218976974487305,0.0532839298248291,0.05602717399597168,0.04654884338378906,0.04481959342956543,0.06633639335632324,0.045362234115600586,0.4381446838378906,0.0562288761138916,0.8240334987640381,0.8213107585906982,0.32419896125793457,5.966154098510742,0.23416948318481445 +17,refs/heads/master,a43ab1df773cd86623a45610d396e2d3048efb6a,fe025ed3eb78c1d09be279b1ff43a81269e6def2,71087dd6359c906ef07d42c80d7d0d76ae1d99ca,,642adc7bd4d53f9a21c66f7ded2c0b4b342554fe7ffe665a10b777f0d64966dc,Tests_passed,d90d53cd2dbc93ec0047a45a7e442fb2b0d48c4bc7bf387ad381684e4e41e997,Tests_passed,True,True,True,True,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,0.061218976974487305,0.0532839298248291,0.05602717399597168,0.04654884338378906,0.04481959342956543,0.06633639335632324,0.045362234115600586,0.4381446838378906,0.0562288761138916,0.8272488117218018,0.8144140243530273,0.32419896125793457,5.966154098510742,0.23416948318481445 diff --git a/results/combined/merges_timed/radkovo/jstyleparser.csv b/results/combined/merges_timed/radkovo/jstyleparser.csv index d5f11f930e..ee7982ee34 100644 --- a/results/combined/merges_timed/radkovo/jstyleparser.csv +++ b/results/combined/merges_timed/radkovo/jstyleparser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,8f59a62d1400a52875e9d221cd43368a589a4249,c1e0f1ad746e881ffd87b73fea780f50b37071f3,c26312235c1fdd56a68dc5d240269bbd05862dda,,True,True,e3f85d40a833ed92e01140759da7136c47808b873a531fc75cf86347b67e067e,Tests_passed,0b7e51de8e0874158fea7b7056320a1d9d802b22ef3ef394e61c1289322767ec,Tests_passed,True,True,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,0.038549184799194336,0.027960538864135742,0.04063081741333008,0.051610469818115234,0.04336857795715332,0.03191041946411133,0.01997685432434082,0.1706995964050293,0.04650688171386719,0.19663739204406738,0.19623279571533203,0.11175680160522461,1.9421722888946533,0.24322199821472168 +10,refs/heads/master,8f59a62d1400a52875e9d221cd43368a589a4249,c1e0f1ad746e881ffd87b73fea780f50b37071f3,c26312235c1fdd56a68dc5d240269bbd05862dda,,True,True,e3f85d40a833ed92e01140759da7136c47808b873a531fc75cf86347b67e067e,Tests_passed,0b7e51de8e0874158fea7b7056320a1d9d802b22ef3ef394e61c1289322767ec,Tests_passed,True,True,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,0.038549184799194336,0.027960538864135742,0.04063081741333008,0.051610469818115234,0.04336857795715332,0.03191041946411133,0.01997685432434082,0.1706995964050293,0.04650688171386719,0.19300603866577148,0.19080400466918945,0.11175680160522461,1.9421722888946533,0.24322199821472168 diff --git a/results/combined/merges_timed/radsz/jacop.csv b/results/combined/merges_timed/radsz/jacop.csv index e9159b1b88..c389035fb1 100644 --- a/results/combined/merges_timed/radsz/jacop.csv +++ b/results/combined/merges_timed/radsz/jacop.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/develop,709370e5e7ca8887a55ae12f3357138d7f38684d,a4c3d5c2677fcfde5ebba400dff84db1ba1d202d,dea313a8840655eb7f180b4bb17e3842917592c8,,True,True,0b426a9d9350a3d72d790f76974937ea169be6de6cf1778fc98f914d213a09be,Tests_passed,69683b712a9ae236967fa107592bfdcc6bbdce4b8a2b9c51491a68f6c4397778,Tests_passed,True,True,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,4e1f35ecfb0e04dbc1c9fced6bd6a5162aa467fa2114cfb4a8d7c661d57b84ca,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c36382371e17e7e2434a44b31153da6bc9187fb7faf8d405a6b3f268d78c4954,Tests_failed,fd97614522d876e5b161e92898d62096c8cfe0606be4ca0a1e97726c1d44dccd,Merge_failed,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,89f26487d0cc7eedd0b31c4fd54155a801d5795186efba5f82c010cf0f79ec61,Merge_failed,821fc88e08a697f177acb8c60fd18e9b3daeea28ad76fc7e1c6f74bf9bf62ca6,1.1856019496917725,1.2169826030731201,2.9726181030273438,2.1358423233032227,2.130396604537964,2.111809253692627,3.0532546043395996,1.9766581058502197,1.7784016132354736,1.5330688953399658,1.4605560302734375,1.2829430103302002,3.1715314388275146,14.868497371673584 +11,refs/heads/develop,709370e5e7ca8887a55ae12f3357138d7f38684d,a4c3d5c2677fcfde5ebba400dff84db1ba1d202d,dea313a8840655eb7f180b4bb17e3842917592c8,,True,True,0b426a9d9350a3d72d790f76974937ea169be6de6cf1778fc98f914d213a09be,Tests_passed,69683b712a9ae236967fa107592bfdcc6bbdce4b8a2b9c51491a68f6c4397778,Tests_passed,True,True,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,4e1f35ecfb0e04dbc1c9fced6bd6a5162aa467fa2114cfb4a8d7c661d57b84ca,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c36382371e17e7e2434a44b31153da6bc9187fb7faf8d405a6b3f268d78c4954,Tests_failed,fd97614522d876e5b161e92898d62096c8cfe0606be4ca0a1e97726c1d44dccd,Merge_failed,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,89f26487d0cc7eedd0b31c4fd54155a801d5795186efba5f82c010cf0f79ec61,Merge_failed,821fc88e08a697f177acb8c60fd18e9b3daeea28ad76fc7e1c6f74bf9bf62ca6,1.1856019496917725,1.2169826030731201,2.9726181030273438,2.1358423233032227,2.130396604537964,2.111809253692627,3.0532546043395996,1.9766581058502197,1.7784016132354736,1.3634891510009766,1.3532745838165283,1.2829430103302002,3.1715314388275146,14.868497371673584 diff --git a/results/combined/merges_timed/ralscha/embeddedtc.csv b/results/combined/merges_timed/ralscha/embeddedtc.csv index 4c802976a3..3e0f1981ab 100644 --- a/results/combined/merges_timed/ralscha/embeddedtc.csv +++ b/results/combined/merges_timed/ralscha/embeddedtc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,bfd16f6a9720ac0ff5fdcddf91a5ddd18d996ae2,d9908dceb43b0c27fa9699630dfc3714f224170d,9fec12b47ef5a0a668443caff176254d78117055,,True,True,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,d793988448317818b80e57579942e79a08b6af00bac838b24f7c716c1ff20d52,Tests_passed,True,True,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,0.03755521774291992,0.036257266998291016,0.0402987003326416,0.03762674331665039,0.033106327056884766,0.04208850860595703,0.04137539863586426,0.15802812576293945,0.04029273986816406,0.15122437477111816,0.15294766426086426,0.08736753463745117,0.9598631858825684,0.1692361831665039 +9,refs/heads/master,bfd16f6a9720ac0ff5fdcddf91a5ddd18d996ae2,d9908dceb43b0c27fa9699630dfc3714f224170d,9fec12b47ef5a0a668443caff176254d78117055,,True,True,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,d793988448317818b80e57579942e79a08b6af00bac838b24f7c716c1ff20d52,Tests_passed,True,True,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,0.03755521774291992,0.036257266998291016,0.0402987003326416,0.03762674331665039,0.033106327056884766,0.04208850860595703,0.04137539863586426,0.15802812576293945,0.04029273986816406,0.1500098705291748,0.15032672882080078,0.08736753463745117,0.9598631858825684,0.1692361831665039 diff --git a/results/combined/merges_timed/raml-org/raml-java-parser.csv b/results/combined/merges_timed/raml-org/raml-java-parser.csv index 9b4b5b19e8..e46791630a 100644 --- a/results/combined/merges_timed/raml-org/raml-java-parser.csv +++ b/results/combined/merges_timed/raml-org/raml-java-parser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/remotes/origin/pull/623,ae1104a8aa2b37f92b8aa6485cb38c285310a5e8,83a2384ffbfb2d7814dbc458b27dfcd09f589a3b,3cd23b57bf897436eaa3ecd5d45358494f9f7671,,True,True,df4079e1916c26503d43aa89f37d730ad6f05b7a213506ec636df979c5ea58e6,Tests_passed,042e065ce82ddbe36f3f92807b53f66c1380b3b59c9d1bc7f1f4fc0082db6dd1,Tests_passed,True,True,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,ee669285c0b2af4dd10235a259af89dee951f1a8c86d7fa876fe2abfdc4c2a45,Tests_passed,ee669285c0b2af4dd10235a259af89dee951f1a8c86d7fa876fe2abfdc4c2a45,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,0.07626962661743164,0.07617306709289551,0.07812213897705078,0.07600975036621094,0.07413959503173828,0.0799412727355957,0.07761764526367188,0.3223702907562256,0.07534575462341309,0.4511702060699463,0.44905710220336914,0.24941277503967285,1.999312400817871,0.3376460075378418 +24,refs/remotes/origin/pull/623,ae1104a8aa2b37f92b8aa6485cb38c285310a5e8,83a2384ffbfb2d7814dbc458b27dfcd09f589a3b,3cd23b57bf897436eaa3ecd5d45358494f9f7671,,True,True,df4079e1916c26503d43aa89f37d730ad6f05b7a213506ec636df979c5ea58e6,Tests_passed,042e065ce82ddbe36f3f92807b53f66c1380b3b59c9d1bc7f1f4fc0082db6dd1,Tests_passed,True,True,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,ee669285c0b2af4dd10235a259af89dee951f1a8c86d7fa876fe2abfdc4c2a45,Tests_passed,ee669285c0b2af4dd10235a259af89dee951f1a8c86d7fa876fe2abfdc4c2a45,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,0.07626962661743164,0.07617306709289551,0.07812213897705078,0.07600975036621094,0.07413959503173828,0.0799412727355957,0.07761764526367188,0.3223702907562256,0.07534575462341309,0.44912075996398926,0.4453296661376953,0.24941277503967285,1.999312400817871,0.3376460075378418 diff --git a/results/combined/merges_timed/rcarz/jira-client.csv b/results/combined/merges_timed/rcarz/jira-client.csv index 5356102d70..59361d7d2b 100644 --- a/results/combined/merges_timed/rcarz/jira-client.csv +++ b/results/combined/merges_timed/rcarz/jira-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -101,refs/remotes/origin/pull/295,bcfc36277af06a98a808a3f83bc019232db1bd49,af3260c77d2cc0fe2c8b0d8089e7b7fd68abed91,ec5cc1cd8fcab98c87e02837e9e774b1eff4328a,,True,True,a24c7f37958333a4571427a01f4dbe19b25233c70fe7e6e11a4b05e9156b4ba1,Tests_passed,7cdf69ff6ad2e7881862c68a71160d1af043bc1d368780aedba30deed0e0ca88,Tests_passed,True,True,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,fb3c949b4cd97f9a735510f05569b78eb270b22543421d46416a3b9501b333b4,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,fb3c949b4cd97f9a735510f05569b78eb270b22543421d46416a3b9501b333b4,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,9a210ee8e697131f47069e7f7fbb0c54858c7c662b8bae4a5b8196556cf34bf6,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,03abbb369da75d9c7f5d41ed919320dfc0589b601487855e1a4b2757e4388da1,Merge_failed,03abbb369da75d9c7f5d41ed919320dfc0589b601487855e1a4b2757e4388da1,Merge_failed,3ee210c74639b519177fb85f92f65df4471ecf21158f1ab183e19a3946a48331,Merge_failed,b34b7464714f9e9c48c3fef489bd2f3ea3345bc6bcdb4052f89f620419021f54,Merge_failed,b7d68736f54805cd88ab0235d1f409ceb6ccab477254624a8bb837db81e2fd14,0.033385515213012695,0.05448746681213379,0.04417729377746582,0.04562830924987793,0.035360097885131836,0.038709402084350586,0.04232335090637207,0.23445487022399902,0.06920099258422852,0.1740589141845703,0.17472243309020996,0.17163491249084473,0.9487850666046143,0.17113852500915527 +101,refs/remotes/origin/pull/295,bcfc36277af06a98a808a3f83bc019232db1bd49,af3260c77d2cc0fe2c8b0d8089e7b7fd68abed91,ec5cc1cd8fcab98c87e02837e9e774b1eff4328a,,True,True,a24c7f37958333a4571427a01f4dbe19b25233c70fe7e6e11a4b05e9156b4ba1,Tests_passed,7cdf69ff6ad2e7881862c68a71160d1af043bc1d368780aedba30deed0e0ca88,Tests_passed,True,True,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,fb3c949b4cd97f9a735510f05569b78eb270b22543421d46416a3b9501b333b4,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,fb3c949b4cd97f9a735510f05569b78eb270b22543421d46416a3b9501b333b4,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,9a210ee8e697131f47069e7f7fbb0c54858c7c662b8bae4a5b8196556cf34bf6,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,03abbb369da75d9c7f5d41ed919320dfc0589b601487855e1a4b2757e4388da1,Merge_failed,03abbb369da75d9c7f5d41ed919320dfc0589b601487855e1a4b2757e4388da1,Merge_failed,3ee210c74639b519177fb85f92f65df4471ecf21158f1ab183e19a3946a48331,Merge_failed,b34b7464714f9e9c48c3fef489bd2f3ea3345bc6bcdb4052f89f620419021f54,Merge_failed,b7d68736f54805cd88ab0235d1f409ceb6ccab477254624a8bb837db81e2fd14,0.033385515213012695,0.05448746681213379,0.04417729377746582,0.04562830924987793,0.035360097885131836,0.038709402084350586,0.04232335090637207,0.23445487022399902,0.06920099258422852,0.17368364334106445,0.17191839218139648,0.17163491249084473,0.9487850666046143,0.17113852500915527 diff --git a/results/combined/merges_timed/rcongiu/hive-json-serde.csv b/results/combined/merges_timed/rcongiu/hive-json-serde.csv index 0357939dc4..e8ae67b47d 100644 --- a/results/combined/merges_timed/rcongiu/hive-json-serde.csv +++ b/results/combined/merges_timed/rcongiu/hive-json-serde.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/develop,86449da613900d3e02c87a2c45d6c6f731858130,1936f6dc438e040c207510141ba1e2f148c7aa6e,409c6184b8cadd945c3c44da9bde386e0646c115,,True,True,36144dd1f5094661f82f457985b9d51b8918a84501bb75e05bec926f40ea28b7,Tests_passed,259c726b8278cf3f98af08d42d9d491141c85149a1882474c8756f381493e85d,Tests_passed,True,True,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,0.012160062789916992,0.012373208999633789,0.013889074325561523,0.013831377029418945,0.013921499252319336,0.013530969619750977,0.013926982879638672,0.03930401802062988,0.01151728630065918,0.17070412635803223,0.17136049270629883,0.0669562816619873,0.8882541656494141,0.19475317001342773 +21,refs/heads/develop,86449da613900d3e02c87a2c45d6c6f731858130,1936f6dc438e040c207510141ba1e2f148c7aa6e,409c6184b8cadd945c3c44da9bde386e0646c115,,True,True,36144dd1f5094661f82f457985b9d51b8918a84501bb75e05bec926f40ea28b7,Tests_passed,259c726b8278cf3f98af08d42d9d491141c85149a1882474c8756f381493e85d,Tests_passed,True,True,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,0.012160062789916992,0.012373208999633789,0.013889074325561523,0.013831377029418945,0.013921499252319336,0.013530969619750977,0.013926982879638672,0.03930401802062988,0.01151728630065918,0.16687250137329102,0.1669771671295166,0.0669562816619873,0.8882541656494141,0.19475317001342773 diff --git a/results/combined/merges_timed/rcsb/colorbrewer.csv b/results/combined/merges_timed/rcsb/colorbrewer.csv index 86b1fb086f..cbe6bbbf91 100644 --- a/results/combined/merges_timed/rcsb/colorbrewer.csv +++ b/results/combined/merges_timed/rcsb/colorbrewer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,c551ca68b2e9bdc50824f990db085754ffa6dbdb,43693ef94faa798cf7f15dd0f3557c377e9a201c,ccfe414fa1d26237f8c9538fc5ab255ac8746a1f,,True,True,238fb7ce6926ddc3255f3e34385b4fa728c7ebba038d895b3cce8ec92dbe3106,Tests_passed,ca9a9f5c61fca4d9d0e96bd8e8de449ad3ec3d2133315ec76c8f6a75293839d2,Tests_passed,True,True,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,ffc51d80ac1a6f8571969d141ad8f7486d339a97ead4471540a5065d7d07303d,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,06a54c445316551515e21f446b4a93af190a4686ae42228df07b8a5b0cb3cdf7,Merge_failed,06a54c445316551515e21f446b4a93af190a4686ae42228df07b8a5b0cb3cdf7,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Merge_failed,89817d25ea16e868e3ef74b2788140230ab408e603c57174004c76c83f0e20c7,0.04866838455200195,0.042530059814453125,0.01657700538635254,0.016355514526367188,0.045257568359375,0.04692864418029785,0.04195713996887207,0.16344785690307617,0.04944157600402832,0.08007264137268066,0.08018326759338379,0.11564207077026367,1.1143171787261963,0.1929020881652832 +1,refs/heads/master,c551ca68b2e9bdc50824f990db085754ffa6dbdb,43693ef94faa798cf7f15dd0f3557c377e9a201c,ccfe414fa1d26237f8c9538fc5ab255ac8746a1f,,True,True,238fb7ce6926ddc3255f3e34385b4fa728c7ebba038d895b3cce8ec92dbe3106,Tests_passed,ca9a9f5c61fca4d9d0e96bd8e8de449ad3ec3d2133315ec76c8f6a75293839d2,Tests_passed,True,True,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,ffc51d80ac1a6f8571969d141ad8f7486d339a97ead4471540a5065d7d07303d,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,06a54c445316551515e21f446b4a93af190a4686ae42228df07b8a5b0cb3cdf7,Merge_failed,06a54c445316551515e21f446b4a93af190a4686ae42228df07b8a5b0cb3cdf7,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Merge_failed,89817d25ea16e868e3ef74b2788140230ab408e603c57174004c76c83f0e20c7,0.04866838455200195,0.042530059814453125,0.01657700538635254,0.016355514526367188,0.045257568359375,0.04692864418029785,0.04195713996887207,0.16344785690307617,0.04944157600402832,0.08035421371459961,0.07986283302307129,0.11564207077026367,1.1143171787261963,0.1929020881652832 diff --git a/results/combined/merges_timed/rdfhdt/hdt-java.csv b/results/combined/merges_timed/rdfhdt/hdt-java.csv index ae990c28ea..0d93059adb 100644 --- a/results/combined/merges_timed/rdfhdt/hdt-java.csv +++ b/results/combined/merges_timed/rdfhdt/hdt-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -84,refs/heads/master,957ba7f643048114a3936adfae1d1f3b46a5cc12,f36f561a6571e7663568ed2f9f249ee01aac6502,8e23b101e278eda1b1ebcec4bca3543520717812,,True,True,beebd6d83095eb3f63fd612de75b2f86811d44481141ee5fe8071f5b170f72d0,Tests_passed,61a73b86a2d81844bb6289942366122c51c2c385d1968534f3b32c30e1fc9562,Tests_passed,True,True,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,fff981ef917cf60898f27fcd9a9691f419fcee99141b1fc0657f46ee3c3ebe73,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,0.021065950393676758,0.02107071876525879,0.024847030639648438,0.0246584415435791,0.025048017501831055,0.024925947189331055,0.024729490280151367,0.19023895263671875,0.020433425903320312,1.7982127666473389,1.7878496646881104,0.6547856330871582,8.358103275299072,0.3446784019470215 +84,refs/heads/master,957ba7f643048114a3936adfae1d1f3b46a5cc12,f36f561a6571e7663568ed2f9f249ee01aac6502,8e23b101e278eda1b1ebcec4bca3543520717812,,True,True,beebd6d83095eb3f63fd612de75b2f86811d44481141ee5fe8071f5b170f72d0,Tests_passed,61a73b86a2d81844bb6289942366122c51c2c385d1968534f3b32c30e1fc9562,Tests_passed,True,True,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,fff981ef917cf60898f27fcd9a9691f419fcee99141b1fc0657f46ee3c3ebe73,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,0.021065950393676758,0.02107071876525879,0.024847030639648438,0.0246584415435791,0.025048017501831055,0.024925947189331055,0.024729490280151367,0.19023895263671875,0.020433425903320312,1.7847900390625,1.7758350372314453,0.6547856330871582,8.358103275299072,0.3446784019470215 diff --git a/results/combined/merges_timed/reckart/shib-http-client.csv b/results/combined/merges_timed/reckart/shib-http-client.csv index 7f2811c53d..9f1db2f8f7 100644 --- a/results/combined/merges_timed/reckart/shib-http-client.csv +++ b/results/combined/merges_timed/reckart/shib-http-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,536fe936a3def7020da2c514f6b2c42fd39b4d11,da399ec67592ca7205a57c599e4058a69669ad3c,3918e16a51c68433085c57c3690a21e4219b74ba,,d4c1c32de7c810aea99daef55638bb0f41153fe5af179c6c004ef0a7d7161d73,Tests_passed,96df33bc8056dea40d7ef25e1175ec08eadeaa5409565001c92fa916a7bf77a3,Tests_passed,True,True,True,True,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,0.042814016342163086,0.044199228286743164,0.042525529861450195,0.04421520233154297,0.04509735107421875,0.044655561447143555,0.04479408264160156,0.1647961139678955,0.044087886810302734,0.16401100158691406,0.1647484302520752,0.11196041107177734,1.0000224113464355,0.18900179862976074 +9,refs/heads/master,536fe936a3def7020da2c514f6b2c42fd39b4d11,da399ec67592ca7205a57c599e4058a69669ad3c,3918e16a51c68433085c57c3690a21e4219b74ba,,d4c1c32de7c810aea99daef55638bb0f41153fe5af179c6c004ef0a7d7161d73,Tests_passed,96df33bc8056dea40d7ef25e1175ec08eadeaa5409565001c92fa916a7bf77a3,Tests_passed,True,True,True,True,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,0.042814016342163086,0.044199228286743164,0.042525529861450195,0.04421520233154297,0.04509735107421875,0.044655561447143555,0.04479408264160156,0.1647961139678955,0.044087886810302734,0.1618642807006836,0.1611940860748291,0.11196041107177734,1.0000224113464355,0.18900179862976074 diff --git a/results/combined/merges_timed/recommenders/rival.csv b/results/combined/merges_timed/recommenders/rival.csv index 91dc2a2c46..68026d9430 100644 --- a/results/combined/merges_timed/recommenders/rival.csv +++ b/results/combined/merges_timed/recommenders/rival.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,a8d64144a645278ab58db673a56ef5ff43417d0f,35e15a2d817fa78d5673187304b7b0db0f67b79a,ddfa73bea6cc8ac327d313fa229cbe1b56cef22c,,True,True,60571ade857332c578d2f66add29262b732f18fe63ed4a42082b31a84978db51,Tests_passed,f77ff9dbf10b7cb1035c46ae951426ba231b54ccb56527d58e4237441342d5e0,Tests_passed,True,True,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,0.04232907295227051,0.04488635063171387,0.048690080642700195,0.04459714889526367,0.04055380821228027,0.04505491256713867,0.03595423698425293,0.16249752044677734,0.04174351692199707,0.1606607437133789,0.1580963134765625,0.08306241035461426,0.8822517395019531,0.22337675094604492 +2,refs/heads/master,a8d64144a645278ab58db673a56ef5ff43417d0f,35e15a2d817fa78d5673187304b7b0db0f67b79a,ddfa73bea6cc8ac327d313fa229cbe1b56cef22c,,True,True,60571ade857332c578d2f66add29262b732f18fe63ed4a42082b31a84978db51,Tests_passed,f77ff9dbf10b7cb1035c46ae951426ba231b54ccb56527d58e4237441342d5e0,Tests_passed,True,True,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,0.04232907295227051,0.04488635063171387,0.048690080642700195,0.04459714889526367,0.04055380821228027,0.04505491256713867,0.03595423698425293,0.16249752044677734,0.04174351692199707,0.1585826873779297,0.157670259475708,0.08306241035461426,0.8822517395019531,0.22337675094604492 diff --git a/results/combined/merges_timed/recruit-tech/redpen.csv b/results/combined/merges_timed/recruit-tech/redpen.csv index adb40628df..78d11b14a0 100644 --- a/results/combined/merges_timed/recruit-tech/redpen.csv +++ b/results/combined/merges_timed/recruit-tech/redpen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/heads/master,fa710f48dd8ca04e42fa079491a65d17763dbfc8,647b2646daa95dd8dcb77bf6c8a5b5f653acf0f6,64ca201ccd7fcfc3fbcc45f2d8c934bed01e56e7,,True,True,68f4424f3594a8b6d46124a8aff1f6d931b7fff47fd626d27489e03070c06989,Tests_passed,08b7d4b08ef90917fae5c9f7c661b7f52f4be87f11cf225079798a695b65a57d,Tests_passed,True,True,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,0.047443389892578125,0.045870065689086914,0.0496065616607666,0.03603363037109375,0.02188563346862793,0.04604983329772949,0.03578996658325195,0.15380287170410156,0.03500866889953613,0.15332651138305664,0.15274691581726074,0.11947250366210938,0.6913967132568359,0.2550013065338135 +32,refs/heads/master,fa710f48dd8ca04e42fa079491a65d17763dbfc8,647b2646daa95dd8dcb77bf6c8a5b5f653acf0f6,64ca201ccd7fcfc3fbcc45f2d8c934bed01e56e7,,True,True,68f4424f3594a8b6d46124a8aff1f6d931b7fff47fd626d27489e03070c06989,Tests_passed,08b7d4b08ef90917fae5c9f7c661b7f52f4be87f11cf225079798a695b65a57d,Tests_passed,True,True,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,0.047443389892578125,0.045870065689086914,0.0496065616607666,0.03603363037109375,0.02188563346862793,0.04604983329772949,0.03578996658325195,0.15380287170410156,0.03500866889953613,0.15091919898986816,0.15147948265075684,0.11947250366210938,0.6913967132568359,0.2550013065338135 diff --git a/results/combined/merges_timed/redhogs/cron-parser.csv b/results/combined/merges_timed/redhogs/cron-parser.csv index b21e387aee..60ad37534a 100644 --- a/results/combined/merges_timed/redhogs/cron-parser.csv +++ b/results/combined/merges_timed/redhogs/cron-parser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/remotes/origin/pull/46,200e4e12bf5d866a9b127c78d5c44dd1ca5180a9,449f4a3742f32e463fc9f360f325c67c5f3813b5,e0a8d56ec328b0c3f6fc397891948545e0804cce,,8f1f1e38968faf4bdcf4505d19d38ae747bc70f038cbe2e7ddcdbd16230cd2da,Tests_passed,d005990ece286fc40fc39a12143ddc3bc898d928f007561d70ff34cd1068ac0d,Tests_passed,True,True,True,True,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,8db9c9ec2179cdda1eeb264157902f7a6d5c3e410ed0c626f905ca190e37720e,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,8db9c9ec2179cdda1eeb264157902f7a6d5c3e410ed0c626f905ca190e37720e,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,a4ea865e0b3f2b90a37324dbac5b4953c313cb09c7358cb0b7213ee740b5aab8,Merge_failed,a4ea865e0b3f2b90a37324dbac5b4953c313cb09c7358cb0b7213ee740b5aab8,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,9c37059bdf68f69e63f3677eb768e996dcaa2d1cb450de5a35b56407feb2f988,Merge_failed,e6f4a50194a441f2f03e7f9f2478691804751cc4326c0bf99cf8ac4e7b8a4269,0.03078174591064453,0.039942026138305664,0.04521012306213379,0.030151844024658203,0.04386734962463379,0.044976234436035156,0.050771474838256836,0.23487067222595215,0.08426141738891602,0.12940239906311035,0.136368989944458,0.17686915397644043,0.6570889949798584,0.20254254341125488 +11,refs/remotes/origin/pull/46,200e4e12bf5d866a9b127c78d5c44dd1ca5180a9,449f4a3742f32e463fc9f360f325c67c5f3813b5,e0a8d56ec328b0c3f6fc397891948545e0804cce,,8f1f1e38968faf4bdcf4505d19d38ae747bc70f038cbe2e7ddcdbd16230cd2da,Tests_passed,d005990ece286fc40fc39a12143ddc3bc898d928f007561d70ff34cd1068ac0d,Tests_passed,True,True,True,True,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,8db9c9ec2179cdda1eeb264157902f7a6d5c3e410ed0c626f905ca190e37720e,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,8db9c9ec2179cdda1eeb264157902f7a6d5c3e410ed0c626f905ca190e37720e,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,dd1b429d93ae756aa26cd490bf7b3984dcd66f077e9e0e25c32d01b0c5ec5464,Merge_failed,a4ea865e0b3f2b90a37324dbac5b4953c313cb09c7358cb0b7213ee740b5aab8,Merge_failed,a4ea865e0b3f2b90a37324dbac5b4953c313cb09c7358cb0b7213ee740b5aab8,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,9c37059bdf68f69e63f3677eb768e996dcaa2d1cb450de5a35b56407feb2f988,Merge_failed,e6f4a50194a441f2f03e7f9f2478691804751cc4326c0bf99cf8ac4e7b8a4269,0.03078174591064453,0.039942026138305664,0.04521012306213379,0.030151844024658203,0.04386734962463379,0.044976234436035156,0.050771474838256836,0.23487067222595215,0.08426141738891602,0.12964415550231934,0.1202850341796875,0.17686915397644043,0.6570889949798584,0.20254254341125488 diff --git a/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv b/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv index 6251c3462c..a0c9ca418d 100644 --- a/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv +++ b/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,9cf94e88e0aa92bd28fbf690202b6428789fa3d2,c789c22cdb1587566a1db933c5e94e470eeb8330,ba962853fb12f7b9caa3a7f35e75ed5bf3aa994c,,42e27e8e2ef5d8978a01c1e4d77f9831016a7ca579cdd7e29bdc09f332c2bdd7,Tests_passed,0a72157776f23d88bfd3527734732155be398c4591ab878e22ca52a7171d9433,Tests_passed,True,True,True,True,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,0.05435585975646973,0.0455629825592041,0.05287337303161621,0.05108904838562012,0.05508232116699219,0.04820847511291504,0.04382467269897461,0.17595577239990234,0.02501988410949707,0.16847515106201172,0.16844773292541504,0.10870981216430664,1.389901876449585,0.24634695053100586 +20,refs/heads/master,9cf94e88e0aa92bd28fbf690202b6428789fa3d2,c789c22cdb1587566a1db933c5e94e470eeb8330,ba962853fb12f7b9caa3a7f35e75ed5bf3aa994c,,42e27e8e2ef5d8978a01c1e4d77f9831016a7ca579cdd7e29bdc09f332c2bdd7,Tests_passed,0a72157776f23d88bfd3527734732155be398c4591ab878e22ca52a7171d9433,Tests_passed,True,True,True,True,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,0.05435585975646973,0.0455629825592041,0.05287337303161621,0.05108904838562012,0.05508232116699219,0.04820847511291504,0.04382467269897461,0.17595577239990234,0.02501988410949707,0.175614595413208,0.16512656211853027,0.10870981216430664,1.389901876449585,0.24634695053100586 diff --git a/results/combined/merges_timed/redsolution/otr4j.csv b/results/combined/merges_timed/redsolution/otr4j.csv index d3beb32e80..0018f619b0 100644 --- a/results/combined/merges_timed/redsolution/otr4j.csv +++ b/results/combined/merges_timed/redsolution/otr4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,fee9c908d0389fa3e5ae469d907f2c872a23ce39,61f4011bf4abff5d60aab546bec06f886267b848,001049afe7cabe92929fed4bdc5b639a581763a9,,18e903ecbd4b08fe7c00c8308ac378c77f01176f89bb5af75880d3b70baf2639,Tests_passed,d9d5f2b75a18c7e67a058524f550ff03fe02b2b30d0a219540b7cc50fbe40c03,Tests_passed,True,True,True,True,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,5ac512d983d560539d00ec6c24c08ef9b93fbc303419434a7d931e40ba86ec01,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,64187653f46f4ed7600fcd3f3ef80ef9198ed050189b974c00817217aa3b2b2f,Merge_failed,64187653f46f4ed7600fcd3f3ef80ef9198ed050189b974c00817217aa3b2b2f,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Merge_failed,95b687445d80aa05f74dabb62a6f647a8d10a5d1ee2237099ac92cf7c0b71716,0.012730836868286133,0.01240992546081543,0.013198137283325195,0.013145685195922852,0.013331174850463867,0.013328075408935547,0.013620376586914062,0.040426015853881836,0.019008874893188477,0.15099024772644043,0.15003490447998047,0.07405614852905273,0.9386904239654541,0.1886129379272461 +5,refs/heads/master,fee9c908d0389fa3e5ae469d907f2c872a23ce39,61f4011bf4abff5d60aab546bec06f886267b848,001049afe7cabe92929fed4bdc5b639a581763a9,,18e903ecbd4b08fe7c00c8308ac378c77f01176f89bb5af75880d3b70baf2639,Tests_passed,d9d5f2b75a18c7e67a058524f550ff03fe02b2b30d0a219540b7cc50fbe40c03,Tests_passed,True,True,True,True,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,5ac512d983d560539d00ec6c24c08ef9b93fbc303419434a7d931e40ba86ec01,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,64187653f46f4ed7600fcd3f3ef80ef9198ed050189b974c00817217aa3b2b2f,Merge_failed,64187653f46f4ed7600fcd3f3ef80ef9198ed050189b974c00817217aa3b2b2f,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Merge_failed,95b687445d80aa05f74dabb62a6f647a8d10a5d1ee2237099ac92cf7c0b71716,0.012730836868286133,0.01240992546081543,0.013198137283325195,0.013145685195922852,0.013331174850463867,0.013328075408935547,0.013620376586914062,0.040426015853881836,0.019008874893188477,0.14094758033752441,0.13973045349121094,0.07405614852905273,0.9386904239654541,0.1886129379272461 diff --git a/results/combined/merges_timed/reficio/p2-maven-plugin.csv b/results/combined/merges_timed/reficio/p2-maven-plugin.csv index 63267b584b..d50a2d1f22 100644 --- a/results/combined/merges_timed/reficio/p2-maven-plugin.csv +++ b/results/combined/merges_timed/reficio/p2-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -70,refs/heads/master,d3cdd1c58dd31c5b6a2ece582ccb58cec53b684a,fe15b0719486b8eda7c323abe2d6de77a7826314,67be923d7d2e37458eda32bdd1ae0b3021b0b39b,,True,True,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,True,True,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,0.04572319984436035,0.04218006134033203,0.042825937271118164,0.044447898864746094,0.030017375946044922,0.04366922378540039,0.03965878486633301,0.15820002555847168,0.04099106788635254,0.16198134422302246,0.16245818138122559,0.1149599552154541,0.9635367393493652,0.22087955474853516 +70,refs/heads/master,d3cdd1c58dd31c5b6a2ece582ccb58cec53b684a,fe15b0719486b8eda7c323abe2d6de77a7826314,67be923d7d2e37458eda32bdd1ae0b3021b0b39b,,True,True,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,True,True,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,0.04572319984436035,0.04218006134033203,0.042825937271118164,0.044447898864746094,0.030017375946044922,0.04366922378540039,0.03965878486633301,0.15820002555847168,0.04099106788635254,0.16654133796691895,0.1597442626953125,0.1149599552154541,0.9635367393493652,0.22087955474853516 diff --git a/results/combined/merges_timed/reinert/jjschema.csv b/results/combined/merges_timed/reinert/jjschema.csv index efde6937d4..56d1a50f1b 100644 --- a/results/combined/merges_timed/reinert/jjschema.csv +++ b/results/combined/merges_timed/reinert/jjschema.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,1276436b3b812eaaf43853b357eaa08039f5f291,8db7dd20d9f9b09d5a3956e97658ee91a8b2dc8c,3cda79e6dffc9bb6162bac5f926f2ec5721d12c4,,True,True,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,a475a662b481575e3dcfe3f088dd0f303541a96b1d302632d87b5d2bf1f3a1a1,Tests_passed,True,True,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,0.014084339141845703,0.013935089111328125,0.015578031539916992,0.015449285507202148,0.015547513961791992,0.01589369773864746,0.01563286781311035,0.07394051551818848,0.013774394989013672,0.4481215476989746,0.4498872756958008,0.18160796165466309,0.029676437377929688,0.17998743057250977 +7,refs/heads/master,1276436b3b812eaaf43853b357eaa08039f5f291,8db7dd20d9f9b09d5a3956e97658ee91a8b2dc8c,3cda79e6dffc9bb6162bac5f926f2ec5721d12c4,,True,True,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,a475a662b481575e3dcfe3f088dd0f303541a96b1d302632d87b5d2bf1f3a1a1,Tests_passed,True,True,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,0.014084339141845703,0.013935089111328125,0.015578031539916992,0.015449285507202148,0.015547513961791992,0.01589369773864746,0.01563286781311035,0.07394051551818848,0.013774394989013672,0.44086313247680664,0.43927001953125,0.18160796165466309,0.029676437377929688,0.17998743057250977 diff --git a/results/combined/merges_timed/relayrides/pushy.csv b/results/combined/merges_timed/relayrides/pushy.csv index ab572dc922..a715c89003 100644 --- a/results/combined/merges_timed/relayrides/pushy.csv +++ b/results/combined/merges_timed/relayrides/pushy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -194,refs/heads/main,37aade73e77e75f5aab20300651a247d9b96c1ab,ff61066de3f0d95df8ea8d52e00964b0fa23b294,9886db776864ebac91327b127008ab9013ab38b6,,True,True,b9bcf51788f6efdb084c19c317e9d9c7db6eecdc2bcf2e085b561542162a28f8,Tests_passed,d167b8cd68816774c58ef578198562d232a54861914c1857b6e79781c7276ce2,Tests_passed,True,True,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,c4ecedae4ace65638a95638935b7821f722b92cd4ef7f93ab99d56f611d78161,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,0269f289b2940499483e702d472e27c3e2c796045cf92c451d9f12a28761a419,Merge_failed,fa101fce4ae615f4dd37e4a04ed35a38f97ede4b1a8c4dd84b97194efa13bc8a,Merge_failed,9e950886f6bdf20f5485b2072f3d7759e7ff6571fb26d3be1744b7d15522bc37,0.013028860092163086,0.04218697547912598,0.046770334243774414,0.05018281936645508,0.05138540267944336,0.04596114158630371,0.012801408767700195,0.28589606285095215,0.07427692413330078,0.3241453170776367,0.321915864944458,0.1712172031402588,1.7000908851623535,0.24216222763061523 +194,refs/heads/main,37aade73e77e75f5aab20300651a247d9b96c1ab,ff61066de3f0d95df8ea8d52e00964b0fa23b294,9886db776864ebac91327b127008ab9013ab38b6,,True,True,b9bcf51788f6efdb084c19c317e9d9c7db6eecdc2bcf2e085b561542162a28f8,Tests_passed,d167b8cd68816774c58ef578198562d232a54861914c1857b6e79781c7276ce2,Tests_passed,True,True,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,c4ecedae4ace65638a95638935b7821f722b92cd4ef7f93ab99d56f611d78161,Merge_failed,e384125055db90eb8c2c919f7bfe0474f6387c782f553d352c4cd11d8b83a719,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,0269f289b2940499483e702d472e27c3e2c796045cf92c451d9f12a28761a419,Merge_failed,fa101fce4ae615f4dd37e4a04ed35a38f97ede4b1a8c4dd84b97194efa13bc8a,Merge_failed,9e950886f6bdf20f5485b2072f3d7759e7ff6571fb26d3be1744b7d15522bc37,0.013028860092163086,0.04218697547912598,0.046770334243774414,0.05018281936645508,0.05138540267944336,0.04596114158630371,0.012801408767700195,0.28589606285095215,0.07427692413330078,0.3204469680786133,0.3205263614654541,0.1712172031402588,1.7000908851623535,0.24216222763061523 diff --git a/results/combined/merges_timed/release-engineering/pom-manipulation-ext.csv b/results/combined/merges_timed/release-engineering/pom-manipulation-ext.csv index 1ff9ba92d6..64d88bf6f1 100644 --- a/results/combined/merges_timed/release-engineering/pom-manipulation-ext.csv +++ b/results/combined/merges_timed/release-engineering/pom-manipulation-ext.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -299,refs/heads/main,f742e2398f271a294be77b95814feed3fcddd144,80b6b8712f99eeef4fa92845ed66d47bbb0c95d0,2af23194cabbd906de81e134e0e54cd8efd92dd8,,True,True,051eb4d82150dd58e8bd4f4a3647c9cd556dccf92e7347a83d492bc774760b36,Tests_passed,635508baf24033af50ba2b5b69c5f69fe49bc0fdb648a80d3fe61f67304797e7,Tests_passed,True,True,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,0.04129624366760254,0.043050527572631836,0.04796433448791504,0.04821157455444336,0.05438876152038574,0.048902034759521484,0.02735733985900879,0.23865175247192383,0.04308652877807617,0.32749152183532715,0.32047605514526367,0.16268062591552734,2.4165632724761963,0.24120259284973145 +299,refs/heads/main,f742e2398f271a294be77b95814feed3fcddd144,80b6b8712f99eeef4fa92845ed66d47bbb0c95d0,2af23194cabbd906de81e134e0e54cd8efd92dd8,,True,True,051eb4d82150dd58e8bd4f4a3647c9cd556dccf92e7347a83d492bc774760b36,Tests_passed,635508baf24033af50ba2b5b69c5f69fe49bc0fdb648a80d3fe61f67304797e7,Tests_passed,True,True,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,0.04129624366760254,0.043050527572631836,0.04796433448791504,0.04821157455444336,0.05438876152038574,0.048902034759521484,0.02735733985900879,0.23865175247192383,0.04308652877807617,0.3244483470916748,0.3186609745025635,0.16268062591552734,2.4165632724761963,0.24120259284973145 diff --git a/results/combined/merges_timed/renepickhardt/generalized-language-modeling-toolkit.csv b/results/combined/merges_timed/renepickhardt/generalized-language-modeling-toolkit.csv index df6a84d451..e8642213cc 100644 --- a/results/combined/merges_timed/renepickhardt/generalized-language-modeling-toolkit.csv +++ b/results/combined/merges_timed/renepickhardt/generalized-language-modeling-toolkit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,f8105ddc44d47cbadcf250db7f2e6240addce1de,159a50f8e2b21ae099529ca63155ade49e5b64a3,d1fe078010338d875bd7eb034505e0bbb8180878,,True,True,94dbcabceb1b23a8c1a83275a4882391d257edf919655d326212e4f8fdafc8dc,Tests_passed,7b76b1b94de96f93eadfae1aa0f02dd874d579db6ce983bf5b16d7810636620b,Tests_passed,True,True,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,0.04607224464416504,0.04683518409729004,0.01387786865234375,0.011320829391479492,0.04167366027832031,0.0839393138885498,0.01137852668762207,0.18076634407043457,0.012948989868164062,0.20736289024353027,0.207106351852417,0.10594820976257324,0.6746811866760254,0.23098015785217285 +12,refs/heads/master,f8105ddc44d47cbadcf250db7f2e6240addce1de,159a50f8e2b21ae099529ca63155ade49e5b64a3,d1fe078010338d875bd7eb034505e0bbb8180878,,True,True,94dbcabceb1b23a8c1a83275a4882391d257edf919655d326212e4f8fdafc8dc,Tests_passed,7b76b1b94de96f93eadfae1aa0f02dd874d579db6ce983bf5b16d7810636620b,Tests_passed,True,True,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,0.04607224464416504,0.04683518409729004,0.01387786865234375,0.011320829391479492,0.04167366027832031,0.0839393138885498,0.01137852668762207,0.18076634407043457,0.012948989868164062,0.16002655029296875,0.20498418807983398,0.10594820976257324,0.6746811866760254,0.23098015785217285 diff --git a/results/combined/merges_timed/renggli/java-petitparser.csv b/results/combined/merges_timed/renggli/java-petitparser.csv index 41eccd9ff4..f38fcd3579 100644 --- a/results/combined/merges_timed/renggli/java-petitparser.csv +++ b/results/combined/merges_timed/renggli/java-petitparser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,Tests_passed,True,True,True,True,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,0.04942202568054199,0.05022859573364258,0.047605276107788086,0.049599647521972656,0.044625043869018555,0.042426109313964844,0.04822540283203125,0.23439264297485352,0.044141292572021484,0.28436732292175293,0.28533148765563965,0.1763904094696045,1.2477366924285889,0.1943223476409912 +6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,Tests_passed,True,True,True,True,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,0.04942202568054199,0.05022859573364258,0.047605276107788086,0.049599647521972656,0.044625043869018555,0.042426109313964844,0.04822540283203125,0.23439264297485352,0.044141292572021484,0.2867002487182617,0.28539419174194336,0.1763904094696045,1.2477366924285889,0.1943223476409912 diff --git a/results/combined/merges_timed/renggli/petitparserjava.csv b/results/combined/merges_timed/renggli/petitparserjava.csv index 88ef026306..6ef1464643 100644 --- a/results/combined/merges_timed/renggli/petitparserjava.csv +++ b/results/combined/merges_timed/renggli/petitparserjava.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,Tests_passed,True,True,True,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,b9409c9a6ce2e440f7a37c1038d7ce4f40df7a40ce1a0e0011480efb3c02bdb6,Merge_failed,b9409c9a6ce2e440f7a37c1038d7ce4f40df7a40ce1a0e0011480efb3c02bdb6,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,65fe63f9cfb6d201cdb21c20b260b20b76a721b163b0ff5dfd35245e653887fe,0.04497075080871582,0.043775320053100586,0.03349924087524414,0.04470634460449219,0.05392313003540039,0.045473337173461914,0.05715751647949219,0.2990546226501465,0.06797671318054199,0.3542959690093994,0.3505277633666992,0.21396470069885254,1.3772261142730713,0.23023724555969238 +8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,Tests_passed,True,True,True,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,b9409c9a6ce2e440f7a37c1038d7ce4f40df7a40ce1a0e0011480efb3c02bdb6,Merge_failed,b9409c9a6ce2e440f7a37c1038d7ce4f40df7a40ce1a0e0011480efb3c02bdb6,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,65fe63f9cfb6d201cdb21c20b260b20b76a721b163b0ff5dfd35245e653887fe,0.04497075080871582,0.043775320053100586,0.03349924087524414,0.04470634460449219,0.05392313003540039,0.045473337173461914,0.05715751647949219,0.2990546226501465,0.06797671318054199,0.3408966064453125,0.3402903079986572,0.21396470069885254,1.3772261142730713,0.23023724555969238 diff --git a/results/combined/merges_timed/resthub/springmvc-router.csv b/results/combined/merges_timed/resthub/springmvc-router.csv index 24f125d62e..6935cddc2b 100644 --- a/results/combined/merges_timed/resthub/springmvc-router.csv +++ b/results/combined/merges_timed/resthub/springmvc-router.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/heads/master,71d38b423902b98a187292a1c0e9a6665fe35231,3bc490f1e9e979e3189625ac19f2741a69699010,bd30ac190818c9c32c8031cac4e3000058fc97d1,,True,True,feb2b6df8a147fdf1601ba8eaed7f15db417fef74a5efa6bce8909e5dceb63b3,Tests_passed,471c3694e6663ad3811ec61d10dddef8a7abf46b0481061bb3338b069eaf362a,Tests_passed,True,True,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,b69da98bfea2c23be818bd43a0d9e04a3eb5694167771bbc5fe216c82e2fb8fa,Merge_failed,102e69c0660440003e727d3fab4699276fd76ffeb22aebcad00f5467613b895a,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,19a9807ed77f75b8e837c8ae407afc5afb66e73ef15d83a0a553e2c06152453f,Merge_failed,19a9807ed77f75b8e837c8ae407afc5afb66e73ef15d83a0a553e2c06152453f,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Merge_failed,29ed3bcb40386c195e075fddf14a3f91bae386a754342b505770d7f283fdf3f2,0.03872871398925781,0.04697155952453613,0.04500102996826172,0.044501304626464844,0.036568641662597656,0.0408017635345459,0.04121255874633789,0.28460073471069336,0.06341266632080078,0.2191321849822998,0.21414542198181152,0.24010634422302246,1.4766814708709717,0.20829391479492188 +25,refs/heads/master,71d38b423902b98a187292a1c0e9a6665fe35231,3bc490f1e9e979e3189625ac19f2741a69699010,bd30ac190818c9c32c8031cac4e3000058fc97d1,,True,True,feb2b6df8a147fdf1601ba8eaed7f15db417fef74a5efa6bce8909e5dceb63b3,Tests_passed,471c3694e6663ad3811ec61d10dddef8a7abf46b0481061bb3338b069eaf362a,Tests_passed,True,True,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,b69da98bfea2c23be818bd43a0d9e04a3eb5694167771bbc5fe216c82e2fb8fa,Merge_failed,102e69c0660440003e727d3fab4699276fd76ffeb22aebcad00f5467613b895a,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,19a9807ed77f75b8e837c8ae407afc5afb66e73ef15d83a0a553e2c06152453f,Merge_failed,19a9807ed77f75b8e837c8ae407afc5afb66e73ef15d83a0a553e2c06152453f,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Merge_failed,29ed3bcb40386c195e075fddf14a3f91bae386a754342b505770d7f283fdf3f2,0.03872871398925781,0.04697155952453613,0.04500102996826172,0.044501304626464844,0.036568641662597656,0.0408017635345459,0.04121255874633789,0.28460073471069336,0.06341266632080078,0.21218299865722656,0.21259713172912598,0.24010634422302246,1.4766814708709717,0.20829391479492188 diff --git a/results/combined/merges_timed/resty-gwt/resty-gwt.csv b/results/combined/merges_timed/resty-gwt/resty-gwt.csv index 9a4eecb4b5..74ee8c0b5f 100644 --- a/results/combined/merges_timed/resty-gwt/resty-gwt.csv +++ b/results/combined/merges_timed/resty-gwt/resty-gwt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,867b917c43c32acbdcac55767e7f04334006c866,05733cb0d13bbfd97adc6a9eda47b4ea3dcf04e6,9d45c90a98203c46b16910b1470fead4b3ae09e4,,True,True,833d3a55324d94ffa54b859d6714376079b6e3c1ecef892dad5248540068965d,Tests_passed,acf6165089b11a4759d351a9b67c1f38511392d7d788a3aa22a0ba1871060943,Tests_passed,True,True,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_failed,103689b36464d8dd0df270c54743fb86c90e7676c5acdae2f0f8b692f96cc5d2,Tests_failed,103689b36464d8dd0df270c54743fb86c90e7676c5acdae2f0f8b692f96cc5d2,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,0.017783641815185547,0.021543025970458984,0.027135848999023438,0.027832984924316406,0.02328801155090332,0.027645111083984375,0.026882171630859375,0.07192277908325195,0.021396636962890625,0.3044590950012207,0.3054990768432617,0.12758803367614746,1.0986828804016113,0.26262736320495605 +18,refs/heads/master,867b917c43c32acbdcac55767e7f04334006c866,05733cb0d13bbfd97adc6a9eda47b4ea3dcf04e6,9d45c90a98203c46b16910b1470fead4b3ae09e4,,True,True,833d3a55324d94ffa54b859d6714376079b6e3c1ecef892dad5248540068965d,Tests_passed,acf6165089b11a4759d351a9b67c1f38511392d7d788a3aa22a0ba1871060943,Tests_passed,True,True,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_failed,103689b36464d8dd0df270c54743fb86c90e7676c5acdae2f0f8b692f96cc5d2,Tests_failed,103689b36464d8dd0df270c54743fb86c90e7676c5acdae2f0f8b692f96cc5d2,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,0.017783641815185547,0.021543025970458984,0.027135848999023438,0.027832984924316406,0.02328801155090332,0.027645111083984375,0.026882171630859375,0.07192277908325195,0.021396636962890625,0.30995821952819824,0.3122427463531494,0.12758803367614746,1.0986828804016113,0.26262736320495605 diff --git a/results/combined/merges_timed/richardwarburton/lambda-behave.csv b/results/combined/merges_timed/richardwarburton/lambda-behave.csv index 510c6d1029..09547c1ff6 100644 --- a/results/combined/merges_timed/richardwarburton/lambda-behave.csv +++ b/results/combined/merges_timed/richardwarburton/lambda-behave.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/master,1122d7779dd0c352baf30f702efe19bd4852b727,cd83aba4a3445415807b25b8198eae8fcc31816d,f94034d1b799357cb1ad4d61c99951870c75ec3a,,True,True,1f4ab1f542d90df8e1491c780eb558a0f597ed6f1da5656e44984dd62c75d1bb,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,True,True,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,7d00a2af8e60352da908b9251a69541dca840ce922502a249d3b410b605f80ca,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3d3e37ccb2175a9a14438055a666d74aed50fdbd77f14701777a5e631a82351d,Merge_failed,3d3e37ccb2175a9a14438055a666d74aed50fdbd77f14701777a5e631a82351d,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Merge_failed,7fb61ad9dd3191f8a6bce2f86afc199d7db3b01ec975813c55d70c8d44f5592a,0.010235071182250977,0.009866714477539062,0.010353565216064453,0.009755611419677734,0.01004791259765625,0.010221719741821289,0.010025501251220703,0.05066347122192383,0.015600442886352539,0.0634920597076416,0.06339740753173828,0.13028812408447266,0.609471321105957,0.17798519134521484 +21,refs/heads/master,1122d7779dd0c352baf30f702efe19bd4852b727,cd83aba4a3445415807b25b8198eae8fcc31816d,f94034d1b799357cb1ad4d61c99951870c75ec3a,,True,True,1f4ab1f542d90df8e1491c780eb558a0f597ed6f1da5656e44984dd62c75d1bb,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,True,True,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,7d00a2af8e60352da908b9251a69541dca840ce922502a249d3b410b605f80ca,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3d3e37ccb2175a9a14438055a666d74aed50fdbd77f14701777a5e631a82351d,Merge_failed,3d3e37ccb2175a9a14438055a666d74aed50fdbd77f14701777a5e631a82351d,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Merge_failed,7fb61ad9dd3191f8a6bce2f86afc199d7db3b01ec975813c55d70c8d44f5592a,0.010235071182250977,0.009866714477539062,0.010353565216064453,0.009755611419677734,0.01004791259765625,0.010221719741821289,0.010025501251220703,0.05066347122192383,0.015600442886352539,0.06350302696228027,0.06379365921020508,0.13028812408447266,0.609471321105957,0.17798519134521484 diff --git a/results/combined/merges_timed/risingoak/jenkins-client.csv b/results/combined/merges_timed/risingoak/jenkins-client.csv index 44670fa045..c40ad83bd4 100644 --- a/results/combined/merges_timed/risingoak/jenkins-client.csv +++ b/results/combined/merges_timed/risingoak/jenkins-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -79,refs/heads/master,56d27735ae3aef791a8aa330fd489917c7ade50d,65516173af2f28b3b4f5f76feadd0a9120e28ac6,887cbfd64c010a702f92b171ae3cac3fd48893ba,,True,True,d3eb9f97f751086ec1a9e98f9b157db5337b74c91f85eb2f61b89090822bd465,Tests_passed,140999204148a5c381e11a068b608fb303d63bae532d725c9f7b66460929056b,Tests_passed,True,True,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,0.04503774642944336,0.04433155059814453,0.04630231857299805,0.04579591751098633,0.044297218322753906,0.04596138000488281,0.03574872016906738,0.16649484634399414,0.041049957275390625,0.16402220726013184,0.16383934020996094,0.11400437355041504,0.707813024520874,0.19032502174377441 +79,refs/heads/master,56d27735ae3aef791a8aa330fd489917c7ade50d,65516173af2f28b3b4f5f76feadd0a9120e28ac6,887cbfd64c010a702f92b171ae3cac3fd48893ba,,True,True,d3eb9f97f751086ec1a9e98f9b157db5337b74c91f85eb2f61b89090822bd465,Tests_passed,140999204148a5c381e11a068b608fb303d63bae532d725c9f7b66460929056b,Tests_passed,True,True,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,0.04503774642944336,0.04433155059814453,0.04630231857299805,0.04579591751098633,0.044297218322753906,0.04596138000488281,0.03574872016906738,0.16649484634399414,0.041049957275390625,0.16216444969177246,0.1620335578918457,0.11400437355041504,0.707813024520874,0.19032502174377441 diff --git a/results/combined/merges_timed/rjohnsondev/java-libpst.csv b/results/combined/merges_timed/rjohnsondev/java-libpst.csv index 842174cf2b..93a1a46dac 100644 --- a/results/combined/merges_timed/rjohnsondev/java-libpst.csv +++ b/results/combined/merges_timed/rjohnsondev/java-libpst.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/develop,8fc5a5c5d12b78425941201f89f76a3d2d0a50da,e0296adde1bccf18d25b2cea922d5955d7e98ed6,6b8a24004fe1140303f403a4e15d59ba3baa8fa8,,True,True,1f0f28817352bd3ed687715154efa1336eafd178739ed3d3b7f1e9f388336ce2,Tests_passed,b19a06025c8ae73ee9fccdbd9340cfd5addad69285bb94c0f1de7db54fe49f8e,Tests_passed,True,True,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,d146961eced767f9ea8b7394217b09260bfbee8d0990648dc19ca493a846f2fd,Tests_passed,d146961eced767f9ea8b7394217b09260bfbee8d0990648dc19ca493a846f2fd,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,0.0961461067199707,0.09292721748352051,0.14193201065063477,0.13309621810913086,0.1369779109954834,0.1422421932220459,0.14014863967895508,0.24657511711120605,0.0903327465057373,0.40565061569213867,0.41023683547973633,0.21096253395080566,2.195932626724243,0.2750825881958008 +18,refs/heads/develop,8fc5a5c5d12b78425941201f89f76a3d2d0a50da,e0296adde1bccf18d25b2cea922d5955d7e98ed6,6b8a24004fe1140303f403a4e15d59ba3baa8fa8,,True,True,1f0f28817352bd3ed687715154efa1336eafd178739ed3d3b7f1e9f388336ce2,Tests_passed,b19a06025c8ae73ee9fccdbd9340cfd5addad69285bb94c0f1de7db54fe49f8e,Tests_passed,True,True,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,d146961eced767f9ea8b7394217b09260bfbee8d0990648dc19ca493a846f2fd,Tests_passed,d146961eced767f9ea8b7394217b09260bfbee8d0990648dc19ca493a846f2fd,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,0.0961461067199707,0.09292721748352051,0.14193201065063477,0.13309621810913086,0.1369779109954834,0.1422421932220459,0.14014863967895508,0.24657511711120605,0.0903327465057373,0.3813023567199707,0.38565969467163086,0.21096253395080566,2.195932626724243,0.2750825881958008 diff --git a/results/combined/merges_timed/rncryptor/jncryptor.csv b/results/combined/merges_timed/rncryptor/jncryptor.csv index 8c18c4b68d..a285750409 100644 --- a/results/combined/merges_timed/rncryptor/jncryptor.csv +++ b/results/combined/merges_timed/rncryptor/jncryptor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,c54c76bac35c50d72514642ee6390435c3a93590,7ce2822d12b3e6cf2e23bc42ff6e2ff540544357,94cabd7011843fa8d95c448be63db95183b1bf4b,,True,True,178ade38a2ad32d0c458f2476afa73460be8fc83af2a76721571a596867aa453,Tests_passed,2ee8b274c7b1d22c925932b64d8d4d3b95b6a6c35c042ce8da6920c5c42fbb63,Tests_passed,True,True,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,0.04300403594970703,0.03883242607116699,0.03608202934265137,0.05085897445678711,0.037552833557128906,0.04473710060119629,0.03963184356689453,0.23386120796203613,0.04201459884643555,0.308457612991333,0.30788230895996094,0.16720867156982422,1.5109608173370361,0.1858229637145996 +4,refs/heads/master,c54c76bac35c50d72514642ee6390435c3a93590,7ce2822d12b3e6cf2e23bc42ff6e2ff540544357,94cabd7011843fa8d95c448be63db95183b1bf4b,,True,True,178ade38a2ad32d0c458f2476afa73460be8fc83af2a76721571a596867aa453,Tests_passed,2ee8b274c7b1d22c925932b64d8d4d3b95b6a6c35c042ce8da6920c5c42fbb63,Tests_passed,True,True,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,0.04300403594970703,0.03883242607116699,0.03608202934265137,0.05085897445678711,0.037552833557128906,0.04473710060119629,0.03963184356689453,0.23386120796203613,0.04201459884643555,0.3073112964630127,0.305586576461792,0.16720867156982422,1.5109608173370361,0.1858229637145996 diff --git a/results/combined/merges_timed/rnewson/couchdb-lucene.csv b/results/combined/merges_timed/rnewson/couchdb-lucene.csv index a87d366c62..7da4b3ef48 100644 --- a/results/combined/merges_timed/rnewson/couchdb-lucene.csv +++ b/results/combined/merges_timed/rnewson/couchdb-lucene.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -51,refs/heads/master,f9e7354b4dc38678549f66943f25d05962de3049,a3a70153628e5d1c6faa1418bef09e8e3090a29d,682e93f3ac6bb4b870e71c97864ae313a0edfafb,,721f1627b793685addda9b9fd499f963abeed08af6cc76a19f3a8a0b8c8ffb09,Tests_passed,add5690542149e1c451d3335bddb2887de735c53b1053ae219cb92f66badd66d,Tests_passed,True,True,True,True,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,d458be4327b4397558437e250f70e2f30dacfa5070e9367233473b9b0694cc3f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,0.008959531784057617,0.008867502212524414,0.009128093719482422,0.008950471878051758,0.009104728698730469,0.009095191955566406,0.009429931640625,0.03239703178405762,0.008748054504394531,0.17561554908752441,0.1643543243408203,0.0635077953338623,0.9902217388153076,0.15717196464538574 +51,refs/heads/master,f9e7354b4dc38678549f66943f25d05962de3049,a3a70153628e5d1c6faa1418bef09e8e3090a29d,682e93f3ac6bb4b870e71c97864ae313a0edfafb,,721f1627b793685addda9b9fd499f963abeed08af6cc76a19f3a8a0b8c8ffb09,Tests_passed,add5690542149e1c451d3335bddb2887de735c53b1053ae219cb92f66badd66d,Tests_passed,True,True,True,True,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,d458be4327b4397558437e250f70e2f30dacfa5070e9367233473b9b0694cc3f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,0.008959531784057617,0.008867502212524414,0.009128093719482422,0.008950471878051758,0.009104728698730469,0.009095191955566406,0.009429931640625,0.03239703178405762,0.008748054504394531,0.17170953750610352,0.16972708702087402,0.0635077953338623,0.9902217388153076,0.15717196464538574 diff --git a/results/combined/merges_timed/robert-bor/csveed.csv b/results/combined/merges_timed/robert-bor/csveed.csv index d8e428e3a2..36ca4f3d67 100644 --- a/results/combined/merges_timed/robert-bor/csveed.csv +++ b/results/combined/merges_timed/robert-bor/csveed.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -105,refs/heads/master,b99c0263d2893ce82b0cb4e45d34cc526acd4704,520c0ce425155f6353e4cafda41d9c3895a30051,84a334ca087a8e2a90ba5bbd7e3eaaf7e539b42b,,True,True,ad361a9cb59de8aeb762342b49184f0238d2129b669d483c6d9acbd85d40b2a9,Tests_passed,7ebce14368dd8b9d3e5ae1585402e1da284244e452872a236d3804ac89850cfe,Tests_passed,True,True,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_failed,b16185a08317e1d23eeea8a190730b4df6910fff765c16b89bb41d3a703285bf,Tests_failed,b16185a08317e1d23eeea8a190730b4df6910fff765c16b89bb41d3a703285bf,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,0.049590349197387695,0.050989389419555664,0.061864376068115234,0.03691887855529785,0.041390419006347656,0.040387868881225586,0.038573265075683594,0.17391324043273926,0.02524089813232422,0.16046595573425293,0.16077923774719238,0.10534238815307617,0.5910487174987793,0.22001862525939941 +105,refs/heads/master,b99c0263d2893ce82b0cb4e45d34cc526acd4704,520c0ce425155f6353e4cafda41d9c3895a30051,84a334ca087a8e2a90ba5bbd7e3eaaf7e539b42b,,True,True,ad361a9cb59de8aeb762342b49184f0238d2129b669d483c6d9acbd85d40b2a9,Tests_passed,7ebce14368dd8b9d3e5ae1585402e1da284244e452872a236d3804ac89850cfe,Tests_passed,True,True,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_failed,b16185a08317e1d23eeea8a190730b4df6910fff765c16b89bb41d3a703285bf,Tests_failed,b16185a08317e1d23eeea8a190730b4df6910fff765c16b89bb41d3a703285bf,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,0.049590349197387695,0.050989389419555664,0.061864376068115234,0.03691887855529785,0.041390419006347656,0.040387868881225586,0.038573265075683594,0.17391324043273926,0.02524089813232422,0.15908217430114746,0.1572434902191162,0.10534238815307617,0.5910487174987793,0.22001862525939941 diff --git a/results/combined/merges_timed/robobees/simbeeotic.csv b/results/combined/merges_timed/robobees/simbeeotic.csv index 2c8e33386d..76f8ab9622 100644 --- a/results/combined/merges_timed/robobees/simbeeotic.csv +++ b/results/combined/merges_timed/robobees/simbeeotic.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/remotes/origin/autoheli-dev,d8cc9db915bb7f2fd6a528df8c173d1c08407ec4,749d71d29f5e2109d744395ac371452d3e53d26a,d7ac67438b4894fe659d052451d89690ddc44da1,,True,True,726d92b4178350acde3e24a7432e7fe303490b084cec6f579f4f67370afb0869,Tests_passed,2715556027cc8e037d2c518193feafac6679a0313e79981c996a000317ced594,Tests_passed,True,True,Merge_failed,7256d43ac6bdc4a0c68e23912abca9bf411e02b82f57f8ce2fdd13a7e950ce1a,Merge_failed,21a687f77626ce8b8893b1a68fa6924c38ac696fa60f4e47a8376f2f82f4373b,Merge_failed,7256d43ac6bdc4a0c68e23912abca9bf411e02b82f57f8ce2fdd13a7e950ce1a,Merge_failed,b8b37bede26fccc67e5b124960685cb6234acee6ff39f97067ffc5cc2b327f47,Merge_failed,6c88d6de90e6d03117ac1905e452397bb0225d0ad714aa448061765f7a29f601,Merge_failed,6c88d6de90e6d03117ac1905e452397bb0225d0ad714aa448061765f7a29f601,Merge_failed,f9f557193994188d2c3657e01cfafce254191df83ccf58b0c4c97c89df7e8905,Merge_failed,6e4e35d76a90c1d80ff26cb9e4b11db3efc9c4c38bdcb6f9b138b3917aa74752,Merge_failed,7256d43ac6bdc4a0c68e23912abca9bf411e02b82f57f8ce2fdd13a7e950ce1a,Merge_failed,0943fdbebd5737c61f657126b422c8b78f7160b20f20eababedb135acb743d03,Merge_failed,0943fdbebd5737c61f657126b422c8b78f7160b20f20eababedb135acb743d03,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,4c38f05f55337ff7069f8e35122b28046f8e8b7277ef3977c9b97094258e8152,0.014538288116455078,0.1210625171661377,0.12198090553283691,0.12076807022094727,0.12173843383789062,0.12233924865722656,0.11960315704345703,0.19703125953674316,0.15730643272399902,0.3388528823852539,0.3480546474456787,0.19800329208374023,3.3615498542785645,0.34158802032470703 +9,refs/remotes/origin/autoheli-dev,d8cc9db915bb7f2fd6a528df8c173d1c08407ec4,749d71d29f5e2109d744395ac371452d3e53d26a,d7ac67438b4894fe659d052451d89690ddc44da1,,True,True,726d92b4178350acde3e24a7432e7fe303490b084cec6f579f4f67370afb0869,Tests_passed,2715556027cc8e037d2c518193feafac6679a0313e79981c996a000317ced594,Tests_passed,True,True,Merge_failed,7256d43ac6bdc4a0c68e23912abca9bf411e02b82f57f8ce2fdd13a7e950ce1a,Merge_failed,21a687f77626ce8b8893b1a68fa6924c38ac696fa60f4e47a8376f2f82f4373b,Merge_failed,7256d43ac6bdc4a0c68e23912abca9bf411e02b82f57f8ce2fdd13a7e950ce1a,Merge_failed,b8b37bede26fccc67e5b124960685cb6234acee6ff39f97067ffc5cc2b327f47,Merge_failed,6c88d6de90e6d03117ac1905e452397bb0225d0ad714aa448061765f7a29f601,Merge_failed,6c88d6de90e6d03117ac1905e452397bb0225d0ad714aa448061765f7a29f601,Merge_failed,f9f557193994188d2c3657e01cfafce254191df83ccf58b0c4c97c89df7e8905,Merge_failed,6e4e35d76a90c1d80ff26cb9e4b11db3efc9c4c38bdcb6f9b138b3917aa74752,Merge_failed,7256d43ac6bdc4a0c68e23912abca9bf411e02b82f57f8ce2fdd13a7e950ce1a,Merge_failed,0943fdbebd5737c61f657126b422c8b78f7160b20f20eababedb135acb743d03,Merge_failed,0943fdbebd5737c61f657126b422c8b78f7160b20f20eababedb135acb743d03,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,4c38f05f55337ff7069f8e35122b28046f8e8b7277ef3977c9b97094258e8152,0.014538288116455078,0.1210625171661377,0.12198090553283691,0.12076807022094727,0.12173843383789062,0.12233924865722656,0.11960315704345703,0.19703125953674316,0.15730643272399902,0.33667564392089844,0.33605098724365234,0.19800329208374023,3.3615498542785645,0.34158802032470703 diff --git a/results/combined/merges_timed/robotframework/javalibcore.csv b/results/combined/merges_timed/robotframework/javalibcore.csv index 9f01ca7c3c..bee6ba0c35 100644 --- a/results/combined/merges_timed/robotframework/javalibcore.csv +++ b/results/combined/merges_timed/robotframework/javalibcore.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/develop,84e942f595e4fb4db9da155f4a448a6d1d76dcce,11bf4ea41799866526a7c70d40d9c76fe8be7496,f7adc77f3618f17cdd9af0ae35a485b724292fa4,,True,True,4544f1fcd61d4753afee64ed9efd1cfdf3e41bb35cbbb187907d23e32a2b9e7d,Tests_passed,60f0efe8fec3f6f504ff9a33999ba55c423a8161516ac577cbbceed27502e8ae,Tests_passed,True,True,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Tests_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Tests_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,0.03501152992248535,0.04582476615905762,0.033421993255615234,0.045256614685058594,0.05124378204345703,0.05075383186340332,0.04888558387756348,0.14262795448303223,0.05219006538391113,0.010676145553588867,0.01023101806640625,0.05163264274597168,0.04602789878845215,0.21556448936462402 +10,refs/heads/develop,84e942f595e4fb4db9da155f4a448a6d1d76dcce,11bf4ea41799866526a7c70d40d9c76fe8be7496,f7adc77f3618f17cdd9af0ae35a485b724292fa4,,True,True,4544f1fcd61d4753afee64ed9efd1cfdf3e41bb35cbbb187907d23e32a2b9e7d,Tests_passed,60f0efe8fec3f6f504ff9a33999ba55c423a8161516ac577cbbceed27502e8ae,Tests_passed,True,True,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Tests_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Tests_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,0.03501152992248535,0.04582476615905762,0.033421993255615234,0.045256614685058594,0.05124378204345703,0.05075383186340332,0.04888558387756348,0.14262795448303223,0.05219006538391113,0.010081291198730469,0.009986639022827148,0.05163264274597168,0.04602789878845215,0.21556448936462402 diff --git a/results/combined/merges_timed/robotiumtech/robotium.csv b/results/combined/merges_timed/robotiumtech/robotium.csv index 43c851c85c..82cd72c315 100644 --- a/results/combined/merges_timed/robotiumtech/robotium.csv +++ b/results/combined/merges_timed/robotiumtech/robotium.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,Tests_passed,True,True,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,6b41cdeb2f07290f60395d6b8aabe6c7380b02a6461d4dfa939aeb6e8ce2c3d5,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,02e8a9bb52e99aa197cd0111321315747cd7f50c5d8913dae11c1020fb22bfc4,Merge_failed,02e8a9bb52e99aa197cd0111321315747cd7f50c5d8913dae11c1020fb22bfc4,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,0.03948783874511719,0.054152727127075195,0.048850297927856445,0.04844975471496582,0.05275583267211914,0.05498552322387695,0.03831171989440918,0.1726078987121582,0.08118772506713867,0.07767724990844727,0.07774686813354492,0.10677576065063477,0.9639925956726074,0.23319792747497559 +27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,Tests_passed,True,True,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,6b41cdeb2f07290f60395d6b8aabe6c7380b02a6461d4dfa939aeb6e8ce2c3d5,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,02e8a9bb52e99aa197cd0111321315747cd7f50c5d8913dae11c1020fb22bfc4,Merge_failed,02e8a9bb52e99aa197cd0111321315747cd7f50c5d8913dae11c1020fb22bfc4,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,0.03948783874511719,0.054152727127075195,0.048850297927856445,0.04844975471496582,0.05275583267211914,0.05498552322387695,0.03831171989440918,0.1726078987121582,0.08118772506713867,0.07740378379821777,0.07671022415161133,0.10677576065063477,0.9639925956726074,0.23319792747497559 diff --git a/results/combined/merges_timed/robrua/orianna.csv b/results/combined/merges_timed/robrua/orianna.csv index a6c6f6feec..208026d184 100644 --- a/results/combined/merges_timed/robrua/orianna.csv +++ b/results/combined/merges_timed/robrua/orianna.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -45,refs/remotes/origin/pull/14,9a25a31a4be7ef7572044ef26d11ba55395bbc59,ce872febd076a19ce53c7024de2f8e06569a1d12,87726ac82247ab8002fb2101b3e6a3167bf8ba85,,True,True,a8d5efce95af5be71f0a02e13cadab4ac0dd704501140906f733ae17e6f3d367,Tests_passed,708191c6e446054f8e1608473eb31b0caade744d1dcadd9efb97c1a5c6b629d6,Tests_passed,True,True,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,0.043892860412597656,0.045764923095703125,0.05271124839782715,0.03854656219482422,0.0498347282409668,0.013085365295410156,0.02253413200378418,0.16094493865966797,0.03819704055786133,0.17184853553771973,0.16991305351257324,0.09457612037658691,1.1646265983581543,0.2461988925933838 +45,refs/remotes/origin/pull/14,9a25a31a4be7ef7572044ef26d11ba55395bbc59,ce872febd076a19ce53c7024de2f8e06569a1d12,87726ac82247ab8002fb2101b3e6a3167bf8ba85,,True,True,a8d5efce95af5be71f0a02e13cadab4ac0dd704501140906f733ae17e6f3d367,Tests_passed,708191c6e446054f8e1608473eb31b0caade744d1dcadd9efb97c1a5c6b629d6,Tests_passed,True,True,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,0.043892860412597656,0.045764923095703125,0.05271124839782715,0.03854656219482422,0.0498347282409668,0.013085365295410156,0.02253413200378418,0.16094493865966797,0.03819704055786133,0.17120695114135742,0.1709153652191162,0.09457612037658691,1.1646265983581543,0.2461988925933838 diff --git a/results/combined/merges_timed/rocketscience-projects/javaslang.csv b/results/combined/merges_timed/rocketscience-projects/javaslang.csv index b900fd2224..2135ca8f20 100644 --- a/results/combined/merges_timed/rocketscience-projects/javaslang.csv +++ b/results/combined/merges_timed/rocketscience-projects/javaslang.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1174,refs/remotes/origin/pull/2745,fee08d022774a000e65551fc71a74ae5f865866a,e07b9e2b96211219cc1b5fc87d1e38994ec74dd5,26181f14b9629ceb729a73795d3854363c7dce0e,,True,True,758362099cc2193eaa631d765a90f790a2c19d3f9c488a4f3e57827c1a73a193,Tests_passed,e85dfc6d60d80af3f858131d96a7646c775e8302f46f8200fedcd1612d4c7ebc,Tests_passed,True,True,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,fcbaa247b4d7599e51ab63b56f2d7740f583505fe211058f4743efe230b928fe,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,27c4007513198eb716366b8cf788581d01c11b28e6c5b88bbf742ff2fb694b92,Merge_failed,27c4007513198eb716366b8cf788581d01c11b28e6c5b88bbf742ff2fb694b92,Merge_failed,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b3b3cdc5a6968b8e88a43951fcbdf9d5fb68ee982576cbf1a69ddfed90a0cbd9,Merge_failed,c0f68e5f20c9c6ec7c98ad83ed32b6674fd42ea187b6ba73462e4a96aeb8062c,0.07187533378601074,0.06670427322387695,0.07304763793945312,0.08113884925842285,0.0754232406616211,0.07819938659667969,0.07961392402648926,0.4189724922180176,0.09635138511657715,0.8463034629821777,0.850144624710083,0.46135687828063965,7.614904403686523,0.6257970333099365 +1174,refs/remotes/origin/pull/2745,fee08d022774a000e65551fc71a74ae5f865866a,e07b9e2b96211219cc1b5fc87d1e38994ec74dd5,26181f14b9629ceb729a73795d3854363c7dce0e,,True,True,758362099cc2193eaa631d765a90f790a2c19d3f9c488a4f3e57827c1a73a193,Tests_passed,e85dfc6d60d80af3f858131d96a7646c775e8302f46f8200fedcd1612d4c7ebc,Tests_passed,True,True,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,fcbaa247b4d7599e51ab63b56f2d7740f583505fe211058f4743efe230b928fe,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,27c4007513198eb716366b8cf788581d01c11b28e6c5b88bbf742ff2fb694b92,Merge_failed,27c4007513198eb716366b8cf788581d01c11b28e6c5b88bbf742ff2fb694b92,Merge_failed,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b3b3cdc5a6968b8e88a43951fcbdf9d5fb68ee982576cbf1a69ddfed90a0cbd9,Merge_failed,c0f68e5f20c9c6ec7c98ad83ed32b6674fd42ea187b6ba73462e4a96aeb8062c,0.07187533378601074,0.06670427322387695,0.07304763793945312,0.08113884925842285,0.0754232406616211,0.07819938659667969,0.07961392402648926,0.4189724922180176,0.09635138511657715,0.8475358486175537,0.8389546871185303,0.46135687828063965,7.614904403686523,0.6257970333099365 diff --git a/results/combined/merges_timed/rometools/rome.csv b/results/combined/merges_timed/rometools/rome.csv index 078cdf733d..bfdf0079c8 100644 --- a/results/combined/merges_timed/rometools/rome.csv +++ b/results/combined/merges_timed/rometools/rome.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,0de36f1a02e1eb86a90adb362239474aa26151ae,e3dc44cf971a74e5fd7e3af7b7ba3835ffbeaa30,20e07a97e16fa762d275ba80db8e7f6dd35ac4ac,,True,True,c775a4537ef113cff864923701a73b269577fcb23ae68a103fa49256668e4a63,Tests_passed,29f56cc1c4f1e7d62e4ea59508aef9e70235f4f1df9de25606471fc7bb09313d,Tests_passed,True,True,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,0.03630709648132324,0.032739877700805664,0.04429912567138672,0.0415654182434082,0.03151702880859375,0.033658504486083984,0.0391085147857666,0.11873912811279297,0.032018423080444336,0.1682446002960205,0.16842865943908691,0.08716559410095215,0.0431210994720459,0.8615529537200928 +9,refs/heads/master,0de36f1a02e1eb86a90adb362239474aa26151ae,e3dc44cf971a74e5fd7e3af7b7ba3835ffbeaa30,20e07a97e16fa762d275ba80db8e7f6dd35ac4ac,,True,True,c775a4537ef113cff864923701a73b269577fcb23ae68a103fa49256668e4a63,Tests_passed,29f56cc1c4f1e7d62e4ea59508aef9e70235f4f1df9de25606471fc7bb09313d,Tests_passed,True,True,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,0.03630709648132324,0.032739877700805664,0.04429912567138672,0.0415654182434082,0.03151702880859375,0.033658504486083984,0.0391085147857666,0.11873912811279297,0.032018423080444336,0.16545557975769043,0.1653125286102295,0.08716559410095215,0.0431210994720459,0.8615529537200928 diff --git a/results/combined/merges_timed/romix/java-concurrent-hash-trie-map.csv b/results/combined/merges_timed/romix/java-concurrent-hash-trie-map.csv index f5418d986d..a1a2c36ff6 100644 --- a/results/combined/merges_timed/romix/java-concurrent-hash-trie-map.csv +++ b/results/combined/merges_timed/romix/java-concurrent-hash-trie-map.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,03335a9caa6fc867344c8c015d6dfc2d11ab062f,6ad8485e9c223f6cbddc72c13ab45c900bc1cbc5,3e7efd43b645924502c3acc7e5ebe211090e855c,,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,fdee5637855972184693f2c625baaf20f7f2e00089e0cccc6e07543bcfe68556,Tests_passed,True,True,True,True,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,0.011383056640625,0.01169729232788086,0.012000560760498047,0.012270927429199219,0.011901617050170898,0.011997461318969727,0.012024402618408203,0.05214953422546387,0.011403083801269531,0.3315424919128418,0.33313918113708496,0.12515568733215332,3.345703363418579,0.16850805282592773 +1,refs/heads/master,03335a9caa6fc867344c8c015d6dfc2d11ab062f,6ad8485e9c223f6cbddc72c13ab45c900bc1cbc5,3e7efd43b645924502c3acc7e5ebe211090e855c,,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,fdee5637855972184693f2c625baaf20f7f2e00089e0cccc6e07543bcfe68556,Tests_passed,True,True,True,True,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,0.011383056640625,0.01169729232788086,0.012000560760498047,0.012270927429199219,0.011901617050170898,0.011997461318969727,0.012024402618408203,0.05214953422546387,0.011403083801269531,0.3253593444824219,0.325122594833374,0.12515568733215332,3.345703363418579,0.16850805282592773 diff --git a/results/combined/merges_timed/roncoo/roncoo-pay.csv b/results/combined/merges_timed/roncoo/roncoo-pay.csv index 130d3e139d..670cf26429 100644 --- a/results/combined/merges_timed/roncoo/roncoo-pay.csv +++ b/results/combined/merges_timed/roncoo/roncoo-pay.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/master,ccca546fb46e38dad6085df47dbdc9e1327b86f5,3a909a22c9890c12772b13c0901cfaff0b18cc2b,f87b86aa53ecb4dea693ec74ee5292738f8cef12,,True,True,cdea973b895ee16b3d17a0f23afbf7e75980a0d35130e587f8bc482850c9ae89,Tests_passed,89bbd7526f75f6c35a1cee28e626238852bfb36a160d5a9d91ac511df2dd16e8,Tests_passed,True,True,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,899f0846b2c126c4086fa651749eee1c261790deb3ce923bded29f1e9d3046f6,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,529abeb79e8ec77d686df61f3fad0670e7e91652ec44e062c29b0ec48232fe7d,Merge_failed,10fce70721bde1da7bbb8d9de882b6c9a53efd45c138fb654a300171b971d050,Merge_failed,10fce70721bde1da7bbb8d9de882b6c9a53efd45c138fb654a300171b971d050,Merge_failed,3849d8e6e347e6f8d1712cbee817135a0032cb74f75ec1ed8a7aa6f61a51d82b,Merge_failed,d79d57a4aaf4fef25f9768d76d4193a877e641dc67abb58457fc90d7cde61193,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,5d4f659de0d1da06263e72d1e3cfc8a627a2d4c3be796c5d2f5ba63aa674c518,Merge_failed,7c29102cad303c274d44d25a019ab49b77cc95f383e27a99306c3d4a2c7ae697,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,30bc0716eb5523b331cce8491d50d5e9ea7bdbe59f15a96366e7f4efe08636a3,Merge_failed,ff28d45460eb58be9d9dd54d40a82ceb5b01554cf23fe15ab3c11fc2b3bba30a,0.07822179794311523,0.07942938804626465,0.08997750282287598,0.100250244140625,0.09738993644714355,0.08235287666320801,0.08982300758361816,0.95804762840271,0.141829252243042,0.6737823486328125,0.6869494915008545,0.9595131874084473,3.383166790008545,1.820636510848999 +17,refs/heads/master,ccca546fb46e38dad6085df47dbdc9e1327b86f5,3a909a22c9890c12772b13c0901cfaff0b18cc2b,f87b86aa53ecb4dea693ec74ee5292738f8cef12,,True,True,cdea973b895ee16b3d17a0f23afbf7e75980a0d35130e587f8bc482850c9ae89,Tests_passed,89bbd7526f75f6c35a1cee28e626238852bfb36a160d5a9d91ac511df2dd16e8,Tests_passed,True,True,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,899f0846b2c126c4086fa651749eee1c261790deb3ce923bded29f1e9d3046f6,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,529abeb79e8ec77d686df61f3fad0670e7e91652ec44e062c29b0ec48232fe7d,Merge_failed,10fce70721bde1da7bbb8d9de882b6c9a53efd45c138fb654a300171b971d050,Merge_failed,10fce70721bde1da7bbb8d9de882b6c9a53efd45c138fb654a300171b971d050,Merge_failed,3849d8e6e347e6f8d1712cbee817135a0032cb74f75ec1ed8a7aa6f61a51d82b,Merge_failed,d79d57a4aaf4fef25f9768d76d4193a877e641dc67abb58457fc90d7cde61193,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,5d4f659de0d1da06263e72d1e3cfc8a627a2d4c3be796c5d2f5ba63aa674c518,Merge_failed,7c29102cad303c274d44d25a019ab49b77cc95f383e27a99306c3d4a2c7ae697,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,30bc0716eb5523b331cce8491d50d5e9ea7bdbe59f15a96366e7f4efe08636a3,Merge_failed,ff28d45460eb58be9d9dd54d40a82ceb5b01554cf23fe15ab3c11fc2b3bba30a,0.07822179794311523,0.07942938804626465,0.08997750282287598,0.100250244140625,0.09738993644714355,0.08235287666320801,0.08982300758361816,0.95804762840271,0.141829252243042,0.6766138076782227,0.6775050163269043,0.9595131874084473,3.383166790008545,1.820636510848999 diff --git a/results/combined/merges_timed/rschreijer/lutung.csv b/results/combined/merges_timed/rschreijer/lutung.csv index 53e5c485f7..b8c19f5e4f 100644 --- a/results/combined/merges_timed/rschreijer/lutung.csv +++ b/results/combined/merges_timed/rschreijer/lutung.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,70e3458c0a4c096d7b1ca7426e61f5a876025fe6,8048493cf975b711e28a79be0705ff7ea8a5b27c,db1238d7be4edb64826603189f3cb48e9d8de7cd,,e800d7eac14e7f1d8ba73ca1de478b3673b7b935b95591d3e29b3e8a576db623,Tests_passed,391cba75427c89f6f270f662d424c3f8983726cf48002fc8e100e0b6b8601ec9,Tests_passed,True,True,True,True,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,0.052941322326660156,0.04083108901977539,0.05146288871765137,0.04053926467895508,0.04784440994262695,0.04294228553771973,0.04652261734008789,0.17083072662353516,0.04684567451477051,0.16463255882263184,0.1753380298614502,0.11686921119689941,0.9065563678741455,0.2101898193359375 +8,refs/heads/master,70e3458c0a4c096d7b1ca7426e61f5a876025fe6,8048493cf975b711e28a79be0705ff7ea8a5b27c,db1238d7be4edb64826603189f3cb48e9d8de7cd,,e800d7eac14e7f1d8ba73ca1de478b3673b7b935b95591d3e29b3e8a576db623,Tests_passed,391cba75427c89f6f270f662d424c3f8983726cf48002fc8e100e0b6b8601ec9,Tests_passed,True,True,True,True,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,0.052941322326660156,0.04083108901977539,0.05146288871765137,0.04053926467895508,0.04784440994262695,0.04294228553771973,0.04652261734008789,0.17083072662353516,0.04684567451477051,0.1714925765991211,0.17170405387878418,0.11686921119689941,0.9065563678741455,0.2101898193359375 diff --git a/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv b/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv index e3ed70e494..ac45453ddc 100644 --- a/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv +++ b/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,b5a40bb804382b21052c99890298fc5afcd4b6b1,f1a4013c4f3a8d85879574f36c43e60214116b9e,a357f921c5ce966b1e8e61650d5541fa02ab2f27,,52852961f97f69652d8b6831bbef8ccb09bf651c37221b84087567baf5236619,Tests_passed,5551da408aa8f3ac531f4cc4413936307e9a8553eaae4007eedb2fe74be3336a,Tests_passed,True,True,True,True,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,d48f09ec2d5be88c1d31a27b88a4455c93b63c28a76c9a698cd8143066a6d71f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,845780652c8122ff9b2acf300ebf05c511ada82777547338f2b172571c4e8e31,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,cbd0b912918d671848469914989a3ec7777ae4a04707a9806668f0cfbf28215d,Merge_failed,cbd0b912918d671848469914989a3ec7777ae4a04707a9806668f0cfbf28215d,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,1c9aa07d0fed893515971bde710cbe56e61e57e11b814b3c37dedf9774a6039c,0.008880615234375,0.008183479309082031,0.008372783660888672,0.008173942565917969,0.008391618728637695,0.008042335510253906,0.008249282836914062,0.06107211112976074,0.01608729362487793,0.26018738746643066,0.2593719959259033,0.18434929847717285,1.525156021118164,0.17459964752197266 +2,refs/heads/master,b5a40bb804382b21052c99890298fc5afcd4b6b1,f1a4013c4f3a8d85879574f36c43e60214116b9e,a357f921c5ce966b1e8e61650d5541fa02ab2f27,,52852961f97f69652d8b6831bbef8ccb09bf651c37221b84087567baf5236619,Tests_passed,5551da408aa8f3ac531f4cc4413936307e9a8553eaae4007eedb2fe74be3336a,Tests_passed,True,True,True,True,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,d48f09ec2d5be88c1d31a27b88a4455c93b63c28a76c9a698cd8143066a6d71f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,845780652c8122ff9b2acf300ebf05c511ada82777547338f2b172571c4e8e31,Merge_failed,e6d3116edeefe5f06294572a798702216b2a184c7a433ea7d7692f9abe655b3f,Merge_failed,cbd0b912918d671848469914989a3ec7777ae4a04707a9806668f0cfbf28215d,Merge_failed,cbd0b912918d671848469914989a3ec7777ae4a04707a9806668f0cfbf28215d,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,1c9aa07d0fed893515971bde710cbe56e61e57e11b814b3c37dedf9774a6039c,0.008880615234375,0.008183479309082031,0.008372783660888672,0.008173942565917969,0.008391618728637695,0.008042335510253906,0.008249282836914062,0.06107211112976074,0.01608729362487793,0.2570781707763672,0.2589259147644043,0.18434929847717285,1.525156021118164,0.17459964752197266 diff --git a/results/combined/merges_timed/ru/casanova.csv b/results/combined/merges_timed/ru/casanova.csv index 677ac97734..2f6c9cdd78 100644 --- a/results/combined/merges_timed/ru/casanova.csv +++ b/results/combined/merges_timed/ru/casanova.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,455f0369c9e8ebe41eee39f890ceb6ddd9310eda,d2932adf48fc17976dc74f3e965030522fcbfe12,1da9ce5a7695fdbab0c29966a594ca5fed796faa,,1149d181575fe104cc30e2e433f5aa9b440c4bd53725e9ff539477759a8542bc,Tests_passed,cfa82e0dd62db04aed04507c99da6acbe43353205595ef3e0a9a26fed0c26f2e,Tests_passed,True,True,True,True,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_failed,d9bfb493718cdfeb09f1aa5ba906088f99f26d105f6759607993488009e2f2e4,Tests_failed,d9bfb493718cdfeb09f1aa5ba906088f99f26d105f6759607993488009e2f2e4,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,0.027199506759643555,0.04771256446838379,0.03955221176147461,0.05595588684082031,0.05283522605895996,0.050324201583862305,0.06424975395202637,0.16228556632995605,0.030742883682250977,0.17830753326416016,0.17805719375610352,0.10109663009643555,0.6705255508422852,0.22728967666625977 +3,refs/heads/master,455f0369c9e8ebe41eee39f890ceb6ddd9310eda,d2932adf48fc17976dc74f3e965030522fcbfe12,1da9ce5a7695fdbab0c29966a594ca5fed796faa,,1149d181575fe104cc30e2e433f5aa9b440c4bd53725e9ff539477759a8542bc,Tests_passed,cfa82e0dd62db04aed04507c99da6acbe43353205595ef3e0a9a26fed0c26f2e,Tests_passed,True,True,True,True,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_failed,d9bfb493718cdfeb09f1aa5ba906088f99f26d105f6759607993488009e2f2e4,Tests_failed,d9bfb493718cdfeb09f1aa5ba906088f99f26d105f6759607993488009e2f2e4,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,0.027199506759643555,0.04771256446838379,0.03955221176147461,0.05595588684082031,0.05283522605895996,0.050324201583862305,0.06424975395202637,0.16228556632995605,0.030742883682250977,0.17538213729858398,0.17534327507019043,0.10109663009643555,0.6705255508422852,0.22728967666625977 diff --git a/results/combined/merges_timed/rubenlagus/telegrambots.csv b/results/combined/merges_timed/rubenlagus/telegrambots.csv index d35bfbdf37..b8619ba5eb 100644 --- a/results/combined/merges_timed/rubenlagus/telegrambots.csv +++ b/results/combined/merges_timed/rubenlagus/telegrambots.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -128,refs/heads/master,15fe637998d55ef567d4e499e948c9d183b99fb4,ef1bd09a6ae312da059076e82de2ffafd98f45e8,fc12de81c0ab1c076a974a4505a8eb48ab567290,,True,True,9e020980e01f698749561bf794806ac92be32dc608dd0a1da648123c1f9bf19a,Tests_passed,856f1c857d9252741c52b9ee99e1dfd2d0245bd15f640f73fbdc53fc75b35584,Tests_passed,True,True,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,6542d9032d5b7897ff29c730a604f9019df0fad43c7724f9a7089525b8e0ac04,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Tests_passed,409e0a5bbb5016109c0626869abbc20de1435bb052b5c3ea9b77b11f1ff1c1a1,Tests_passed,409e0a5bbb5016109c0626869abbc20de1435bb052b5c3ea9b77b11f1ff1c1a1,Merge_failed,0a856019c4d8c9f4ac65faf6fff261a9f7cb8cdfb8c7290101f7a562118a7ce8,Tests_failed,773883e34cf9868d904cab7d9bd74d75fc486df14a6b7af3ff5604c6c43ce30b,Merge_failed,6e59f1fdc4f915228c35b250be077d297700e9804c6978d5ba6b65793b6fc615,0.03579282760620117,0.05072498321533203,0.0315098762512207,0.04394698143005371,0.04407620429992676,0.04171252250671387,0.05278635025024414,0.3486945629119873,0.06067395210266113,0.662489652633667,0.6536605358123779,0.27482008934020996,4.423612117767334,0.30745792388916016 +128,refs/heads/master,15fe637998d55ef567d4e499e948c9d183b99fb4,ef1bd09a6ae312da059076e82de2ffafd98f45e8,fc12de81c0ab1c076a974a4505a8eb48ab567290,,True,True,9e020980e01f698749561bf794806ac92be32dc608dd0a1da648123c1f9bf19a,Tests_passed,856f1c857d9252741c52b9ee99e1dfd2d0245bd15f640f73fbdc53fc75b35584,Tests_passed,True,True,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,6542d9032d5b7897ff29c730a604f9019df0fad43c7724f9a7089525b8e0ac04,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Tests_passed,409e0a5bbb5016109c0626869abbc20de1435bb052b5c3ea9b77b11f1ff1c1a1,Tests_passed,409e0a5bbb5016109c0626869abbc20de1435bb052b5c3ea9b77b11f1ff1c1a1,Merge_failed,0a856019c4d8c9f4ac65faf6fff261a9f7cb8cdfb8c7290101f7a562118a7ce8,Tests_failed,773883e34cf9868d904cab7d9bd74d75fc486df14a6b7af3ff5604c6c43ce30b,Merge_failed,6e59f1fdc4f915228c35b250be077d297700e9804c6978d5ba6b65793b6fc615,0.03579282760620117,0.05072498321533203,0.0315098762512207,0.04394698143005371,0.04407620429992676,0.04171252250671387,0.05278635025024414,0.3486945629119873,0.06067395210266113,0.656463623046875,0.6471819877624512,0.27482008934020996,4.423612117767334,0.30745792388916016 diff --git a/results/combined/merges_timed/ruedigermoeller/kontraktor.csv b/results/combined/merges_timed/ruedigermoeller/kontraktor.csv index 817bd748cd..4ab630960b 100644 --- a/results/combined/merges_timed/ruedigermoeller/kontraktor.csv +++ b/results/combined/merges_timed/ruedigermoeller/kontraktor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/java14,b8ed9bb629b78fb9e64991252a2554260323ead0,d3ac25c82aa6fd921352e9bdf7ee3878397ebf1c,bc9d0d697ad281de065610ca8fb2298ff38f7434,,True,True,dd46d9e739e4bb8a61c233ed3173d3c74d0c9cb34c6e225900f959e80d59054e,Tests_passed,966a793f07c9b1016df2e5df699c8b8159be2575f6c8fe2f0343d8d31b9199fd,Tests_passed,True,True,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,0.06696701049804688,0.05681037902832031,0.05919647216796875,0.05419492721557617,0.053261518478393555,0.04517054557800293,0.06209278106689453,0.19669556617736816,0.06011533737182617,0.1753678321838379,0.17563629150390625,0.11977624893188477,1.070711612701416,0.29461097717285156 +4,refs/heads/java14,b8ed9bb629b78fb9e64991252a2554260323ead0,d3ac25c82aa6fd921352e9bdf7ee3878397ebf1c,bc9d0d697ad281de065610ca8fb2298ff38f7434,,True,True,dd46d9e739e4bb8a61c233ed3173d3c74d0c9cb34c6e225900f959e80d59054e,Tests_passed,966a793f07c9b1016df2e5df699c8b8159be2575f6c8fe2f0343d8d31b9199fd,Tests_passed,True,True,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,0.06696701049804688,0.05681037902832031,0.05919647216796875,0.05419492721557617,0.053261518478393555,0.04517054557800293,0.06209278106689453,0.19669556617736816,0.06011533737182617,0.17424440383911133,0.17461013793945312,0.11977624893188477,1.070711612701416,0.29461097717285156 diff --git a/results/combined/merges_timed/runeflobakk/motif.csv b/results/combined/merges_timed/runeflobakk/motif.csv index 5d9f8d2054..c5843d8ab0 100644 --- a/results/combined/merges_timed/runeflobakk/motif.csv +++ b/results/combined/merges_timed/runeflobakk/motif.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/dev,2df475c5347893eec68348da93344790f6957fbc,e2e547e3c14524f255e0f6ca55c99bcd6ef0c338,61747cd4ffb978ae2dfce019d190825ee4d620d4,,True,True,520d919493b5743dfc0929dcd4f9e7bdc96c9910728c42bd8b18ef1d5c5f3286,Tests_passed,88b0b166c1d41b07354158ae5b7be8757cd81644f853c4a8a7fe2f412a5401bf,Tests_passed,True,True,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,0.011472702026367188,0.011249542236328125,0.012975454330444336,0.012786388397216797,0.013503313064575195,0.013033151626586914,0.012988090515136719,0.05133938789367676,0.011711597442626953,0.3134431838989258,0.31247663497924805,0.11944770812988281,1.323204517364502,0.19933509826660156 +7,refs/heads/dev,2df475c5347893eec68348da93344790f6957fbc,e2e547e3c14524f255e0f6ca55c99bcd6ef0c338,61747cd4ffb978ae2dfce019d190825ee4d620d4,,True,True,520d919493b5743dfc0929dcd4f9e7bdc96c9910728c42bd8b18ef1d5c5f3286,Tests_passed,88b0b166c1d41b07354158ae5b7be8757cd81644f853c4a8a7fe2f412a5401bf,Tests_passed,True,True,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,0.011472702026367188,0.011249542236328125,0.012975454330444336,0.012786388397216797,0.013503313064575195,0.013033151626586914,0.012988090515136719,0.05133938789367676,0.011711597442626953,0.30641651153564453,0.3137166500091553,0.11944770812988281,1.323204517364502,0.19933509826660156 diff --git a/results/combined/merges_timed/runelite/runelite.csv b/results/combined/merges_timed/runelite/runelite.csv index 5b011fb3b7..5d3323f057 100644 --- a/results/combined/merges_timed/runelite/runelite.csv +++ b/results/combined/merges_timed/runelite/runelite.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -661,refs/heads/master,6b475a74dba16b6dbae71c108df8f4be30384ca3,2835feea7037de3067f6a9ec59e798723d660cdb,91bc28a84ba1ad90c2429b1b61f4236ea929f8dd,,True,True,ad424b10eef70502998a953805b02ff10f3ecb06663bab544179cc3b6f1d61d8,Tests_passed,b8713a3e3dfae813b1bed11bc1595196d2fa18f5478863b29b533d0c585caa57,Tests_passed,True,True,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,0.06751799583435059,0.07097363471984863,0.09463286399841309,0.09535408020019531,0.09900164604187012,0.0975186824798584,0.09487247467041016,0.17764544486999512,0.0710456371307373,0.23256254196166992,0.23411965370178223,0.13149070739746094,1.758108139038086,2.153752088546753 +661,refs/heads/master,6b475a74dba16b6dbae71c108df8f4be30384ca3,2835feea7037de3067f6a9ec59e798723d660cdb,91bc28a84ba1ad90c2429b1b61f4236ea929f8dd,,True,True,ad424b10eef70502998a953805b02ff10f3ecb06663bab544179cc3b6f1d61d8,Tests_passed,b8713a3e3dfae813b1bed11bc1595196d2fa18f5478863b29b533d0c585caa57,Tests_passed,True,True,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,0.06751799583435059,0.07097363471984863,0.09463286399841309,0.09535408020019531,0.09900164604187012,0.0975186824798584,0.09487247467041016,0.17764544486999512,0.0710456371307373,0.23211407661437988,0.23731088638305664,0.13149070739746094,1.758108139038086,2.153752088546753 diff --git a/results/combined/merges_timed/ryantenney/metrics-spring.csv b/results/combined/merges_timed/ryantenney/metrics-spring.csv index 1ed6d08e16..d1cc0bd821 100644 --- a/results/combined/merges_timed/ryantenney/metrics-spring.csv +++ b/results/combined/merges_timed/ryantenney/metrics-spring.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/v3.1-maintenance,5244ad0b109cc2814221012c959aee61705efe5b,32f5ac65aefa8fa8a9b4d96ad60eac5aeb01f096,ccd21978ea0d9b2ec4e5680e81093ae1c54f0c7c,,True,True,7487bf355c7c49ad1c8f49aff0184e5177884159b82a2abc679229a05bd1160f,Tests_passed,07606770b047e7a96c5615ad76379d1f66c829ada41d83970efae9a6657350af,Tests_passed,True,True,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,a80ca6f0954bd07233d28a2e94c059fe84fbe32dd2a5592eeb093667c72721b0,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,81ab1f3cefb0e3e69f855d0abe5983ad68b80ed1e0a98f4c27bfb4a3e91ff11e,Merge_failed,ddfb213ead40f371455aa8a3208377271cf50b0492b9b66abb06d880a9a43c4a,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,bf643a544874ca6efd201eb6eb7d5a0964593049a808a217b0d0f179c7b0b1e2,Merge_failed,b33517d61eb6f8549e8833b7036b0238a160bb1873c53c6cb6a786540a3134bb,0.031641244888305664,0.04033970832824707,0.036911725997924805,0.04186272621154785,0.021524906158447266,0.034440040588378906,0.02434682846069336,0.3970625400543213,0.05647420883178711,0.7851676940917969,0.7869434356689453,0.6162712574005127,3.1117892265319824,0.24770498275756836 +6,refs/heads/v3.1-maintenance,5244ad0b109cc2814221012c959aee61705efe5b,32f5ac65aefa8fa8a9b4d96ad60eac5aeb01f096,ccd21978ea0d9b2ec4e5680e81093ae1c54f0c7c,,True,True,7487bf355c7c49ad1c8f49aff0184e5177884159b82a2abc679229a05bd1160f,Tests_passed,07606770b047e7a96c5615ad76379d1f66c829ada41d83970efae9a6657350af,Tests_passed,True,True,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,a80ca6f0954bd07233d28a2e94c059fe84fbe32dd2a5592eeb093667c72721b0,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,81ab1f3cefb0e3e69f855d0abe5983ad68b80ed1e0a98f4c27bfb4a3e91ff11e,Merge_failed,ddfb213ead40f371455aa8a3208377271cf50b0492b9b66abb06d880a9a43c4a,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,bf643a544874ca6efd201eb6eb7d5a0964593049a808a217b0d0f179c7b0b1e2,Merge_failed,b33517d61eb6f8549e8833b7036b0238a160bb1873c53c6cb6a786540a3134bb,0.031641244888305664,0.04033970832824707,0.036911725997924805,0.04186272621154785,0.021524906158447266,0.034440040588378906,0.02434682846069336,0.3970625400543213,0.05647420883178711,0.7768492698669434,0.7748203277587891,0.6162712574005127,3.1117892265319824,0.24770498275756836 diff --git a/results/combined/merges_timed/rylinaux/plugman.csv b/results/combined/merges_timed/rylinaux/plugman.csv index 9569c3b690..63d98bac67 100644 --- a/results/combined/merges_timed/rylinaux/plugman.csv +++ b/results/combined/merges_timed/rylinaux/plugman.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/remotes/origin/pull/53,cd097a5e02123e8341949738d8b0a91b9345b684,b4eb99945c41fc6f4006bdc4c89e9afedf372020,940979e30479e718afcfa6bb71a0b4bd2529f23e,,369094163191050836bc326e7c0619a31ef18e9d12b0d546acec62ddb5104a4c,Tests_passed,5e9443034202cc68c8596fef46a595d4e3fb6046792be089028c0162847147a1,Tests_passed,True,True,True,True,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,3176fef7cf2373f5b6d1f75018c2387d007da86d174a41bea326446c8b60cab8,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,3176fef7cf2373f5b6d1f75018c2387d007da86d174a41bea326446c8b60cab8,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,99245a722c9ce7068e1d3d7cec9572c308effe70b7df8d626aa968517aed34cc,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,0b7f08f28c84ec1d6d6b1cf578f32aca1c8ca0473afea56ea9727dc50901efa6,Merge_failed,0b7f08f28c84ec1d6d6b1cf578f32aca1c8ca0473afea56ea9727dc50901efa6,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,bec72c1ec71f1cd2e66a81af3a01c8062ef8b35953f3599ef677f9de9b67d1da,Merge_failed,d7269860ca5eb0280b4dc0e9ba65f3c325fe5fc61c637c05c5dcb516b70d2ec4,0.013731956481933594,0.0414731502532959,0.036864519119262695,0.03207874298095703,0.015032291412353516,0.04126167297363281,0.0380854606628418,0.23420453071594238,0.07636499404907227,0.07032513618469238,0.06967449188232422,0.1683812141418457,0.6470465660095215,0.18916034698486328 +19,refs/remotes/origin/pull/53,cd097a5e02123e8341949738d8b0a91b9345b684,b4eb99945c41fc6f4006bdc4c89e9afedf372020,940979e30479e718afcfa6bb71a0b4bd2529f23e,,369094163191050836bc326e7c0619a31ef18e9d12b0d546acec62ddb5104a4c,Tests_passed,5e9443034202cc68c8596fef46a595d4e3fb6046792be089028c0162847147a1,Tests_passed,True,True,True,True,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,3176fef7cf2373f5b6d1f75018c2387d007da86d174a41bea326446c8b60cab8,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,3176fef7cf2373f5b6d1f75018c2387d007da86d174a41bea326446c8b60cab8,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,99245a722c9ce7068e1d3d7cec9572c308effe70b7df8d626aa968517aed34cc,Merge_failed,476e7c679c7a3cdf396acd4ca376408a85d9fa29f1ebe4f1fdb40d1c9f83dff9,Merge_failed,0b7f08f28c84ec1d6d6b1cf578f32aca1c8ca0473afea56ea9727dc50901efa6,Merge_failed,0b7f08f28c84ec1d6d6b1cf578f32aca1c8ca0473afea56ea9727dc50901efa6,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,bec72c1ec71f1cd2e66a81af3a01c8062ef8b35953f3599ef677f9de9b67d1da,Merge_failed,d7269860ca5eb0280b4dc0e9ba65f3c325fe5fc61c637c05c5dcb516b70d2ec4,0.013731956481933594,0.0414731502532959,0.036864519119262695,0.03207874298095703,0.015032291412353516,0.04126167297363281,0.0380854606628418,0.23420453071594238,0.07636499404907227,0.06921911239624023,0.06913065910339355,0.1683812141418457,0.6470465660095215,0.18916034698486328 diff --git a/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv b/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv index f63d0181ac..643d5e659f 100644 --- a/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv +++ b/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -145,refs/heads/master,86423815da5ac60c8f09cdf198e6d08a50f7ff87,bc4854a58fccc72f9c68290fd4e68e6cdc828978,086cbea80d0b32b10041a57dc9e71d9c8d20ba0d,,True,True,8615ffce9fe64589a6f708b6ac559cb2c6cfb0785d0284987708c98a52a4933b,Tests_passed,7bef9b09c737852d75a16f57e98c98c1979c577a83f6e945d4ec4704f32d1597,Tests_passed,True,True,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,0.04601168632507324,0.04321694374084473,0.04431486129760742,0.04833197593688965,0.038786888122558594,0.04589557647705078,0.04889059066772461,0.1651134490966797,0.04854726791381836,0.16767525672912598,0.1675853729248047,0.10788750648498535,0.6902163028717041,0.23062705993652344 +145,refs/heads/master,86423815da5ac60c8f09cdf198e6d08a50f7ff87,bc4854a58fccc72f9c68290fd4e68e6cdc828978,086cbea80d0b32b10041a57dc9e71d9c8d20ba0d,,True,True,8615ffce9fe64589a6f708b6ac559cb2c6cfb0785d0284987708c98a52a4933b,Tests_passed,7bef9b09c737852d75a16f57e98c98c1979c577a83f6e945d4ec4704f32d1597,Tests_passed,True,True,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,0.04601168632507324,0.04321694374084473,0.04431486129760742,0.04833197593688965,0.038786888122558594,0.04589557647705078,0.04889059066772461,0.1651134490966797,0.04854726791381836,0.16554737091064453,0.1648578643798828,0.10788750648498535,0.6902163028717041,0.23062705993652344 diff --git a/results/combined/merges_timed/sachin-handiekar/jinstagram.csv b/results/combined/merges_timed/sachin-handiekar/jinstagram.csv index d70be708fb..e9a9c200db 100644 --- a/results/combined/merges_timed/sachin-handiekar/jinstagram.csv +++ b/results/combined/merges_timed/sachin-handiekar/jinstagram.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -34,refs/heads/master,8a29221353368d4d290973e4d8ebe90325567793,1758fa70e7a74e72c0a4ffad99cf6c7435676173,840c591a5e5cf424f5f1745ec911a79d2cd1185d,,9e6663596a779a6b3091f01f6e904946348a9e3dc9e332460762642c27114cd7,Tests_passed,0bf72301352fd98232923cf9535589946937d73fc1a2bb5c15989820dcddca5c,Tests_passed,True,True,True,True,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,0.015666484832763672,0.014853954315185547,0.01722407341003418,0.017493486404418945,0.018180370330810547,0.017844200134277344,0.01782369613647461,0.04449820518493652,0.01502084732055664,0.15511083602905273,0.15399408340454102,0.07184457778930664,0.5612952709197998,0.25267720222473145 +34,refs/heads/master,8a29221353368d4d290973e4d8ebe90325567793,1758fa70e7a74e72c0a4ffad99cf6c7435676173,840c591a5e5cf424f5f1745ec911a79d2cd1185d,,9e6663596a779a6b3091f01f6e904946348a9e3dc9e332460762642c27114cd7,Tests_passed,0bf72301352fd98232923cf9535589946937d73fc1a2bb5c15989820dcddca5c,Tests_passed,True,True,True,True,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,0.015666484832763672,0.014853954315185547,0.01722407341003418,0.017493486404418945,0.018180370330810547,0.017844200134277344,0.01782369613647461,0.04449820518493652,0.01502084732055664,0.15349078178405762,0.1518394947052002,0.07184457778930664,0.5612952709197998,0.25267720222473145 diff --git a/results/combined/merges_timed/sailthru/sailthru-java-client.csv b/results/combined/merges_timed/sailthru/sailthru-java-client.csv index bde4807091..3ac40c4718 100644 --- a/results/combined/merges_timed/sailthru/sailthru-java-client.csv +++ b/results/combined/merges_timed/sailthru/sailthru-java-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -55,refs/remotes/origin/pull/4,ee1f9176009eddb98d87251dfd9d8476b8684fc3,59fcb2eaa94d5b401e3a510f5deef270c613d727,2281a3407450b6811fa6483d0b54c4f954d1deaa,,True,True,00e414fbd0762d5af9bee125b260a97e47b17f07b177702e3f360c674c16120e,Tests_passed,4d36e446f25b93fb1ae090e5f822e43e090098b1b84e8390d7d0413b4ec89b1c,Tests_passed,True,True,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,ec276bb69517c9e6c6592b029a625de165c6a3d4cae8acd23bdc702bb806fb0a,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,e6154d2dcbb64c5462b575621bf62c677c964728978bfb5c7a5902df9c0b7aae,Merge_failed,e6154d2dcbb64c5462b575621bf62c677c964728978bfb5c7a5902df9c0b7aae,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Merge_failed,3a04ff787cdda51a3a0af472a3120e0376bc3031711d54a1c6f51b3daf00f162,0.009576082229614258,0.030141115188598633,0.04052925109863281,0.03221845626831055,0.04212784767150879,0.032663822174072266,0.027092695236206055,0.1670088768005371,0.06283831596374512,0.06299901008605957,0.06310367584228516,0.10263562202453613,0.5490584373474121,0.19661998748779297 +55,refs/remotes/origin/pull/4,ee1f9176009eddb98d87251dfd9d8476b8684fc3,59fcb2eaa94d5b401e3a510f5deef270c613d727,2281a3407450b6811fa6483d0b54c4f954d1deaa,,True,True,00e414fbd0762d5af9bee125b260a97e47b17f07b177702e3f360c674c16120e,Tests_passed,4d36e446f25b93fb1ae090e5f822e43e090098b1b84e8390d7d0413b4ec89b1c,Tests_passed,True,True,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,ec276bb69517c9e6c6592b029a625de165c6a3d4cae8acd23bdc702bb806fb0a,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,e6154d2dcbb64c5462b575621bf62c677c964728978bfb5c7a5902df9c0b7aae,Merge_failed,e6154d2dcbb64c5462b575621bf62c677c964728978bfb5c7a5902df9c0b7aae,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Merge_failed,3a04ff787cdda51a3a0af472a3120e0376bc3031711d54a1c6f51b3daf00f162,0.009576082229614258,0.030141115188598633,0.04052925109863281,0.03221845626831055,0.04212784767150879,0.032663822174072266,0.027092695236206055,0.1670088768005371,0.06283831596374512,0.06332230567932129,0.06305766105651855,0.10263562202453613,0.5490584373474121,0.19661998748779297 diff --git a/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv b/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv index 1f08555567..7bf9e5a0bd 100644 --- a/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv +++ b/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,8827bca9e525e2306ce7d2ff8089317e31092489,fc5f5c074e841ecdc2d686ed07f4cceff940a4e9,d0a3a8b63781fc75f3058208e41a7e1be22e0770,,True,True,53ac098e9cbc12d5d43d6d6100bfe330b8ac0bb51b8c4bdb67bd51b951193d2f,Tests_passed,8a52517f62352329303c5aed8f052af3a9c89f39e9bc6d209a59e0c6bb4a67ea,Tests_passed,True,True,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,bd83d0006c9ed814acfeb5ca9d9cd93e61503f6e366e9671f220ea99cd421df6,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,274154558ffdd3bec53d1ae82849f9c6f0b454fc9a32855924ec46782290ec2d,Merge_failed,ff29712bce272b00924e149b946e66c9014d4bafd5845c76c026742a957629f1,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,e4dad75633a02c7eb222e80ea1be70cc3f578ce271be61aaa30dfcb2f0686823,Merge_failed,274154558ffdd3bec53d1ae82849f9c6f0b454fc9a32855924ec46782290ec2d,0.012491941452026367,0.012009620666503906,0.012743234634399414,0.012562751770019531,0.012820959091186523,0.012827157974243164,0.012740373611450195,0.07577943801879883,0.0188753604888916,0.16527366638183594,0.16465997695922852,0.23171544075012207,0.7637197971343994,0.18509435653686523 +1,refs/heads/master,8827bca9e525e2306ce7d2ff8089317e31092489,fc5f5c074e841ecdc2d686ed07f4cceff940a4e9,d0a3a8b63781fc75f3058208e41a7e1be22e0770,,True,True,53ac098e9cbc12d5d43d6d6100bfe330b8ac0bb51b8c4bdb67bd51b951193d2f,Tests_passed,8a52517f62352329303c5aed8f052af3a9c89f39e9bc6d209a59e0c6bb4a67ea,Tests_passed,True,True,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,bd83d0006c9ed814acfeb5ca9d9cd93e61503f6e366e9671f220ea99cd421df6,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,274154558ffdd3bec53d1ae82849f9c6f0b454fc9a32855924ec46782290ec2d,Merge_failed,ff29712bce272b00924e149b946e66c9014d4bafd5845c76c026742a957629f1,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,e4dad75633a02c7eb222e80ea1be70cc3f578ce271be61aaa30dfcb2f0686823,Merge_failed,274154558ffdd3bec53d1ae82849f9c6f0b454fc9a32855924ec46782290ec2d,0.012491941452026367,0.012009620666503906,0.012743234634399414,0.012562751770019531,0.012820959091186523,0.012827157974243164,0.012740373611450195,0.07577943801879883,0.0188753604888916,0.16264653205871582,0.1629791259765625,0.23171544075012207,0.7637197971343994,0.18509435653686523 diff --git a/results/combined/merges_timed/sammthomson/semafor.csv b/results/combined/merges_timed/sammthomson/semafor.csv index a0cf3f5493..9c5b066aba 100644 --- a/results/combined/merges_timed/sammthomson/semafor.csv +++ b/results/combined/merges_timed/sammthomson/semafor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/remotes/origin/develop,1b62f9ce9b3c32ea3e1c737df5c9acf3c23d27e1,4db260dd91b978ccd72a0a279dd9546413efd238,0a53b56bfd23a41697bbd84f76773d09ce8bac86,,361a0fbfbce9327bf5ea2ea8f428c5bef03568a96aae5eed0937e0ea1f4ccff8,Tests_passed,3da49e3a26b0f1705aea4d02707091d6b0b95da1a4b5896076b02aaeacff2556,Tests_passed,True,True,True,True,Merge_failed,c2122373c82b3c8ae3735baf66542975e7ac7a7b5c414be9ccb878a8dbb6fc6f,Merge_failed,a86bceab56e3098c70e37fb22aa20803de841390dd644a29539a00f9d73fd4eb,Merge_failed,c2122373c82b3c8ae3735baf66542975e7ac7a7b5c414be9ccb878a8dbb6fc6f,Merge_failed,3a2393a653190161fd50e8c35e9a92771480b9159b52aba373b58b6848947085,Merge_failed,e6ab6728d1ecb45e6f0d6b687f2e12ba75807f62754411dcdad44537e8335ea2,Merge_failed,e6ab6728d1ecb45e6f0d6b687f2e12ba75807f62754411dcdad44537e8335ea2,Merge_failed,c2122373c82b3c8ae3735baf66542975e7ac7a7b5c414be9ccb878a8dbb6fc6f,Merge_failed,aacad77677ad8bdb28612c581d28c3e662c078928c3be4db1c4705fa2f52a171,Merge_failed,c2122373c82b3c8ae3735baf66542975e7ac7a7b5c414be9ccb878a8dbb6fc6f,Merge_failed,8c8b638494fcd838647bb9ae23c3dbf40ff1577ef8b66a0fe6c017830085bb56,Merge_failed,8c8b638494fcd838647bb9ae23c3dbf40ff1577ef8b66a0fe6c017830085bb56,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,2ea318638e1d329fd93eb74484304e897e40988feb1012537f81c078cff69d60,Merge_failed,58e87a7dde4a6fcc4024b24dc922b2296bd59a02d76a4d14515d65e24413237f,0.03727293014526367,0.03716540336608887,0.052245140075683594,0.051882028579711914,0.05320882797241211,0.05187535285949707,0.051692962646484375,0.25905656814575195,0.10052299499511719,0.2858099937438965,0.3134806156158447,0.5947272777557373,2.0264406204223633,0.5159552097320557 +32,refs/remotes/origin/develop,1b62f9ce9b3c32ea3e1c737df5c9acf3c23d27e1,4db260dd91b978ccd72a0a279dd9546413efd238,0a53b56bfd23a41697bbd84f76773d09ce8bac86,,361a0fbfbce9327bf5ea2ea8f428c5bef03568a96aae5eed0937e0ea1f4ccff8,Tests_passed,3da49e3a26b0f1705aea4d02707091d6b0b95da1a4b5896076b02aaeacff2556,Tests_passed,True,True,True,True,Merge_failed,c2122373c82b3c8ae3735baf66542975e7ac7a7b5c414be9ccb878a8dbb6fc6f,Merge_failed,a86bceab56e3098c70e37fb22aa20803de841390dd644a29539a00f9d73fd4eb,Merge_failed,c2122373c82b3c8ae3735baf66542975e7ac7a7b5c414be9ccb878a8dbb6fc6f,Merge_failed,3a2393a653190161fd50e8c35e9a92771480b9159b52aba373b58b6848947085,Merge_failed,e6ab6728d1ecb45e6f0d6b687f2e12ba75807f62754411dcdad44537e8335ea2,Merge_failed,e6ab6728d1ecb45e6f0d6b687f2e12ba75807f62754411dcdad44537e8335ea2,Merge_failed,c2122373c82b3c8ae3735baf66542975e7ac7a7b5c414be9ccb878a8dbb6fc6f,Merge_failed,aacad77677ad8bdb28612c581d28c3e662c078928c3be4db1c4705fa2f52a171,Merge_failed,c2122373c82b3c8ae3735baf66542975e7ac7a7b5c414be9ccb878a8dbb6fc6f,Merge_failed,8c8b638494fcd838647bb9ae23c3dbf40ff1577ef8b66a0fe6c017830085bb56,Merge_failed,8c8b638494fcd838647bb9ae23c3dbf40ff1577ef8b66a0fe6c017830085bb56,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,2ea318638e1d329fd93eb74484304e897e40988feb1012537f81c078cff69d60,Merge_failed,58e87a7dde4a6fcc4024b24dc922b2296bd59a02d76a4d14515d65e24413237f,0.03727293014526367,0.03716540336608887,0.052245140075683594,0.051882028579711914,0.05320882797241211,0.05187535285949707,0.051692962646484375,0.25905656814575195,0.10052299499511719,0.27202820777893066,0.2727482318878174,0.5947272777557373,2.0264406204223633,0.5159552097320557 diff --git a/results/combined/merges_timed/samskivert/jmustache.csv b/results/combined/merges_timed/samskivert/jmustache.csv index efb2c3afa8..4b6db987d7 100644 --- a/results/combined/merges_timed/samskivert/jmustache.csv +++ b/results/combined/merges_timed/samskivert/jmustache.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,940af397c4c27995bcf56fb26151d7a98a662e8a,c8915ffc3c76750c7c795225fe17db162dff43a5,d1d72031f209d864ee721c40cd9ce1e174383577,,7754199c00a1bf066a8ad588e6ab14cf4ba3dd70bd0b0cf725600cfcd3b2fd0b,Tests_passed,c66c21a53b5ae8fb1d0424331487e954703c9cbd188aba10271ffec58818bc38,Tests_passed,True,True,True,True,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,0.049575090408325195,0.03847074508666992,0.04694533348083496,0.04808807373046875,0.049124956130981445,0.04333782196044922,0.04963040351867676,0.17274999618530273,0.0521547794342041,0.18639421463012695,0.18811607360839844,0.11419439315795898,1.864311695098877,0.19286441802978516 +12,refs/heads/master,940af397c4c27995bcf56fb26151d7a98a662e8a,c8915ffc3c76750c7c795225fe17db162dff43a5,d1d72031f209d864ee721c40cd9ce1e174383577,,7754199c00a1bf066a8ad588e6ab14cf4ba3dd70bd0b0cf725600cfcd3b2fd0b,Tests_passed,c66c21a53b5ae8fb1d0424331487e954703c9cbd188aba10271ffec58818bc38,Tests_passed,True,True,True,True,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,0.049575090408325195,0.03847074508666992,0.04694533348083496,0.04808807373046875,0.049124956130981445,0.04333782196044922,0.04963040351867676,0.17274999618530273,0.0521547794342041,0.18460512161254883,0.1850724220275879,0.11419439315795898,1.864311695098877,0.19286441802978516 diff --git a/results/combined/merges_timed/samskivert/pythagoras.csv b/results/combined/merges_timed/samskivert/pythagoras.csv index 5ddaff2b08..3eeb414ef5 100644 --- a/results/combined/merges_timed/samskivert/pythagoras.csv +++ b/results/combined/merges_timed/samskivert/pythagoras.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,c521fcd74ec43af2196b7dac29bffc6f2aba1643,402711b76630c2c012b4fb1f64d2ac51a7df4ba1,923dbc128472ae335d035dd934be0bf4132d204a,,a427d656beefa5f9b2410d95fcd99403d1504ca39879adcc512d52bff3bc8f17,Tests_passed,7fa68889ee7c8397c49dd468bf7ef35fb853896a5cd817d0a887b875aef29284,Tests_passed,True,True,True,True,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,0.05650043487548828,0.061684370040893555,0.055864810943603516,0.05786609649658203,0.05172228813171387,0.06251335144042969,0.06187105178833008,0.2819046974182129,0.046828508377075195,0.5241134166717529,0.5171644687652588,0.22982025146484375,3.7207083702087402,0.2401421070098877 +8,refs/heads/master,c521fcd74ec43af2196b7dac29bffc6f2aba1643,402711b76630c2c012b4fb1f64d2ac51a7df4ba1,923dbc128472ae335d035dd934be0bf4132d204a,,a427d656beefa5f9b2410d95fcd99403d1504ca39879adcc512d52bff3bc8f17,Tests_passed,7fa68889ee7c8397c49dd468bf7ef35fb853896a5cd817d0a887b875aef29284,Tests_passed,True,True,True,True,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,0.05650043487548828,0.061684370040893555,0.055864810943603516,0.05786609649658203,0.05172228813171387,0.06251335144042969,0.06187105178833008,0.2819046974182129,0.046828508377075195,0.5103278160095215,0.5091948509216309,0.22982025146484375,3.7207083702087402,0.2401421070098877 diff --git a/results/combined/merges_timed/samskivert/samskivert.csv b/results/combined/merges_timed/samskivert/samskivert.csv index d0b350a930..f2aecf0fcb 100644 --- a/results/combined/merges_timed/samskivert/samskivert.csv +++ b/results/combined/merges_timed/samskivert/samskivert.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,d870dd2fac79ec07a7e9143cda4efe41fd3e66d4,5356672130809882e5d7d169af7d6a447ce7ebd3,a641e6c502f06dae6a0b6a4af3ed827040b05877,,True,True,63a4bed6ef8c8446082eeefd4694b5b4e761688a9c19390dc16680f6ec66bfc9,Tests_passed,44b1d457e4a08d09d8f1c79a39be686a004bc4b71011ce1d41c02a017b5a449d,Tests_passed,True,True,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,0.011094093322753906,0.023093700408935547,0.02966451644897461,0.02831292152404785,0.011029243469238281,0.02857518196105957,0.028960227966308594,0.06164383888244629,0.011197805404663086,0.15938377380371094,0.17290019989013672,0.06848812103271484,0.9480438232421875,0.21604537963867188 +2,refs/heads/master,d870dd2fac79ec07a7e9143cda4efe41fd3e66d4,5356672130809882e5d7d169af7d6a447ce7ebd3,a641e6c502f06dae6a0b6a4af3ed827040b05877,,True,True,63a4bed6ef8c8446082eeefd4694b5b4e761688a9c19390dc16680f6ec66bfc9,Tests_passed,44b1d457e4a08d09d8f1c79a39be686a004bc4b71011ce1d41c02a017b5a449d,Tests_passed,True,True,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,0.011094093322753906,0.023093700408935547,0.02966451644897461,0.02831292152404785,0.011029243469238281,0.02857518196105957,0.028960227966308594,0.06164383888244629,0.011197805404663086,0.16428852081298828,0.1636948585510254,0.06848812103271484,0.9480438232421875,0.21604537963867188 diff --git a/results/combined/merges_timed/sander2798/enderstone.csv b/results/combined/merges_timed/sander2798/enderstone.csv index 605711d048..875bc74547 100644 --- a/results/combined/merges_timed/sander2798/enderstone.csv +++ b/results/combined/merges_timed/sander2798/enderstone.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -99,refs/heads/master,27f9c43869468a75a469b9d40b3e3e946da5c687,36b08dfce06b1bcc1db0c53ab0d0f2b59cfd659f,f4902dea1ad7f177a300c4cbb7c277a64a9c4cfc,,True,True,7a2fdde0c9906c9993e90b50ffa6803141280240605c810fbb3258da579b9eae,Tests_passed,d3ca35b59a9aa89336ed7b328458e219d7050b4e24073d91fd2732d1533ffa88,Tests_passed,True,True,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,4cdb18e88e2861f7341fd10948af4aea67f342f8b277b85cde2dbd54b286c851,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,4cdb18e88e2861f7341fd10948af4aea67f342f8b277b85cde2dbd54b286c851,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,1eb39f682ef9da575f3aec53177ebde34a6f8aa7d326fe117ba88de9292fd3b2,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,fc04071e7f4c47adcc343293b0dcdbee463757940eaf3ee62aaf278493bc5a88,Merge_failed,fc04071e7f4c47adcc343293b0dcdbee463757940eaf3ee62aaf278493bc5a88,Merge_failed,c372decd06b636833bebfe9a77d3df024ec1ee69e21872b2ad1cd39766804bb8,Tests_passed,96c5983484b0705bcd2a6ad38c3006641db944ad5829504c7747f96b4ee322be,Merge_failed,14b31f3efa0e86d709cf0ba43305a0fbb88055bb1166de77d85a2ef9a71bb7ad,0.047823429107666016,0.04610919952392578,0.053949832916259766,0.04184722900390625,0.04827761650085449,0.047757625579833984,0.055533647537231445,0.3588130474090576,0.08751511573791504,0.6023736000061035,0.5903668403625488,0.296022891998291,3.302981376647949,0.2500803470611572 +99,refs/heads/master,27f9c43869468a75a469b9d40b3e3e946da5c687,36b08dfce06b1bcc1db0c53ab0d0f2b59cfd659f,f4902dea1ad7f177a300c4cbb7c277a64a9c4cfc,,True,True,7a2fdde0c9906c9993e90b50ffa6803141280240605c810fbb3258da579b9eae,Tests_passed,d3ca35b59a9aa89336ed7b328458e219d7050b4e24073d91fd2732d1533ffa88,Tests_passed,True,True,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,4cdb18e88e2861f7341fd10948af4aea67f342f8b277b85cde2dbd54b286c851,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,4cdb18e88e2861f7341fd10948af4aea67f342f8b277b85cde2dbd54b286c851,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,1eb39f682ef9da575f3aec53177ebde34a6f8aa7d326fe117ba88de9292fd3b2,Merge_failed,263bd719cb54911bedc2c00bdebd62aa726c7c0f641167497c85ec38eab7b6bc,Merge_failed,fc04071e7f4c47adcc343293b0dcdbee463757940eaf3ee62aaf278493bc5a88,Merge_failed,fc04071e7f4c47adcc343293b0dcdbee463757940eaf3ee62aaf278493bc5a88,Merge_failed,c372decd06b636833bebfe9a77d3df024ec1ee69e21872b2ad1cd39766804bb8,Tests_passed,96c5983484b0705bcd2a6ad38c3006641db944ad5829504c7747f96b4ee322be,Merge_failed,14b31f3efa0e86d709cf0ba43305a0fbb88055bb1166de77d85a2ef9a71bb7ad,0.047823429107666016,0.04610919952392578,0.053949832916259766,0.04184722900390625,0.04827761650085449,0.047757625579833984,0.055533647537231445,0.3588130474090576,0.08751511573791504,0.5964498519897461,0.597214937210083,0.296022891998291,3.302981376647949,0.2500803470611572 diff --git a/results/combined/merges_timed/sandergielisse/enderstone.csv b/results/combined/merges_timed/sandergielisse/enderstone.csv index 3701e72b92..ea404a686d 100644 --- a/results/combined/merges_timed/sandergielisse/enderstone.csv +++ b/results/combined/merges_timed/sandergielisse/enderstone.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -102,refs/heads/master,7e7c2aae079a09a93b1d3811f8a1111a5e60d991,6a8556dc171591cb769f7b2485fd15118eee8230,615f68f0fd9d5b6b91d84ef4977586f6e442a04e,,ec75da5ea2cdd38f3818529c0d9ca8ed06cc0f2c48412af89b3e7ba8d8b18439,Tests_passed,a999b9317237e00a1d31abc53c6bf985dc1432379483afacada2910fc3da4891,Tests_passed,True,True,True,True,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,dff1a0f8d0267668f016ff85d2e324ecaebfe7afa7ffe51eddc640ec1fb45ca8,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,357960a519fbd71d95206c7ea8391742ebeeb922037c8371a04c05c021253e8b,Merge_failed,357960a519fbd71d95206c7ea8391742ebeeb922037c8371a04c05c021253e8b,Merge_failed,90a52afe07936a171dd227c521323ce7c8b944dd2e224229622a39ec34ea30bd,Merge_failed,b0e42ec6355ea928f52692ba5e6bc4e9b8128cfb02413252e883a04f6087b5f6,Merge_failed,d6fc330b13629b07a28c948dba3c8f46ec396a51ee5dd21af05a193427231a36,0.036665916442871094,0.04160928726196289,0.028784513473510742,0.04394388198852539,0.03448081016540527,0.04143643379211426,0.04108548164367676,0.16999602317810059,0.06620287895202637,0.0654292106628418,0.06515765190124512,0.11867618560791016,0.8917727470397949,0.2103748321533203 +102,refs/heads/master,7e7c2aae079a09a93b1d3811f8a1111a5e60d991,6a8556dc171591cb769f7b2485fd15118eee8230,615f68f0fd9d5b6b91d84ef4977586f6e442a04e,,ec75da5ea2cdd38f3818529c0d9ca8ed06cc0f2c48412af89b3e7ba8d8b18439,Tests_passed,a999b9317237e00a1d31abc53c6bf985dc1432379483afacada2910fc3da4891,Tests_passed,True,True,True,True,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,dff1a0f8d0267668f016ff85d2e324ecaebfe7afa7ffe51eddc640ec1fb45ca8,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,357960a519fbd71d95206c7ea8391742ebeeb922037c8371a04c05c021253e8b,Merge_failed,357960a519fbd71d95206c7ea8391742ebeeb922037c8371a04c05c021253e8b,Merge_failed,90a52afe07936a171dd227c521323ce7c8b944dd2e224229622a39ec34ea30bd,Merge_failed,b0e42ec6355ea928f52692ba5e6bc4e9b8128cfb02413252e883a04f6087b5f6,Merge_failed,d6fc330b13629b07a28c948dba3c8f46ec396a51ee5dd21af05a193427231a36,0.036665916442871094,0.04160928726196289,0.028784513473510742,0.04394388198852539,0.03448081016540527,0.04143643379211426,0.04108548164367676,0.16999602317810059,0.06620287895202637,0.06490039825439453,0.06548857688903809,0.11867618560791016,0.8917727470397949,0.2103748321533203 diff --git a/results/combined/merges_timed/saucelabs/ci-sauce.csv b/results/combined/merges_timed/saucelabs/ci-sauce.csv index 89aba0f579..1f4b32b047 100644 --- a/results/combined/merges_timed/saucelabs/ci-sauce.csv +++ b/results/combined/merges_timed/saucelabs/ci-sauce.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/main,46cc1e6e2bce0bd5819fb9f1045666e678ec0feb,940f484bf0fd29a946a0da6c46b7bc62d5b4beb2,24d160f16d457a770121267820d492c355c03814,,True,True,9f470db15aa826b67b57e0bf6e8c7655fd2466d24b1ded3788639ae27449aa64,Tests_passed,37ff35992ce1a29d448c42f5381b0db7732dbdb8ed0c66af6b5e3bdc656c532c,Tests_passed,True,True,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,0.13714170455932617,0.13630437850952148,0.1972336769104004,0.1914665699005127,0.19876956939697266,0.19763970375061035,0.1368250846862793,0.2197704315185547,0.13474392890930176,0.1719977855682373,0.17305707931518555,0.18990278244018555,1.2191381454467773,1.0699949264526367 +8,refs/heads/main,46cc1e6e2bce0bd5819fb9f1045666e678ec0feb,940f484bf0fd29a946a0da6c46b7bc62d5b4beb2,24d160f16d457a770121267820d492c355c03814,,True,True,9f470db15aa826b67b57e0bf6e8c7655fd2466d24b1ded3788639ae27449aa64,Tests_passed,37ff35992ce1a29d448c42f5381b0db7732dbdb8ed0c66af6b5e3bdc656c532c,Tests_passed,True,True,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,0.13714170455932617,0.13630437850952148,0.1972336769104004,0.1914665699005127,0.19876956939697266,0.19763970375061035,0.1368250846862793,0.2197704315185547,0.13474392890930176,0.2874274253845215,0.16457796096801758,0.18990278244018555,1.2191381454467773,1.0699949264526367 diff --git a/results/combined/merges_timed/sbtourist/journal.io.csv b/results/combined/merges_timed/sbtourist/journal.io.csv index 9655372bfa..4527ee2d3e 100644 --- a/results/combined/merges_timed/sbtourist/journal.io.csv +++ b/results/combined/merges_timed/sbtourist/journal.io.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,8bac7e41e6145a0dc0b5e315a5d683f54bb67172,a3ec3110f06cca7c0222f5d29d2d5621ae14baec,8e420a131d6b726abafd703d4fcaf060783f828d,,True,True,f676f5ed2fd008313ad02325bbb63fd2f6fd868d69981e2cc6bedf98036c87a0,Tests_passed,715e2a1c763822ff0a9b88bcac1e5c96208d03328a6d5011538751fce365aa70,Tests_passed,True,True,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,0.01446080207824707,0.04899263381958008,0.04634356498718262,0.04081416130065918,0.04824495315551758,0.061363935470581055,0.04815316200256348,0.1651003360748291,0.014443159103393555,0.1874229907989502,0.18867015838623047,0.10224199295043945,1.7110404968261719,0.18275213241577148 +3,refs/heads/master,8bac7e41e6145a0dc0b5e315a5d683f54bb67172,a3ec3110f06cca7c0222f5d29d2d5621ae14baec,8e420a131d6b726abafd703d4fcaf060783f828d,,True,True,f676f5ed2fd008313ad02325bbb63fd2f6fd868d69981e2cc6bedf98036c87a0,Tests_passed,715e2a1c763822ff0a9b88bcac1e5c96208d03328a6d5011538751fce365aa70,Tests_passed,True,True,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,0.01446080207824707,0.04899263381958008,0.04634356498718262,0.04081416130065918,0.04824495315551758,0.061363935470581055,0.04815316200256348,0.1651003360748291,0.014443159103393555,0.18993639945983887,0.18612933158874512,0.10224199295043945,1.7110404968261719,0.18275213241577148 diff --git a/results/combined/merges_timed/schema-repo/schema-repo.csv b/results/combined/merges_timed/schema-repo/schema-repo.csv index 126638f29c..4495c25842 100644 --- a/results/combined/merges_timed/schema-repo/schema-repo.csv +++ b/results/combined/merges_timed/schema-repo/schema-repo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,f85f90da3d8305f4cd40870cf736123b49ae379f,451984af54baee5a10f21aba0da677f9299749fa,c467eb41915fc8ebb794f8121a4b9785f734540d,,5e68d50ebde97a0439a267b07edc8028039372e44e046fdc4c4a40c983237b9c,Tests_passed,fd1c543fa3a9c99cbb59b31c78cff5aa5f2ba22d67d62ce8c7280e981870a0d6,Tests_passed,True,True,True,True,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,f3258e592b9160a3172e0eb2fc4dedea4976ed171a76f97b09416e89e447644b,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,1a599b8e503249fdd9d7c6f5bdf6bc50e399cb8a29bc436a2b1fce225da73cf7,Merge_failed,1a599b8e503249fdd9d7c6f5bdf6bc50e399cb8a29bc436a2b1fce225da73cf7,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,a13f319441127f91d03e922652735a99bc2450ff0758896fe31e3d65e4cc98bd,Merge_failed,c1a31a837ebe49b38ab9d9f84fe6bc0873c91fe15e628031efa21b5e4fa90b37,0.045438528060913086,0.043648719787597656,0.049162864685058594,0.04714703559875488,0.055777788162231445,0.05204367637634277,0.04569721221923828,0.5482721328735352,0.12127351760864258,0.4102180004119873,0.41069960594177246,0.46456432342529297,1.9948866367340088,0.20464205741882324 +2,refs/heads/master,f85f90da3d8305f4cd40870cf736123b49ae379f,451984af54baee5a10f21aba0da677f9299749fa,c467eb41915fc8ebb794f8121a4b9785f734540d,,5e68d50ebde97a0439a267b07edc8028039372e44e046fdc4c4a40c983237b9c,Tests_passed,fd1c543fa3a9c99cbb59b31c78cff5aa5f2ba22d67d62ce8c7280e981870a0d6,Tests_passed,True,True,True,True,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,f3258e592b9160a3172e0eb2fc4dedea4976ed171a76f97b09416e89e447644b,Merge_failed,40510cc432138c16b12d67ecbcd2615a60d96de2f7437fdd325352922f9b021c,Merge_failed,1a599b8e503249fdd9d7c6f5bdf6bc50e399cb8a29bc436a2b1fce225da73cf7,Merge_failed,1a599b8e503249fdd9d7c6f5bdf6bc50e399cb8a29bc436a2b1fce225da73cf7,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,a13f319441127f91d03e922652735a99bc2450ff0758896fe31e3d65e4cc98bd,Merge_failed,c1a31a837ebe49b38ab9d9f84fe6bc0873c91fe15e628031efa21b5e4fa90b37,0.045438528060913086,0.043648719787597656,0.049162864685058594,0.04714703559875488,0.055777788162231445,0.05204367637634277,0.04569721221923828,0.5482721328735352,0.12127351760864258,0.4039649963378906,0.41570615768432617,0.46456432342529297,1.9948866367340088,0.20464205741882324 diff --git a/results/combined/merges_timed/scifio/scifio.csv b/results/combined/merges_timed/scifio/scifio.csv index d1c6877b84..fb55b1ff26 100644 --- a/results/combined/merges_timed/scifio/scifio.csv +++ b/results/combined/merges_timed/scifio/scifio.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/master,057b12613c528cbd789093ae86203d872e38ca2c,07c4c757bb4a396564ae7ebb2a9b0904bdfb5851,26064e23697a0eb96d77439e65ba0c097dfaf2c8,,True,True,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,cbb390cd83fcb1060af352741ec6d6ede6faae13f1dca8e90a7f74845067927a,Tests_passed,True,True,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,0.045686960220336914,0.05408120155334473,0.06567049026489258,0.06084799766540527,0.055480003356933594,0.05959606170654297,0.062175750732421875,0.21261835098266602,0.04521322250366211,0.32971882820129395,0.32909393310546875,0.160416841506958,1.3496289253234863,0.770449161529541 +17,refs/heads/master,057b12613c528cbd789093ae86203d872e38ca2c,07c4c757bb4a396564ae7ebb2a9b0904bdfb5851,26064e23697a0eb96d77439e65ba0c097dfaf2c8,,True,True,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,cbb390cd83fcb1060af352741ec6d6ede6faae13f1dca8e90a7f74845067927a,Tests_passed,True,True,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,0.045686960220336914,0.05408120155334473,0.06567049026489258,0.06084799766540527,0.055480003356933594,0.05959606170654297,0.062175750732421875,0.21261835098266602,0.04521322250366211,0.3280935287475586,0.3304634094238281,0.160416841506958,1.3496289253234863,0.770449161529541 diff --git a/results/combined/merges_timed/scribble/scribble-java.csv b/results/combined/merges_timed/scribble/scribble-java.csv index 02492f253f..e469d136f6 100644 --- a/results/combined/merges_timed/scribble/scribble-java.csv +++ b/results/combined/merges_timed/scribble/scribble-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -125,refs/heads/master,164250d0d03a6cfb879d3ea5c5672bac5b0133ec,ea369a7bd0505034d7ed548fb26eeaeb70198517,2742ef8fd2ec92aa2b7f7a208961892a18ca580c,,True,True,485c573108b2bcaccd8fdc91276e529ebefadd9467142339db70cc76d9c2e48d,Tests_passed,2d15da0a135d5e7e7502878823725924c1aeb4c5f1cee77a2a77fc89a9f2306a,Tests_passed,True,True,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,f3bbc57407e700885f46bad0e7476f67f20990d01be6e22b4131ea8d197558d2,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,dd48a3ecb5a8cd1cc10aab741ce33a62220c2a045c4a72c15b5388e64e2f3c08,Merge_failed,dd48a3ecb5a8cd1cc10aab741ce33a62220c2a045c4a72c15b5388e64e2f3c08,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_failed,f4cc74f404fa51479ac24c7d5fc95a0c87b5944918eb7c9994b944b628db8a4d,0.04323387145996094,0.04462933540344238,0.05592060089111328,0.06535840034484863,0.06730365753173828,0.03790402412414551,0.05307173728942871,0.2932107448577881,0.06349682807922363,0.37142133712768555,0.3751518726348877,0.23778486251831055,2.908494472503662,0.3251955509185791 +125,refs/heads/master,164250d0d03a6cfb879d3ea5c5672bac5b0133ec,ea369a7bd0505034d7ed548fb26eeaeb70198517,2742ef8fd2ec92aa2b7f7a208961892a18ca580c,,True,True,485c573108b2bcaccd8fdc91276e529ebefadd9467142339db70cc76d9c2e48d,Tests_passed,2d15da0a135d5e7e7502878823725924c1aeb4c5f1cee77a2a77fc89a9f2306a,Tests_passed,True,True,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,f3bbc57407e700885f46bad0e7476f67f20990d01be6e22b4131ea8d197558d2,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,dd48a3ecb5a8cd1cc10aab741ce33a62220c2a045c4a72c15b5388e64e2f3c08,Merge_failed,dd48a3ecb5a8cd1cc10aab741ce33a62220c2a045c4a72c15b5388e64e2f3c08,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_failed,f4cc74f404fa51479ac24c7d5fc95a0c87b5944918eb7c9994b944b628db8a4d,0.04323387145996094,0.04462933540344238,0.05592060089111328,0.06535840034484863,0.06730365753173828,0.03790402412414551,0.05307173728942871,0.2932107448577881,0.06349682807922363,0.37036776542663574,0.3680422306060791,0.23778486251831055,2.908494472503662,0.3251955509185791 diff --git a/results/combined/merges_timed/scribejava/scribejava.csv b/results/combined/merges_timed/scribejava/scribejava.csv index 93e52e574d..3d88f43b4e 100644 --- a/results/combined/merges_timed/scribejava/scribejava.csv +++ b/results/combined/merges_timed/scribejava/scribejava.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,Tests_passed,True,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.03954148292541504,0.05458664894104004,0.031190156936645508,0.04810595512390137,0.06870579719543457,0.06032061576843262,0.06110382080078125,0.1753065586090088,0.04774165153503418,0.17472386360168457,0.17846345901489258,0.12111067771911621,1.0731663703918457,0.32602763175964355 +3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,Tests_passed,True,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.03954148292541504,0.05458664894104004,0.031190156936645508,0.04810595512390137,0.06870579719543457,0.06032061576843262,0.06110382080078125,0.1753065586090088,0.04774165153503418,0.1745896339416504,0.17476415634155273,0.12111067771911621,1.0731663703918457,0.32602763175964355 diff --git a/results/combined/merges_timed/sd4324530/fastweixin.csv b/results/combined/merges_timed/sd4324530/fastweixin.csv index 0f6a54e971..ae1c79caf6 100644 --- a/results/combined/merges_timed/sd4324530/fastweixin.csv +++ b/results/combined/merges_timed/sd4324530/fastweixin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -29,refs/heads/master,f4aa5c9e2a5e5009160e2d1062d540641e668ee1,53405b48ba245741340013ef7859304fd8cbdcac,c029ac02521337ef75360e6cd06e8631516b15e1,,True,True,e53d14076a1f9a9cbf5d5b48f6a6124bf7171f48d69bd814edff2905f4ffc858,Tests_passed,db280075ffab9e7baace574aa523c1a00e8973c308285c92b27e3e9bbc4b3024,Tests_passed,True,True,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,cd19c4969753ca2a256b10c95e51e9c470489fc3153a3fa6bbbe6b86277136ff,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,584c277582e8f4365e8e315e5b4d08a9f774b199b4672fd6b117fa95bc425120,Merge_failed,584c277582e8f4365e8e315e5b4d08a9f774b199b4672fd6b117fa95bc425120,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,6faa722c2e30b94a412009243385713eb393e883730961dac1655c3bcbfa0ea0,0.03698539733886719,0.04671454429626465,0.05628323554992676,0.03951740264892578,0.03972887992858887,0.055013179779052734,0.02562260627746582,0.29799938201904297,0.05928301811218262,0.3574192523956299,0.3563086986541748,0.24357271194458008,1.7471787929534912,0.24844622611999512 +29,refs/heads/master,f4aa5c9e2a5e5009160e2d1062d540641e668ee1,53405b48ba245741340013ef7859304fd8cbdcac,c029ac02521337ef75360e6cd06e8631516b15e1,,True,True,e53d14076a1f9a9cbf5d5b48f6a6124bf7171f48d69bd814edff2905f4ffc858,Tests_passed,db280075ffab9e7baace574aa523c1a00e8973c308285c92b27e3e9bbc4b3024,Tests_passed,True,True,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,cd19c4969753ca2a256b10c95e51e9c470489fc3153a3fa6bbbe6b86277136ff,Merge_failed,990408d66c6017fd4b96cbcaa4d0cc9cd3bd2abd7b79114f5e2918e75a99415a,Merge_failed,584c277582e8f4365e8e315e5b4d08a9f774b199b4672fd6b117fa95bc425120,Merge_failed,584c277582e8f4365e8e315e5b4d08a9f774b199b4672fd6b117fa95bc425120,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,6faa722c2e30b94a412009243385713eb393e883730961dac1655c3bcbfa0ea0,0.03698539733886719,0.04671454429626465,0.05628323554992676,0.03951740264892578,0.03972887992858887,0.055013179779052734,0.02562260627746582,0.29799938201904297,0.05928301811218262,0.3578755855560303,0.3562660217285156,0.24357271194458008,1.7471787929534912,0.24844622611999512 diff --git a/results/combined/merges_timed/sdllanguagetechnologies/testy.csv b/results/combined/merges_timed/sdllanguagetechnologies/testy.csv index 13353c459e..1375beaf62 100644 --- a/results/combined/merges_timed/sdllanguagetechnologies/testy.csv +++ b/results/combined/merges_timed/sdllanguagetechnologies/testy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -101,refs/heads/master,0bf477ccc77a6520539fe7e11709e07be71f85ae,1d0cfa99fb9f6603805e823f19d5b92bed401406,929cf45ec065c4cc0fa4ff743ff74c29a779d253,,True,True,a840952329a3c1687284edc4df81aaa85b2898329208ac0d7083c27078709552,Tests_passed,5a8e4d345c41403be5c479598c4e8a3cdbc62d17ea753b6c7c495ff082dd4019,Tests_passed,True,True,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,c07575d8c19e77706f8d026f4727b323f4e1587412bbb4f4ee9b7118fe08dabd,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,0.03060436248779297,0.05168795585632324,0.0533297061920166,0.036672353744506836,0.012773513793945312,0.04325389862060547,0.012861490249633789,0.09770464897155762,0.046292781829833984,0.23421430587768555,0.21411466598510742,0.06959891319274902,1.1076595783233643,0.39257240295410156 +101,refs/heads/master,0bf477ccc77a6520539fe7e11709e07be71f85ae,1d0cfa99fb9f6603805e823f19d5b92bed401406,929cf45ec065c4cc0fa4ff743ff74c29a779d253,,True,True,a840952329a3c1687284edc4df81aaa85b2898329208ac0d7083c27078709552,Tests_passed,5a8e4d345c41403be5c479598c4e8a3cdbc62d17ea753b6c7c495ff082dd4019,Tests_passed,True,True,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,c07575d8c19e77706f8d026f4727b323f4e1587412bbb4f4ee9b7118fe08dabd,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,0.03060436248779297,0.05168795585632324,0.0533297061920166,0.036672353744506836,0.012773513793945312,0.04325389862060547,0.012861490249633789,0.09770464897155762,0.046292781829833984,0.2302086353302002,0.23149561882019043,0.06959891319274902,1.1076595783233643,0.39257240295410156 diff --git a/results/combined/merges_timed/seam/render.csv b/results/combined/merges_timed/seam/render.csv index 7c08e8974e..8cd5136b29 100644 --- a/results/combined/merges_timed/seam/render.csv +++ b/results/combined/merges_timed/seam/render.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,5371832457e9d1037dba8e7091513b6521e5af80,14a752b7aeb92757324cda24a10eaf88a3eaab52,b380fe528888dfd752a4d43dc90aee4c781ff821,,d16a0cbc2642704a82f1ac17db759746c6ceae3ed6b96761c4b77e1224065d19,Tests_passed,61819922851f7332362555523491387f3fee5afda86330e9149acc9dde441a26,Tests_passed,True,True,True,True,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,48b9e50ac05d7c76a60d931f7af4a99af06ab7bcf7d3a1b52de87e51fd01fe2c,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,052ad25cdefd4358c2585eddb1eaf356f203c5763ddcbf6c38932f078f4b3b65,Merge_failed,c52674006ed361c38eb480715dd90f7661df22ad0aedcc13acbcfbab02185630,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,45881c7819193197adc2271cd4dfc31e3f413996e9b7335cc05ff5acc8a694c6,Merge_failed,ca3a7dd97512c984c42e480ee28a410fa459cd2c2270a3d5b24f9dc8d4e48ad6,0.010184049606323242,0.010345220565795898,0.010647058486938477,0.01052713394165039,0.010709047317504883,0.010600090026855469,0.010545015335083008,0.059484004974365234,0.016962051391601562,0.20285391807556152,0.20357918739318848,0.18144440650939941,0.9451065063476562,0.1813347339630127 +1,refs/heads/master,5371832457e9d1037dba8e7091513b6521e5af80,14a752b7aeb92757324cda24a10eaf88a3eaab52,b380fe528888dfd752a4d43dc90aee4c781ff821,,d16a0cbc2642704a82f1ac17db759746c6ceae3ed6b96761c4b77e1224065d19,Tests_passed,61819922851f7332362555523491387f3fee5afda86330e9149acc9dde441a26,Tests_passed,True,True,True,True,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,48b9e50ac05d7c76a60d931f7af4a99af06ab7bcf7d3a1b52de87e51fd01fe2c,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,052ad25cdefd4358c2585eddb1eaf356f203c5763ddcbf6c38932f078f4b3b65,Merge_failed,c52674006ed361c38eb480715dd90f7661df22ad0aedcc13acbcfbab02185630,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,45881c7819193197adc2271cd4dfc31e3f413996e9b7335cc05ff5acc8a694c6,Merge_failed,ca3a7dd97512c984c42e480ee28a410fa459cd2c2270a3d5b24f9dc8d4e48ad6,0.010184049606323242,0.010345220565795898,0.010647058486938477,0.01052713394165039,0.010709047317504883,0.010600090026855469,0.010545015335083008,0.059484004974365234,0.016962051391601562,0.20190095901489258,0.20276689529418945,0.18144440650939941,0.9451065063476562,0.1813347339630127 diff --git a/results/combined/merges_timed/seanchenxi/gwt-storage.csv b/results/combined/merges_timed/seanchenxi/gwt-storage.csv index 79b4f6a8b7..5782a7ec75 100644 --- a/results/combined/merges_timed/seanchenxi/gwt-storage.csv +++ b/results/combined/merges_timed/seanchenxi/gwt-storage.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,8ce0dc7d7973f330a05563badf54037c90cd129b,87b4707591b8e61609aa40f3a8c37568e3702e9a,f0e679c108f9bdb7a7246cc863643addcf8b5cb1,,True,True,af5b7be2994a633165dfc66399ac5c1122f6215e48952a588dcb6740e51d0649,Tests_passed,fc2f89a04c8ba091c36031fd343f329711d660cdab05ff819a434ea90bf74cd8,Tests_passed,True,True,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,33bb3fc4e3a3a116deea27a75b51646c19ef746688258d200c94fe52492e1518,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,b819c2457d494b2a0184f5d0ca9988f871848e2031740ef7c4f5cf369f046533,0.04510641098022461,0.04225778579711914,0.039565086364746094,0.0367279052734375,0.043144941329956055,0.04473876953125,0.03986501693725586,0.19292354583740234,0.06819558143615723,0.3060007095336914,0.3067355155944824,0.14043855667114258,1.0975100994110107,0.2177104949951172 +8,refs/heads/master,8ce0dc7d7973f330a05563badf54037c90cd129b,87b4707591b8e61609aa40f3a8c37568e3702e9a,f0e679c108f9bdb7a7246cc863643addcf8b5cb1,,True,True,af5b7be2994a633165dfc66399ac5c1122f6215e48952a588dcb6740e51d0649,Tests_passed,fc2f89a04c8ba091c36031fd343f329711d660cdab05ff819a434ea90bf74cd8,Tests_passed,True,True,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Merge_failed,33bb3fc4e3a3a116deea27a75b51646c19ef746688258d200c94fe52492e1518,Merge_failed,9a6fd6c27108727446f708b7c85437e9514a39669426df2c62cb0a3c0ffe62a2,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,b819c2457d494b2a0184f5d0ca9988f871848e2031740ef7c4f5cf369f046533,0.04510641098022461,0.04225778579711914,0.039565086364746094,0.0367279052734375,0.043144941329956055,0.04473876953125,0.03986501693725586,0.19292354583740234,0.06819558143615723,0.30657076835632324,0.30301976203918457,0.14043855667114258,1.0975100994110107,0.2177104949951172 diff --git a/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv b/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv index 2ae686592d..78cb3238b1 100644 --- a/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv +++ b/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -40,refs/heads/wicket9.x,d26c29217ed316b58ca7daf26f949caf2866b578,b0a253173342389021a5f41925b61d4041691969,bac2626a365dc38f92e188334fbe1f1aeb4096f7,,True,True,547f624da3a4b80f1ccb4b18cf1ad03cc2c98365c48c91e040c364cdc8f4695e,Tests_passed,cc783846d9edca551d7b4de62438e1bdb551221f12a4ce02c7b503dd44deee51,Tests_passed,True,True,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,a71620fe547792b38b3dde875db365a1b2080979b14b21c68b4db431ce05f68d,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,96a5ff05c3c683f7b06592c84615ff73f51ce3a2db639cc1cc49e11f43dc6b2d,Merge_failed,96a5ff05c3c683f7b06592c84615ff73f51ce3a2db639cc1cc49e11f43dc6b2d,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Merge_failed,f541d2834cc3056b9c8d5311a20fd66632b9e1cc9c2a73a5b0f649938ed42fc9,0.02611565589904785,0.016202449798583984,0.018110275268554688,0.017938852310180664,0.018146991729736328,0.01820230484008789,0.01785588264465332,0.08224749565124512,0.04379415512084961,0.2075333595275879,0.2090005874633789,0.12966394424438477,1.2912404537200928,0.3609015941619873 +40,refs/heads/wicket9.x,d26c29217ed316b58ca7daf26f949caf2866b578,b0a253173342389021a5f41925b61d4041691969,bac2626a365dc38f92e188334fbe1f1aeb4096f7,,True,True,547f624da3a4b80f1ccb4b18cf1ad03cc2c98365c48c91e040c364cdc8f4695e,Tests_passed,cc783846d9edca551d7b4de62438e1bdb551221f12a4ce02c7b503dd44deee51,Tests_passed,True,True,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,a71620fe547792b38b3dde875db365a1b2080979b14b21c68b4db431ce05f68d,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,96a5ff05c3c683f7b06592c84615ff73f51ce3a2db639cc1cc49e11f43dc6b2d,Merge_failed,96a5ff05c3c683f7b06592c84615ff73f51ce3a2db639cc1cc49e11f43dc6b2d,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Merge_failed,f541d2834cc3056b9c8d5311a20fd66632b9e1cc9c2a73a5b0f649938ed42fc9,0.02611565589904785,0.016202449798583984,0.018110275268554688,0.017938852310180664,0.018146991729736328,0.01820230484008789,0.01785588264465332,0.08224749565124512,0.04379415512084961,0.2094564437866211,0.20730805397033691,0.12966394424438477,1.2912404537200928,0.3609015941619873 diff --git a/results/combined/merges_timed/seedboxer/seedboxer.csv b/results/combined/merges_timed/seedboxer/seedboxer.csv index b9dbd0bcde..83a33ac723 100644 --- a/results/combined/merges_timed/seedboxer/seedboxer.csv +++ b/results/combined/merges_timed/seedboxer/seedboxer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,0076809898ee1ef1330ce41242de492d4d0a6de2,b511ab595ccc81bed5d9daf8ce078e5ce56aa1c4,dbf23fc6adbc1bc80e104b619f9c62ff4688ab8d,,True,True,4b2bde9116dd403a8a389bf6734e535cfeafa29dfa704ee37ad948923d074de9,Tests_passed,d6a7aaa7ce3dfc87e29c2a916469d0a1ec7d18850070fc139bc6e5fde91de778,Tests_passed,True,True,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,0.03856968879699707,0.04642915725708008,0.0518336296081543,0.038854122161865234,0.04487299919128418,0.040398359298706055,0.048494815826416016,0.16422486305236816,0.04127049446105957,0.15174531936645508,0.14899206161499023,0.11340689659118652,0.4973893165588379,0.21881675720214844 +10,refs/heads/master,0076809898ee1ef1330ce41242de492d4d0a6de2,b511ab595ccc81bed5d9daf8ce078e5ce56aa1c4,dbf23fc6adbc1bc80e104b619f9c62ff4688ab8d,,True,True,4b2bde9116dd403a8a389bf6734e535cfeafa29dfa704ee37ad948923d074de9,Tests_passed,d6a7aaa7ce3dfc87e29c2a916469d0a1ec7d18850070fc139bc6e5fde91de778,Tests_passed,True,True,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,0.03856968879699707,0.04642915725708008,0.0518336296081543,0.038854122161865234,0.04487299919128418,0.040398359298706055,0.048494815826416016,0.16422486305236816,0.04127049446105957,0.1491255760192871,0.1501476764678955,0.11340689659118652,0.4973893165588379,0.21881675720214844 diff --git a/results/combined/merges_timed/segmentio/analytics-java.csv b/results/combined/merges_timed/segmentio/analytics-java.csv index 5ebb99b44f..2cce2f1a9c 100644 --- a/results/combined/merges_timed/segmentio/analytics-java.csv +++ b/results/combined/merges_timed/segmentio/analytics-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -114,refs/heads/master,b5a96236e473740ea83e5d1ab0548deea21a5656,8b7b1ee33b59215e43ce3ef57e6f9d8105b6f19b,c5dc0a20654e46d2b401726ee65d3f846a1ff9cd,,True,True,da4e67631ea3ecd978882cd78108232eea8d19af4c470cb7ab8459b99230408c,Tests_passed,e906cd0c296941b996871513f4fec5d9b76d7e58f3bd99d8ecc519b57fffc139,Tests_passed,True,True,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,9f28ec8984f596114700aea8792851914c9c0e89ece70bb6ccb22a808e778e7f,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,61a1d306a43c1bc70d02c5da36a79f005d22c43fd095cef91adfdd492dcc2ee6,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,52eae83a36e79f019592d0d2e39b834f3976c1ef6956e2eb171047f3a4cafdcb,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,0f66aa8b47b7aaea049b93688659f0b00d413b8df0c512c6f6324db8446f5911,Merge_failed,0f66aa8b47b7aaea049b93688659f0b00d413b8df0c512c6f6324db8446f5911,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,1268617b4876dbfac9e8eb0fc097fa78249233bf0189e759e21218cefd9d904a,0.04375863075256348,0.0443568229675293,0.03990340232849121,0.04166436195373535,0.050798654556274414,0.04447317123413086,0.049394845962524414,0.15560483932495117,0.09905719757080078,0.37772703170776367,0.3950347900390625,0.17710614204406738,1.9982876777648926,0.21920466423034668 +114,refs/heads/master,b5a96236e473740ea83e5d1ab0548deea21a5656,8b7b1ee33b59215e43ce3ef57e6f9d8105b6f19b,c5dc0a20654e46d2b401726ee65d3f846a1ff9cd,,True,True,da4e67631ea3ecd978882cd78108232eea8d19af4c470cb7ab8459b99230408c,Tests_passed,e906cd0c296941b996871513f4fec5d9b76d7e58f3bd99d8ecc519b57fffc139,Tests_passed,True,True,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,9f28ec8984f596114700aea8792851914c9c0e89ece70bb6ccb22a808e778e7f,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,61a1d306a43c1bc70d02c5da36a79f005d22c43fd095cef91adfdd492dcc2ee6,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,52eae83a36e79f019592d0d2e39b834f3976c1ef6956e2eb171047f3a4cafdcb,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,0f66aa8b47b7aaea049b93688659f0b00d413b8df0c512c6f6324db8446f5911,Merge_failed,0f66aa8b47b7aaea049b93688659f0b00d413b8df0c512c6f6324db8446f5911,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,1268617b4876dbfac9e8eb0fc097fa78249233bf0189e759e21218cefd9d904a,0.04375863075256348,0.0443568229675293,0.03990340232849121,0.04166436195373535,0.050798654556274414,0.04447317123413086,0.049394845962524414,0.15560483932495117,0.09905719757080078,0.37474966049194336,0.3776726722717285,0.17710614204406738,1.9982876777648926,0.21920466423034668 diff --git a/results/combined/merges_timed/semanticvectors/semanticvectors.csv b/results/combined/merges_timed/semanticvectors/semanticvectors.csv index 5811d6c1a0..b4bbdc0ed4 100644 --- a/results/combined/merges_timed/semanticvectors/semanticvectors.csv +++ b/results/combined/merges_timed/semanticvectors/semanticvectors.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,58058d15d12a3b15eec26e609c5f656f5d301e85,73590b42957e7f7f81c31238e01641121fe14060,f5f7370a488ffa4a1ac597cf0dc773b507923662,,75366712fad34f36ac5538c8ab1608ab52beba580beb4c1e14bf6bc96fcf8454,Tests_passed,eed294b4ad78a10cfa60efdfa14ec8b15209ed846077b530e65baf6955e6abbc,Tests_passed,True,True,True,True,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,0.025330305099487305,0.025463581085205078,0.03290414810180664,0.03425741195678711,0.03354215621948242,0.03334546089172363,0.0333404541015625,0.06694221496582031,0.02549004554748535,0.19328761100769043,0.19530296325683594,0.08181262016296387,1.3818466663360596,0.19449615478515625 +1,refs/heads/master,58058d15d12a3b15eec26e609c5f656f5d301e85,73590b42957e7f7f81c31238e01641121fe14060,f5f7370a488ffa4a1ac597cf0dc773b507923662,,75366712fad34f36ac5538c8ab1608ab52beba580beb4c1e14bf6bc96fcf8454,Tests_passed,eed294b4ad78a10cfa60efdfa14ec8b15209ed846077b530e65baf6955e6abbc,Tests_passed,True,True,True,True,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,0.025330305099487305,0.025463581085205078,0.03290414810180664,0.03425741195678711,0.03354215621948242,0.03334546089172363,0.0333404541015625,0.06694221496582031,0.02549004554748535,0.1958017349243164,0.19542717933654785,0.08181262016296387,1.3818466663360596,0.19449615478515625 diff --git a/results/combined/merges_timed/sexyideas/moosificator.csv b/results/combined/merges_timed/sexyideas/moosificator.csv index 49680fc20a..1cfaf98964 100644 --- a/results/combined/merges_timed/sexyideas/moosificator.csv +++ b/results/combined/merges_timed/sexyideas/moosificator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/master,51490f87bbf813d01164e101fd6cd32ec4a21596,a662006ee08d1fd941f2ae7eab1812acedf6f232,6b6a2301e40919efa350a5d9f5f2632e85f9393f,,True,True,42e4d036a6e455454b2015304a532ad0b31c348d59b8353a80c96391841fb2df,Tests_passed,d865536fe26ff93df8cb6861c8a2f8f6f42db0d3ef81c10a2e1c70dd2d5bb33e,Tests_passed,True,True,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,0.024816274642944336,0.02511000633239746,0.033158063888549805,0.033293724060058594,0.033238887786865234,0.03332853317260742,0.033098459243774414,0.06605696678161621,0.02512812614440918,0.1710050106048584,0.1718752384185791,0.0801999568939209,0.8998317718505859,0.1714320182800293 +17,refs/heads/master,51490f87bbf813d01164e101fd6cd32ec4a21596,a662006ee08d1fd941f2ae7eab1812acedf6f232,6b6a2301e40919efa350a5d9f5f2632e85f9393f,,True,True,42e4d036a6e455454b2015304a532ad0b31c348d59b8353a80c96391841fb2df,Tests_passed,d865536fe26ff93df8cb6861c8a2f8f6f42db0d3ef81c10a2e1c70dd2d5bb33e,Tests_passed,True,True,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,0.024816274642944336,0.02511000633239746,0.033158063888549805,0.033293724060058594,0.033238887786865234,0.03332853317260742,0.033098459243774414,0.06605696678161621,0.02512812614440918,0.17024922370910645,0.17133593559265137,0.0801999568939209,0.8998317718505859,0.1714320182800293 diff --git a/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv b/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv index d79adae601..82398e5fef 100644 --- a/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv +++ b/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,e398d0480f4f1fabbebfdbec5990cdee3303866a,55e5a5540aa2b35578bd70272c329b9c978a5aae,ce8b6a104566423401985a00c7041961ca9f0dcd,,True,True,efad14fdcecb1e4a104275a4a1035afd319eee8590b6c6e04295cc80af0d6a11,Tests_passed,bbd3dc0356dcf23a2f909ea69509ad62a83a1a1c9671c60fb312bdb28fad1ca0,Tests_passed,True,True,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,577b0005227e78aa5baeee384586ff5e450bbbabe9d4a4c3b8ba857fe75479d9,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,88ddee3ae0de5382e12c23512b4d35bd84656c2032380707bca310a57d9b75a2,Merge_failed,88ddee3ae0de5382e12c23512b4d35bd84656c2032380707bca310a57d9b75a2,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Merge_failed,805b6a08438444f1ffa4f7bba6cfe1d1ab63a2937c879098260fb32595b4d424,0.04803776741027832,0.0465397834777832,0.047884464263916016,0.04525446891784668,0.03565835952758789,0.06402182579040527,0.041419267654418945,0.479264497756958,0.06845283508300781,0.6221258640289307,0.6288528442382812,0.39775705337524414,3.594984292984009,0.1983475685119629 +3,refs/heads/master,e398d0480f4f1fabbebfdbec5990cdee3303866a,55e5a5540aa2b35578bd70272c329b9c978a5aae,ce8b6a104566423401985a00c7041961ca9f0dcd,,True,True,efad14fdcecb1e4a104275a4a1035afd319eee8590b6c6e04295cc80af0d6a11,Tests_passed,bbd3dc0356dcf23a2f909ea69509ad62a83a1a1c9671c60fb312bdb28fad1ca0,Tests_passed,True,True,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,577b0005227e78aa5baeee384586ff5e450bbbabe9d4a4c3b8ba857fe75479d9,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,88ddee3ae0de5382e12c23512b4d35bd84656c2032380707bca310a57d9b75a2,Merge_failed,88ddee3ae0de5382e12c23512b4d35bd84656c2032380707bca310a57d9b75a2,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Merge_failed,805b6a08438444f1ffa4f7bba6cfe1d1ab63a2937c879098260fb32595b4d424,0.04803776741027832,0.0465397834777832,0.047884464263916016,0.04525446891784668,0.03565835952758789,0.06402182579040527,0.041419267654418945,0.479264497756958,0.06845283508300781,0.6098871231079102,0.6109204292297363,0.39775705337524414,3.594984292984009,0.1983475685119629 diff --git a/results/combined/merges_timed/shazam/shazamcrest.csv b/results/combined/merges_timed/shazam/shazamcrest.csv index 50450743db..2e369eca49 100644 --- a/results/combined/merges_timed/shazam/shazamcrest.csv +++ b/results/combined/merges_timed/shazam/shazamcrest.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,9be9807f1cf79c5a11d69fde25afc99f3fb2f40c,c4fa05990bece3e3ead865e456dd2cfd3fb345d3,fa139e6f61d0cf631855edc581afb7afd724aa8a,,871b1e77e5a4f82e1512f575042d7d5ddd28ff65efdb7c092e6e4a3aa6515604,Tests_passed,981bdbd883d0d232276f0b421b5a5776f0f6bd73038539a46610bec2d88d1e79,Tests_passed,True,True,True,True,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_failed,563e66d38801ffa2244dbcffac293774cf0e0cf484b6fea76e249472fdd53438,Tests_failed,563e66d38801ffa2244dbcffac293774cf0e0cf484b6fea76e249472fdd53438,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,0.04093050956726074,0.04181098937988281,0.04340720176696777,0.050935983657836914,0.047173261642456055,0.05077362060546875,0.04831814765930176,0.17142391204833984,0.04052448272705078,0.16446638107299805,0.16373848915100098,0.11551952362060547,0.8054537773132324,0.1926577091217041 +5,refs/heads/master,9be9807f1cf79c5a11d69fde25afc99f3fb2f40c,c4fa05990bece3e3ead865e456dd2cfd3fb345d3,fa139e6f61d0cf631855edc581afb7afd724aa8a,,871b1e77e5a4f82e1512f575042d7d5ddd28ff65efdb7c092e6e4a3aa6515604,Tests_passed,981bdbd883d0d232276f0b421b5a5776f0f6bd73038539a46610bec2d88d1e79,Tests_passed,True,True,True,True,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_failed,563e66d38801ffa2244dbcffac293774cf0e0cf484b6fea76e249472fdd53438,Tests_failed,563e66d38801ffa2244dbcffac293774cf0e0cf484b6fea76e249472fdd53438,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,0.04093050956726074,0.04181098937988281,0.04340720176696777,0.050935983657836914,0.047173261642456055,0.05077362060546875,0.04831814765930176,0.17142391204833984,0.04052448272705078,0.16287875175476074,0.1620194911956787,0.11551952362060547,0.8054537773132324,0.1926577091217041 diff --git a/results/combined/merges_timed/shhs-coding-club/drugwars.csv b/results/combined/merges_timed/shhs-coding-club/drugwars.csv index 71058e830a..e5c577cdf6 100644 --- a/results/combined/merges_timed/shhs-coding-club/drugwars.csv +++ b/results/combined/merges_timed/shhs-coding-club/drugwars.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/heads/master,f07c4b5d24a5a246a9de55940bb80151684c64ea,b8eb50bedfdf55ec6b51691779e564b80fd60799,c5e4ce34f82b7ce324f28144dd63d4f2480ee1fc,,True,True,fdb5f107f879b7555c9c649995501707e845377ae68221f5ad5c5abf9842eaad,Tests_passed,15e928c0cb5581dd85d110f3ac905ccf0d68d81917a73e963c36c1905ce41329,Tests_passed,True,True,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,9f7d75e2c1feb12dc19c6cb5242f068aeda736efba75150e2a311f823bdfc354,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,9f7d75e2c1feb12dc19c6cb5242f068aeda736efba75150e2a311f823bdfc354,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,a46621c373751c5b9cc963a566749fa78de759f0ae543128dae19d4b6e659161,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,a0cd09948b8189978a730ec400c43a30088dad7030b7028a807c992079818e2e,Merge_failed,a0cd09948b8189978a730ec400c43a30088dad7030b7028a807c992079818e2e,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,c28f5139bab47198f554d98887585c1d56efc549ffe25da7129051a984b0c252,0.034474849700927734,0.0351715087890625,0.036629676818847656,0.03506183624267578,0.03618907928466797,0.03722262382507324,0.0374755859375,0.2816050052642822,0.06585144996643066,0.3995175361633301,0.39899158477783203,0.2166118621826172,1.4728028774261475,0.18962574005126953 +19,refs/heads/master,f07c4b5d24a5a246a9de55940bb80151684c64ea,b8eb50bedfdf55ec6b51691779e564b80fd60799,c5e4ce34f82b7ce324f28144dd63d4f2480ee1fc,,True,True,fdb5f107f879b7555c9c649995501707e845377ae68221f5ad5c5abf9842eaad,Tests_passed,15e928c0cb5581dd85d110f3ac905ccf0d68d81917a73e963c36c1905ce41329,Tests_passed,True,True,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,9f7d75e2c1feb12dc19c6cb5242f068aeda736efba75150e2a311f823bdfc354,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,9f7d75e2c1feb12dc19c6cb5242f068aeda736efba75150e2a311f823bdfc354,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,a46621c373751c5b9cc963a566749fa78de759f0ae543128dae19d4b6e659161,Merge_failed,ece712770648966f4d15c299485ef9bbd91b7f0f0d482f0b1fa0831f86668e80,Merge_failed,a0cd09948b8189978a730ec400c43a30088dad7030b7028a807c992079818e2e,Merge_failed,a0cd09948b8189978a730ec400c43a30088dad7030b7028a807c992079818e2e,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,c28f5139bab47198f554d98887585c1d56efc549ffe25da7129051a984b0c252,0.034474849700927734,0.0351715087890625,0.036629676818847656,0.03506183624267578,0.03618907928466797,0.03722262382507324,0.0374755859375,0.2816050052642822,0.06585144996643066,0.3993246555328369,0.4008467197418213,0.2166118621826172,1.4728028774261475,0.18962574005126953 diff --git a/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv b/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv index 6c1bae6c19..8eb348ee4a 100644 --- a/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv +++ b/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,1bec64a7690dee7f6fb602f4d81137e45f9a419a,76c2031d5aaa0b245efdaa7addda008b2cfc2292,4a12f402b921fef6c1af92b29ae26e8ccd6409a9,,True,True,d1cf6c3a02e28773666284e44cf2e36148791c486dc0c7d608776586ac4829b6,Tests_passed,3bde474f695068c743ed1256f637c5abd849f3b04092a69b40a3fc031ad493ff,Tests_passed,True,True,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,7b9a0f59f2a208f3c3bdcccc3d0714ad4ec1b044e0336d736bbe6f36fca66e77,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,7b7f184f0e12780797f3a11b678db01b85d1e4a7a4ea23b9eb6f2deea33c1fd7,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,0.03922295570373535,0.038866281509399414,0.03798699378967285,0.02372145652770996,0.016871929168701172,0.03718304634094238,0.04098176956176758,0.21569323539733887,0.06259560585021973,0.14928483963012695,0.1494920253753662,0.16754460334777832,0.6607444286346436,0.1911454200744629 +2,refs/heads/master,1bec64a7690dee7f6fb602f4d81137e45f9a419a,76c2031d5aaa0b245efdaa7addda008b2cfc2292,4a12f402b921fef6c1af92b29ae26e8ccd6409a9,,True,True,d1cf6c3a02e28773666284e44cf2e36148791c486dc0c7d608776586ac4829b6,Tests_passed,3bde474f695068c743ed1256f637c5abd849f3b04092a69b40a3fc031ad493ff,Tests_passed,True,True,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,7b9a0f59f2a208f3c3bdcccc3d0714ad4ec1b044e0336d736bbe6f36fca66e77,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,7b7f184f0e12780797f3a11b678db01b85d1e4a7a4ea23b9eb6f2deea33c1fd7,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,0.03922295570373535,0.038866281509399414,0.03798699378967285,0.02372145652770996,0.016871929168701172,0.03718304634094238,0.04098176956176758,0.21569323539733887,0.06259560585021973,0.14915204048156738,0.147904634475708,0.16754460334777832,0.6607444286346436,0.1911454200744629 diff --git a/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv b/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv index 50ec5c1bf0..ae8ddbe032 100644 --- a/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv +++ b/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/main,50ecad795f23f1441823702df26fbe09f8c1add7,e0a1b61381f2f276974e534c54154c0ecd26d15c,6d6c78728d772176067e479445d86c8036928e95,,True,True,75576ca2229e0eda424168ae538fd25043f443ed8053407a217c5af63b2e5a4d,Tests_passed,f51524fa51d1546c5cd6e11ad45aca3a5520dcdb06cd0c9aed79c14e07956232,Tests_passed,True,True,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,72eab868eba9b44cb2c5a053d69ed7e5a2b7fe54fa3dd36bd222af37ca24d836,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,24a62b0b52c7d7d79e62bfec268910aab973faf7e8d05354d1a99b202dc0b615,Merge_failed,24a62b0b52c7d7d79e62bfec268910aab973faf7e8d05354d1a99b202dc0b615,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_failed,7cbc8781b6466df9abe10143587b8ca81f79db9757896dc33b06d7289250aa4a,0.05871248245239258,0.0506443977355957,0.06371355056762695,0.06975030899047852,0.07283139228820801,0.06819915771484375,0.05322694778442383,0.37462592124938965,0.28684496879577637,0.08057618141174316,0.08120369911193848,0.12846994400024414,1.1160502433776855,0.8740432262420654 +2,refs/heads/main,50ecad795f23f1441823702df26fbe09f8c1add7,e0a1b61381f2f276974e534c54154c0ecd26d15c,6d6c78728d772176067e479445d86c8036928e95,,True,True,75576ca2229e0eda424168ae538fd25043f443ed8053407a217c5af63b2e5a4d,Tests_passed,f51524fa51d1546c5cd6e11ad45aca3a5520dcdb06cd0c9aed79c14e07956232,Tests_passed,True,True,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,72eab868eba9b44cb2c5a053d69ed7e5a2b7fe54fa3dd36bd222af37ca24d836,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,24a62b0b52c7d7d79e62bfec268910aab973faf7e8d05354d1a99b202dc0b615,Merge_failed,24a62b0b52c7d7d79e62bfec268910aab973faf7e8d05354d1a99b202dc0b615,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_failed,7cbc8781b6466df9abe10143587b8ca81f79db9757896dc33b06d7289250aa4a,0.05871248245239258,0.0506443977355957,0.06371355056762695,0.06975030899047852,0.07283139228820801,0.06819915771484375,0.05322694778442383,0.37462592124938965,0.28684496879577637,0.07180237770080566,0.08153057098388672,0.12846994400024414,1.1160502433776855,0.8740432262420654 diff --git a/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv b/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv index ae9fbb3daa..73c626c18e 100644 --- a/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv +++ b/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,397e23f5f00948ceb35a9ab4cccdd34ff9543f01,911a3f7b5dd59a6aa1461b862ea42f5bcdb232d3,007abfe5eea0e36631d43093a83e58506b181921,,True,True,a7236748e684460349469fb9eeb09ea553e940206890ddfa0632bc0d54fd75b1,Tests_passed,3b4095e53f2aba162d6420ca26749f10c40d1f7827f2adfb0841b384db6d4c1b,Tests_passed,True,True,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,f69abb0af99933d9aff2cee99e1cc9605114cbf750710b3645a5c220f9c2bf63,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,0c05e911e8ca106fe5da076d4f3ef8f6207b754f33630cbc45be2fee523d4014,Merge_failed,0c05e911e8ca106fe5da076d4f3ef8f6207b754f33630cbc45be2fee523d4014,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,f9a38a6e7121bc9be8023d1fc0ecc68f1deb15c17afd902a23e3ddff6fcb1349,Merge_failed,ee6be996eb565776150070f34ad39e9339c33a0d00a8ea6466d828aba19f9559,0.06412935256958008,0.0642547607421875,0.07767677307128906,0.0777435302734375,0.07806968688964844,0.011252880096435547,0.0782012939453125,0.14611363410949707,0.08110857009887695,0.34205055236816406,0.34620094299316406,0.28690481185913086,1.8885271549224854,0.24101781845092773 +8,refs/heads/master,397e23f5f00948ceb35a9ab4cccdd34ff9543f01,911a3f7b5dd59a6aa1461b862ea42f5bcdb232d3,007abfe5eea0e36631d43093a83e58506b181921,,True,True,a7236748e684460349469fb9eeb09ea553e940206890ddfa0632bc0d54fd75b1,Tests_passed,3b4095e53f2aba162d6420ca26749f10c40d1f7827f2adfb0841b384db6d4c1b,Tests_passed,True,True,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,f69abb0af99933d9aff2cee99e1cc9605114cbf750710b3645a5c220f9c2bf63,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,0c05e911e8ca106fe5da076d4f3ef8f6207b754f33630cbc45be2fee523d4014,Merge_failed,0c05e911e8ca106fe5da076d4f3ef8f6207b754f33630cbc45be2fee523d4014,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,f9a38a6e7121bc9be8023d1fc0ecc68f1deb15c17afd902a23e3ddff6fcb1349,Merge_failed,ee6be996eb565776150070f34ad39e9339c33a0d00a8ea6466d828aba19f9559,0.06412935256958008,0.0642547607421875,0.07767677307128906,0.0777435302734375,0.07806968688964844,0.011252880096435547,0.0782012939453125,0.14611363410949707,0.08110857009887695,0.3424050807952881,0.3326232433319092,0.28690481185913086,1.8885271549224854,0.24101781845092773 diff --git a/results/combined/merges_timed/silverpop/engage-api-client.csv b/results/combined/merges_timed/silverpop/engage-api-client.csv index b1d4c5ac4b..4c77e22e59 100644 --- a/results/combined/merges_timed/silverpop/engage-api-client.csv +++ b/results/combined/merges_timed/silverpop/engage-api-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,0c3e3e535b5514a92bd19280f2ce4bcde989ad23,c534abe100affbf873e577db76543f6a44c02a8a,1c532fc7d21e4a4a5ce3fb120ba7114626a02739,,True,True,10b3da864cdc0fcf0ceccbad7aa306cda1dc4e9c1608c52157660f71927f5377,Tests_passed,5a66e59d1d9995a540ff79fdddd6a68ce9906e2df384a829e4583a4994fac446,Tests_passed,True,True,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_failed,3549fec1c0e349f9f1bacb1a5337fb14451228ec7912d94acca8160dd008477c,Tests_failed,3549fec1c0e349f9f1bacb1a5337fb14451228ec7912d94acca8160dd008477c,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,0.039132118225097656,0.04591512680053711,0.048517465591430664,0.04326939582824707,0.0525362491607666,0.045278310775756836,0.04542803764343262,0.1691431999206543,0.03585076332092285,0.15714287757873535,0.15856027603149414,0.10554885864257812,0.5767779350280762,0.2552351951599121 +15,refs/heads/master,0c3e3e535b5514a92bd19280f2ce4bcde989ad23,c534abe100affbf873e577db76543f6a44c02a8a,1c532fc7d21e4a4a5ce3fb120ba7114626a02739,,True,True,10b3da864cdc0fcf0ceccbad7aa306cda1dc4e9c1608c52157660f71927f5377,Tests_passed,5a66e59d1d9995a540ff79fdddd6a68ce9906e2df384a829e4583a4994fac446,Tests_passed,True,True,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_failed,3549fec1c0e349f9f1bacb1a5337fb14451228ec7912d94acca8160dd008477c,Tests_failed,3549fec1c0e349f9f1bacb1a5337fb14451228ec7912d94acca8160dd008477c,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,0.039132118225097656,0.04591512680053711,0.048517465591430664,0.04326939582824707,0.0525362491607666,0.045278310775756836,0.04542803764343262,0.1691431999206543,0.03585076332092285,0.15580153465270996,0.15204286575317383,0.10554885864257812,0.5767779350280762,0.2552351951599121 diff --git a/results/combined/merges_timed/simasch/qlrm.csv b/results/combined/merges_timed/simasch/qlrm.csv index 9693650f3e..48058bc38e 100644 --- a/results/combined/merges_timed/simasch/qlrm.csv +++ b/results/combined/merges_timed/simasch/qlrm.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/develop,e03f1617f3978b3a1906f96e92317514eef243ff,1d2aa4ed9d6c383f7b0e9c6ca0c6a286c553b4e4,14a5cd7ede23d4a472bf95090457ad367252378f,,True,True,bc57a5c7fd3664d95670d140d7fa248621474729b14d763d1976e8541001731d,Tests_passed,2a85a98cbe62197750309e38b2c9a99ee0aa18034899e05835c0d0f31fd91eb1,Tests_passed,True,True,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,0339b0972a5f9708137eb256cfada4c8eb02164c1ebc666cadd8f850e885cba8,Merge_failed,164026d77042cbf65695723d5f61b26de65f24dbd862b3b1b9526c158a359dbe,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,6623edaab3e18d36bbbf751597e6a1d5070c2f4972e9fe07b641c72639b385c3,Merge_failed,6623edaab3e18d36bbbf751597e6a1d5070c2f4972e9fe07b641c72639b385c3,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Merge_failed,cabc4915f6b15dffe23226b6c0b88b9f51a2aa44249fdb12ba4dd35dba130531,0.007882118225097656,0.008205175399780273,0.008131265640258789,0.007930517196655273,0.008134603500366211,0.008313417434692383,0.008220911026000977,0.042388200759887695,0.014652252197265625,0.12613368034362793,0.12584877014160156,0.12354135513305664,1.082301139831543,0.1538529396057129 +21,refs/heads/develop,e03f1617f3978b3a1906f96e92317514eef243ff,1d2aa4ed9d6c383f7b0e9c6ca0c6a286c553b4e4,14a5cd7ede23d4a472bf95090457ad367252378f,,True,True,bc57a5c7fd3664d95670d140d7fa248621474729b14d763d1976e8541001731d,Tests_passed,2a85a98cbe62197750309e38b2c9a99ee0aa18034899e05835c0d0f31fd91eb1,Tests_passed,True,True,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,0339b0972a5f9708137eb256cfada4c8eb02164c1ebc666cadd8f850e885cba8,Merge_failed,164026d77042cbf65695723d5f61b26de65f24dbd862b3b1b9526c158a359dbe,Merge_failed,caba68d64c0093067bde3c2e48b593d0eb19b4389401041ee65d64e86d3d991a,Merge_failed,6623edaab3e18d36bbbf751597e6a1d5070c2f4972e9fe07b641c72639b385c3,Merge_failed,6623edaab3e18d36bbbf751597e6a1d5070c2f4972e9fe07b641c72639b385c3,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Merge_failed,cabc4915f6b15dffe23226b6c0b88b9f51a2aa44249fdb12ba4dd35dba130531,0.007882118225097656,0.008205175399780273,0.008131265640258789,0.007930517196655273,0.008134603500366211,0.008313417434692383,0.008220911026000977,0.042388200759887695,0.014652252197265625,0.12648773193359375,0.12582802772521973,0.12354135513305664,1.082301139831543,0.1538529396057129 diff --git a/results/combined/merges_timed/simmetrics/simmetrics.csv b/results/combined/merges_timed/simmetrics/simmetrics.csv index 080718ddbc..e0dda844d6 100644 --- a/results/combined/merges_timed/simmetrics/simmetrics.csv +++ b/results/combined/merges_timed/simmetrics/simmetrics.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -59,refs/heads/master,a0857905c0446c61e7f264aea4138a5cc0d2a2b5,4e647c4e54524f977a71d09a34624261f225d81b,ab3332f7038654d70023b9438597bc305e844503,,True,True,52f04d3da6331129cfe81c89e6b5f505ee54d281434e694429df3a6d285801ca,Tests_passed,283191769b1da266ac42cad72db5b4760cea4caa3fe393d614b2e2f1726b595d,Tests_passed,True,True,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,0e601b3f720bc61da71a727faf15c78323996be2feabeb1e20fbce33d6226d70,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,4c583c959cf32849a5a280b07c95faa990543aff5f18790529db155f5967db32,Merge_failed,4c583c959cf32849a5a280b07c95faa990543aff5f18790529db155f5967db32,Merge_failed,78b63bc291de1401aa1c60549a5416d1d430ce8f6579035e3e7ebe2af8980396,Tests_passed,1dc21296b321f78f59c73fefa55d4b390fa7dc125d9394df479f47514f3521cf,Merge_failed,b5ca95125ff6a2507edc37b4b7b435689ae46df3487785eae5ceb5dbd83edb41,0.056630849838256836,0.022049427032470703,0.021914005279541016,0.0540468692779541,0.011544466018676758,0.035361289978027344,0.039339303970336914,0.12678837776184082,0.07696866989135742,0.08990645408630371,0.09030628204345703,0.11190938949584961,0.7704253196716309,0.22893667221069336 +59,refs/heads/master,a0857905c0446c61e7f264aea4138a5cc0d2a2b5,4e647c4e54524f977a71d09a34624261f225d81b,ab3332f7038654d70023b9438597bc305e844503,,True,True,52f04d3da6331129cfe81c89e6b5f505ee54d281434e694429df3a6d285801ca,Tests_passed,283191769b1da266ac42cad72db5b4760cea4caa3fe393d614b2e2f1726b595d,Tests_passed,True,True,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,0e601b3f720bc61da71a727faf15c78323996be2feabeb1e20fbce33d6226d70,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,4c583c959cf32849a5a280b07c95faa990543aff5f18790529db155f5967db32,Merge_failed,4c583c959cf32849a5a280b07c95faa990543aff5f18790529db155f5967db32,Merge_failed,78b63bc291de1401aa1c60549a5416d1d430ce8f6579035e3e7ebe2af8980396,Tests_passed,1dc21296b321f78f59c73fefa55d4b390fa7dc125d9394df479f47514f3521cf,Merge_failed,b5ca95125ff6a2507edc37b4b7b435689ae46df3487785eae5ceb5dbd83edb41,0.056630849838256836,0.022049427032470703,0.021914005279541016,0.0540468692779541,0.011544466018676758,0.035361289978027344,0.039339303970336914,0.12678837776184082,0.07696866989135742,0.09009623527526855,0.09022927284240723,0.11190938949584961,0.7704253196716309,0.22893667221069336 diff --git a/results/combined/merges_timed/simpligility/android-ndk-maven-plugin.csv b/results/combined/merges_timed/simpligility/android-ndk-maven-plugin.csv index 2d70f0f9ec..1cebb159bb 100644 --- a/results/combined/merges_timed/simpligility/android-ndk-maven-plugin.csv +++ b/results/combined/merges_timed/simpligility/android-ndk-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,0432151e0e8138a983c601b2819b1545c8ff0385,c1740da3713bd8140e942082ba1b2c3a25da7fc3,f4c21f525979eb3b3741d55e9d9efd794ee8c642,,89faae25697a9ab681135ac573afa485389fe5b2b721e64ba8fd7c90cae6d45d,Tests_passed,8973991a3ca3a68d049175fd377f64fe5af2488773f4666f4833fd8b12ef198f,Tests_passed,True,True,True,True,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,0.04755997657775879,0.042946577072143555,0.016492128372192383,0.05692172050476074,0.04719209671020508,0.047753095626831055,0.03908276557922363,0.14884352684020996,0.036026954650878906,0.1769394874572754,0.18628501892089844,0.10892319679260254,1.5399529933929443,0.20456433296203613 +3,refs/heads/master,0432151e0e8138a983c601b2819b1545c8ff0385,c1740da3713bd8140e942082ba1b2c3a25da7fc3,f4c21f525979eb3b3741d55e9d9efd794ee8c642,,89faae25697a9ab681135ac573afa485389fe5b2b721e64ba8fd7c90cae6d45d,Tests_passed,8973991a3ca3a68d049175fd377f64fe5af2488773f4666f4833fd8b12ef198f,Tests_passed,True,True,True,True,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,0.04755997657775879,0.042946577072143555,0.016492128372192383,0.05692172050476074,0.04719209671020508,0.047753095626831055,0.03908276557922363,0.14884352684020996,0.036026954650878906,0.17864203453063965,0.17880630493164062,0.10892319679260254,1.5399529933929443,0.20456433296203613 diff --git a/results/combined/merges_timed/skyscreamer/jsonassert.csv b/results/combined/merges_timed/skyscreamer/jsonassert.csv index 0073e26522..620ab41786 100644 --- a/results/combined/merges_timed/skyscreamer/jsonassert.csv +++ b/results/combined/merges_timed/skyscreamer/jsonassert.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,2c6ec3c693d465934a99fe0c3d99218965ff74f4,9abc2bb5b97e2d075aa3f8c5f6e823f45ae8f2ef,054919c5723680b2821cc2219cc3b9fb72151b5e,,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,e124194a166f50f012b045ce08509dd5f9e7e8b3ca9582d3a36f48f23f6088f0,Tests_passed,True,True,True,True,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,0.039108991622924805,0.040750741958618164,0.047838687896728516,0.043126821517944336,0.040300846099853516,0.035968780517578125,0.04454779624938965,0.15165996551513672,0.035048723220825195,0.16246700286865234,0.16278648376464844,0.10843181610107422,0.8140027523040771,0.18963861465454102 +13,refs/heads/master,2c6ec3c693d465934a99fe0c3d99218965ff74f4,9abc2bb5b97e2d075aa3f8c5f6e823f45ae8f2ef,054919c5723680b2821cc2219cc3b9fb72151b5e,,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,e124194a166f50f012b045ce08509dd5f9e7e8b3ca9582d3a36f48f23f6088f0,Tests_passed,True,True,True,True,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,0.039108991622924805,0.040750741958618164,0.047838687896728516,0.043126821517944336,0.040300846099853516,0.035968780517578125,0.04454779624938965,0.15165996551513672,0.035048723220825195,0.15139532089233398,0.15094542503356934,0.10843181610107422,0.8140027523040771,0.18963861465454102 diff --git a/results/combined/merges_timed/skyscreamer/nevado.csv b/results/combined/merges_timed/skyscreamer/nevado.csv index f8d2676b3e..11f6985a4c 100644 --- a/results/combined/merges_timed/skyscreamer/nevado.csv +++ b/results/combined/merges_timed/skyscreamer/nevado.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -47,refs/remotes/origin/pull/112,cf100f0487d532b8ba2b16e2cbaecfcbce149f46,2f08cfbb74a3e4dd089d0bff9ba74f791718ab62,e56a0d771e3e40b14cfff69c49d9c87cd6ce720f,,True,True,f0295fca35e28d616df73be758d533453fc4dec81413bbbf915520dde2913de7,Tests_passed,709040c3aea1ec645d19220eb6437517b54914585cb7ff657f8f5d60a368cc98,Tests_passed,True,True,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,b040715134d1c0f84583185206afe7a0fab59d17c253c486f8c5e0c4efbb7425,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,b040715134d1c0f84583185206afe7a0fab59d17c253c486f8c5e0c4efbb7425,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,12add52f71003afcc0b9e94cc16fd34467826ca838e4c9eb805ae92ec51ea96b,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,31f8832b39531587575bfb4faa9d5f3f1101600daaa858f5a38a2fa4c1564e05,Merge_failed,31f8832b39531587575bfb4faa9d5f3f1101600daaa858f5a38a2fa4c1564e05,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Merge_failed,b7ea4c9c672082ce2c752e3c41c2638609c919dfb0fc69651211e9b5153c0b09,0.0459904670715332,0.04252791404724121,0.044263601303100586,0.04171633720397949,0.03361225128173828,0.02917957305908203,0.04478740692138672,0.22947001457214355,0.06700277328491211,0.21856093406677246,0.2257833480834961,0.18228793144226074,1.2623364925384521,0.22207164764404297 +47,refs/remotes/origin/pull/112,cf100f0487d532b8ba2b16e2cbaecfcbce149f46,2f08cfbb74a3e4dd089d0bff9ba74f791718ab62,e56a0d771e3e40b14cfff69c49d9c87cd6ce720f,,True,True,f0295fca35e28d616df73be758d533453fc4dec81413bbbf915520dde2913de7,Tests_passed,709040c3aea1ec645d19220eb6437517b54914585cb7ff657f8f5d60a368cc98,Tests_passed,True,True,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,b040715134d1c0f84583185206afe7a0fab59d17c253c486f8c5e0c4efbb7425,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,b040715134d1c0f84583185206afe7a0fab59d17c253c486f8c5e0c4efbb7425,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,12add52f71003afcc0b9e94cc16fd34467826ca838e4c9eb805ae92ec51ea96b,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,31f8832b39531587575bfb4faa9d5f3f1101600daaa858f5a38a2fa4c1564e05,Merge_failed,31f8832b39531587575bfb4faa9d5f3f1101600daaa858f5a38a2fa4c1564e05,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Merge_failed,b7ea4c9c672082ce2c752e3c41c2638609c919dfb0fc69651211e9b5153c0b09,0.0459904670715332,0.04252791404724121,0.044263601303100586,0.04171633720397949,0.03361225128173828,0.02917957305908203,0.04478740692138672,0.22947001457214355,0.06700277328491211,0.22387313842773438,0.22560381889343262,0.18228793144226074,1.2623364925384521,0.22207164764404297 diff --git a/results/combined/merges_timed/skyscreamer/yoga.csv b/results/combined/merges_timed/skyscreamer/yoga.csv index f20cd1c264..1dcf568ab4 100644 --- a/results/combined/merges_timed/skyscreamer/yoga.csv +++ b/results/combined/merges_timed/skyscreamer/yoga.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/heads/master,1f22844c51753edd813e117213a7e336d917d262,cfdd480dd2b83b4ac26b1d1e5299939ae961dd02,d4a48bc0cd2edfeb5d811525eb2c516c661401b9,,True,True,f98b9b65692bd9500811a1a4cf0c74804498fd15039f75a4a8f4a9062aa3dbe3,Tests_passed,6052122dde5c73ab3e06c959253212b4b3e0bbdff7a90f0d688bfec59565ab36,Tests_passed,True,True,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,ef27fc35ba7014340b6554ef0e99be793788558fc396657f0e31e0af1642d9e3,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,62ddcbe5ddabb88f511cca11c551b456f8fd78201f4d1346b6c05dae79bbb865,Merge_failed,cce80ec54600565007b8278bdde91915c405920c48441573e34b25a9898304e1,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,e97de2bb89b055588b0b7ec5b0b86f010ae7c750be970f20e12c8925722b754f,Merge_failed,2677e044961ab951d915db26abc586274a53533cd969455ff646fabd1215f9b6,0.05683565139770508,0.042063236236572266,0.05932426452636719,0.045731306076049805,0.054372549057006836,0.06060647964477539,0.04792499542236328,0.5594606399536133,0.0836944580078125,0.0720517635345459,0.07201623916625977,0.44727540016174316,0.544395923614502,0.26288771629333496 +27,refs/heads/master,1f22844c51753edd813e117213a7e336d917d262,cfdd480dd2b83b4ac26b1d1e5299939ae961dd02,d4a48bc0cd2edfeb5d811525eb2c516c661401b9,,True,True,f98b9b65692bd9500811a1a4cf0c74804498fd15039f75a4a8f4a9062aa3dbe3,Tests_passed,6052122dde5c73ab3e06c959253212b4b3e0bbdff7a90f0d688bfec59565ab36,Tests_passed,True,True,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,ef27fc35ba7014340b6554ef0e99be793788558fc396657f0e31e0af1642d9e3,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,62ddcbe5ddabb88f511cca11c551b456f8fd78201f4d1346b6c05dae79bbb865,Merge_failed,cce80ec54600565007b8278bdde91915c405920c48441573e34b25a9898304e1,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,e97de2bb89b055588b0b7ec5b0b86f010ae7c750be970f20e12c8925722b754f,Merge_failed,2677e044961ab951d915db26abc586274a53533cd969455ff646fabd1215f9b6,0.05683565139770508,0.042063236236572266,0.05932426452636719,0.045731306076049805,0.054372549057006836,0.06060647964477539,0.04792499542236328,0.5594606399536133,0.0836944580078125,0.07195758819580078,0.07221150398254395,0.44727540016174316,0.544395923614502,0.26288771629333496 diff --git a/results/combined/merges_timed/smartrics/restfixture.csv b/results/combined/merges_timed/smartrics/restfixture.csv index fb484d56d8..e89862a372 100644 --- a/results/combined/merges_timed/smartrics/restfixture.csv +++ b/results/combined/merges_timed/smartrics/restfixture.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -34,refs/remotes/origin/pull/38,d8c6704346b6c678edcfb02a11c914f6db985b21,5a7acd31fd8fe2417a14c50f4b27dbc4fd9409c8,bfa6c9c2940e3ace3f2bea11ddb81e33a84d5c25,,c0280a72c4e322859dbf07d9c240670206e9c076673d770ca87a39501161424c,Tests_passed,42f3798d7b235524aac0c29c067f427ec48c23d5e73e810a99ff36c1699f344b,Tests_passed,True,True,True,True,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,17fc0ae66cef4327a8ab7b6da8bd2b860cd496d1ce2fe954206f3d632b75b443,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,0aaa0352c30fb085e9a0b755c1a27597be17d117fe97361b7b067853407972d9,Merge_failed,17c521be7f7c53011904d2f90777f5fa1c0337f575498758c65cced82238083e,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,b99c1229d50061675eeb87d187d49510e7b6d68ce58649c874b822f3b406a0d8,Merge_failed,24e4214dac4c1773cb6537c6ca260640f8c693ea454a0259d7172dfaf1678be6,0.04712033271789551,0.032410621643066406,0.04405069351196289,0.04053163528442383,0.04775547981262207,0.05484461784362793,0.04756975173950195,0.33116579055786133,0.04384779930114746,0.13993406295776367,0.13024258613586426,0.23745512962341309,3.310755968093872,0.2634286880493164 +34,refs/remotes/origin/pull/38,d8c6704346b6c678edcfb02a11c914f6db985b21,5a7acd31fd8fe2417a14c50f4b27dbc4fd9409c8,bfa6c9c2940e3ace3f2bea11ddb81e33a84d5c25,,c0280a72c4e322859dbf07d9c240670206e9c076673d770ca87a39501161424c,Tests_passed,42f3798d7b235524aac0c29c067f427ec48c23d5e73e810a99ff36c1699f344b,Tests_passed,True,True,True,True,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,17fc0ae66cef4327a8ab7b6da8bd2b860cd496d1ce2fe954206f3d632b75b443,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,0aaa0352c30fb085e9a0b755c1a27597be17d117fe97361b7b067853407972d9,Merge_failed,17c521be7f7c53011904d2f90777f5fa1c0337f575498758c65cced82238083e,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,b99c1229d50061675eeb87d187d49510e7b6d68ce58649c874b822f3b406a0d8,Merge_failed,24e4214dac4c1773cb6537c6ca260640f8c693ea454a0259d7172dfaf1678be6,0.04712033271789551,0.032410621643066406,0.04405069351196289,0.04053163528442383,0.04775547981262207,0.05484461784362793,0.04756975173950195,0.33116579055786133,0.04384779930114746,0.1299152374267578,0.13981032371520996,0.23745512962341309,3.310755968093872,0.2634286880493164 diff --git a/results/combined/merges_timed/smartsheet-platform/smartsheet-java-sdk.csv b/results/combined/merges_timed/smartsheet-platform/smartsheet-java-sdk.csv index 34766a50c9..0fe24e0165 100644 --- a/results/combined/merges_timed/smartsheet-platform/smartsheet-java-sdk.csv +++ b/results/combined/merges_timed/smartsheet-platform/smartsheet-java-sdk.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -71,refs/heads/master,e3a8071836d7e5cf8949174a783d1f0d9525934e,23244c7e820d404fea45d0d7faee587730603333,411e1cb4c61d34b5e6f11e5ab55e9b350b02e248,,True,True,f864f2b8307072228bd2e7800aad334f799ea82a087fd83be06631af41570b8b,Tests_passed,a436be6a4ddf84d6c7294ff5deb0323ec6c09fd4fc0e315afbe164f0ad7a4cf9,Tests_passed,True,True,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,0.06071805953979492,0.05594897270202637,0.07062172889709473,0.0720362663269043,0.07303500175476074,0.0609433650970459,0.061292171478271484,0.1522512435913086,0.06820821762084961,0.15203070640563965,0.1537151336669922,0.1570422649383545,0.5640630722045898,0.3775918483734131 +71,refs/heads/master,e3a8071836d7e5cf8949174a783d1f0d9525934e,23244c7e820d404fea45d0d7faee587730603333,411e1cb4c61d34b5e6f11e5ab55e9b350b02e248,,True,True,f864f2b8307072228bd2e7800aad334f799ea82a087fd83be06631af41570b8b,Tests_passed,a436be6a4ddf84d6c7294ff5deb0323ec6c09fd4fc0e315afbe164f0ad7a4cf9,Tests_passed,True,True,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,0.06071805953979492,0.05594897270202637,0.07062172889709473,0.0720362663269043,0.07303500175476074,0.0609433650970459,0.061292171478271484,0.1522512435913086,0.06820821762084961,0.15119409561157227,0.15019702911376953,0.1570422649383545,0.5640630722045898,0.3775918483734131 diff --git a/results/combined/merges_timed/snazy/ohc.csv b/results/combined/merges_timed/snazy/ohc.csv index 7b1ff5b3e1..641722da0d 100644 --- a/results/combined/merges_timed/snazy/ohc.csv +++ b/results/combined/merges_timed/snazy/ohc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/develop,cf706bb89ebae023432c2bbd949266bfd68401e8,3e7f87adb7c65086351661cf5376c73e3f20d7c3,4d69670710441527e4a81f19596960986d30f63e,,True,True,a2a902e5dd16d024e7ebc5166f2b160f12aad1c411be6dafcec88b8a16207552,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,True,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Merge_failed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,0.04987931251525879,0.05515909194946289,0.0626986026763916,0.04615664482116699,0.07596349716186523,0.06566143035888672,0.058216094970703125,0.3641183376312256,0.03862452507019043,0.46773719787597656,0.46985363960266113,0.2866528034210205,3.735194206237793,0.253648042678833 +15,refs/heads/develop,cf706bb89ebae023432c2bbd949266bfd68401e8,3e7f87adb7c65086351661cf5376c73e3f20d7c3,4d69670710441527e4a81f19596960986d30f63e,,True,True,a2a902e5dd16d024e7ebc5166f2b160f12aad1c411be6dafcec88b8a16207552,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,True,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Merge_failed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,0.04987931251525879,0.05515909194946289,0.0626986026763916,0.04615664482116699,0.07596349716186523,0.06566143035888672,0.058216094970703125,0.3641183376312256,0.03862452507019043,0.46929168701171875,0.4691812992095947,0.2866528034210205,3.735194206237793,0.253648042678833 diff --git a/results/combined/merges_timed/sndyuk/logback-more-appenders.csv b/results/combined/merges_timed/sndyuk/logback-more-appenders.csv index 48dd5b5514..5cacac658e 100644 --- a/results/combined/merges_timed/sndyuk/logback-more-appenders.csv +++ b/results/combined/merges_timed/sndyuk/logback-more-appenders.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,ae3f6ef3d318598fc3cd1587a59a6358e3ea329d,5101380a368f76bc2fe058486266b44656f99360,e16baa5f46a753149085e2aabbcebef477f88064,,154111fe41ba74d57075b5b0da67bc1b014c8d627344a82e5661b3da2221594c,Tests_passed,ead0b4a977837688584fdb15f956559587f7dfdcb693483376211f53455f507a,Tests_passed,True,True,True,True,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,0.044792890548706055,0.04378008842468262,0.04364824295043945,0.04214835166931152,0.04381823539733887,0.04122591018676758,0.03301572799682617,0.22879815101623535,0.04406309127807617,0.15767335891723633,0.17885136604309082,0.16487836837768555,0.9326791763305664,0.18558025360107422 +20,refs/heads/master,ae3f6ef3d318598fc3cd1587a59a6358e3ea329d,5101380a368f76bc2fe058486266b44656f99360,e16baa5f46a753149085e2aabbcebef477f88064,,154111fe41ba74d57075b5b0da67bc1b014c8d627344a82e5661b3da2221594c,Tests_passed,ead0b4a977837688584fdb15f956559587f7dfdcb693483376211f53455f507a,Tests_passed,True,True,True,True,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,0.044792890548706055,0.04378008842468262,0.04364824295043945,0.04214835166931152,0.04381823539733887,0.04122591018676758,0.03301572799682617,0.22879815101623535,0.04406309127807617,0.15325045585632324,0.1533803939819336,0.16487836837768555,0.9326791763305664,0.18558025360107422 diff --git a/results/combined/merges_timed/soabase/exhibitor.csv b/results/combined/merges_timed/soabase/exhibitor.csv index 508a3aa6cf..1725ba4303 100644 --- a/results/combined/merges_timed/soabase/exhibitor.csv +++ b/results/combined/merges_timed/soabase/exhibitor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -127,refs/remotes/origin/frontend-rework,78de708554f75c4e14dc12d8f6ac3f02ed567a26,3955ecd938deb974f1156e416720c1b7fac0401e,c2e2bab03d3aa986fd1b148454e977c8f5309c8c,,True,True,87fa2edc5f369d896512e0ee7321586dbbb281514b5e901ef27bcb7016f5bfdf,Tests_passed,9be6e41f3c3f2d82d470b385606d11204a4db37a387977e745f0d3bd299fd6f4,Tests_passed,True,True,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,cd258f2a2e6b374aabfd6d5fef9b85dec5858440f485e0a79270a9783f3f96c3,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,cd258f2a2e6b374aabfd6d5fef9b85dec5858440f485e0a79270a9783f3f96c3,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,f6e8f45305109cbd41122bb5be00400129f13934086ddb86535631749d6a69df,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,24fa839f51c5a0a150af5cadf54885b45adf1b61a35a4051ee9d3b99ee75e9a7,Merge_failed,3c7bbfa7248370b919e6c2415c09d08fe766fe2e8f9917e3f0ff00411a9410ce,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Merge_failed,2e783798293bf547d6c2d67b9eae9d87599372841cec13cb4b6b75d7028cbca9,0.06190800666809082,0.038482666015625,0.0528407096862793,0.052583932876586914,0.051085710525512695,0.020075321197509766,0.04843592643737793,0.3914914131164551,0.07147836685180664,0.3940718173980713,0.39437365531921387,0.3454859256744385,3.250204563140869,0.2783818244934082 +127,refs/remotes/origin/frontend-rework,78de708554f75c4e14dc12d8f6ac3f02ed567a26,3955ecd938deb974f1156e416720c1b7fac0401e,c2e2bab03d3aa986fd1b148454e977c8f5309c8c,,True,True,87fa2edc5f369d896512e0ee7321586dbbb281514b5e901ef27bcb7016f5bfdf,Tests_passed,9be6e41f3c3f2d82d470b385606d11204a4db37a387977e745f0d3bd299fd6f4,Tests_passed,True,True,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,cd258f2a2e6b374aabfd6d5fef9b85dec5858440f485e0a79270a9783f3f96c3,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,cd258f2a2e6b374aabfd6d5fef9b85dec5858440f485e0a79270a9783f3f96c3,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,f6e8f45305109cbd41122bb5be00400129f13934086ddb86535631749d6a69df,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,24fa839f51c5a0a150af5cadf54885b45adf1b61a35a4051ee9d3b99ee75e9a7,Merge_failed,3c7bbfa7248370b919e6c2415c09d08fe766fe2e8f9917e3f0ff00411a9410ce,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Merge_failed,2e783798293bf547d6c2d67b9eae9d87599372841cec13cb4b6b75d7028cbca9,0.06190800666809082,0.038482666015625,0.0528407096862793,0.052583932876586914,0.051085710525512695,0.020075321197509766,0.04843592643737793,0.3914914131164551,0.07147836685180664,0.4006369113922119,0.3902740478515625,0.3454859256744385,3.250204563140869,0.2783818244934082 diff --git a/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv b/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv index 0c74e3300d..ade9bf9319 100644 --- a/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv +++ b/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,87e995db5654b3325daa07c4181e8e358faaa887,93a1be1010118acc6c154755359f84b2eaa1eac1,6691219b7fbe7d54102ca0641348f6a1db78f7d1,,True,True,097c95d3f82066d5e9650bb2b488f52475fe89603d27468b522631dd75e8278b,Tests_passed,a5ee3685ac75680f07ee698e1b883ee8798e30a9c879731073979fa195dc147a,Tests_passed,True,True,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,0.03930974006652832,0.05469465255737305,0.044381141662597656,0.046930789947509766,0.05128622055053711,0.04402661323547363,0.05203676223754883,0.2496962547302246,0.04618072509765625,0.31478190422058105,0.32553911209106445,0.16327238082885742,2.430676221847534,0.19551968574523926 +3,refs/heads/master,87e995db5654b3325daa07c4181e8e358faaa887,93a1be1010118acc6c154755359f84b2eaa1eac1,6691219b7fbe7d54102ca0641348f6a1db78f7d1,,True,True,097c95d3f82066d5e9650bb2b488f52475fe89603d27468b522631dd75e8278b,Tests_passed,a5ee3685ac75680f07ee698e1b883ee8798e30a9c879731073979fa195dc147a,Tests_passed,True,True,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,0.03930974006652832,0.05469465255737305,0.044381141662597656,0.046930789947509766,0.05128622055053711,0.04402661323547363,0.05203676223754883,0.2496962547302246,0.04618072509765625,0.3130786418914795,0.31186699867248535,0.16327238082885742,2.430676221847534,0.19551968574523926 diff --git a/results/combined/merges_timed/sockeqwe/annotatedadapter.csv b/results/combined/merges_timed/sockeqwe/annotatedadapter.csv index 658ea983e6..480735fde2 100644 --- a/results/combined/merges_timed/sockeqwe/annotatedadapter.csv +++ b/results/combined/merges_timed/sockeqwe/annotatedadapter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,62c7d43b5adeee8c47a42f4ab48ff106a6444b7c,32dc59ab83720ed5891a8701647211050f298e5c,ae79611e8f48cf8be3b0168e56c457d9bef2cad5,,True,True,ddaf68a6e7bfce4270454ffee8333a997cefa1115c72af36be631a80267b60fe,Tests_passed,38cf0f39aa1a0ce50a77d650636f7d5784473604919a97c116fcee9e556382de,Tests_passed,True,True,Merge_failed,b855a386b5c81a8d769440c98d7d399b36b79555ca82e766b49b4e6b296c74e6,Merge_failed,b855a386b5c81a8d769440c98d7d399b36b79555ca82e766b49b4e6b296c74e6,Merge_failed,b855a386b5c81a8d769440c98d7d399b36b79555ca82e766b49b4e6b296c74e6,Merge_failed,8c9c27ee03cac11b93dd15ce1b695b3de179f6271339d2021e5a24d69d2f032c,Merge_failed,e3fab4253661f7a44b3c6b75b1c5a27a266a9a8979ac72e0dec31e9f88f5f0fd,Merge_failed,e3fab4253661f7a44b3c6b75b1c5a27a266a9a8979ac72e0dec31e9f88f5f0fd,Merge_failed,586e8986ce76fe464c273526d07414e559cde6d0e906a611b1d47dc5b1f6bf98,Merge_failed,e5ce7ed4e820db2ddba3a17a62662aed43efad40fa27b2f4708ba640076f137b,Merge_failed,b855a386b5c81a8d769440c98d7d399b36b79555ca82e766b49b4e6b296c74e6,Merge_failed,746eba4272e595bc0167cd79807c66512cf5b5b8b62636faf6cb9d97598709bf,Merge_failed,746eba4272e595bc0167cd79807c66512cf5b5b8b62636faf6cb9d97598709bf,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,7a67939a410ed774b4a073244d26a241a84b2883513b604f3e02dc2b1d48220a,0.04201340675354004,0.04259824752807617,0.03926396369934082,0.0373377799987793,0.011531829833984375,0.04198503494262695,0.037132978439331055,0.2854464054107666,0.07583260536193848,0.2666020393371582,0.26665234565734863,0.23096537590026855,1.1284871101379395,0.1972501277923584 +7,refs/heads/master,62c7d43b5adeee8c47a42f4ab48ff106a6444b7c,32dc59ab83720ed5891a8701647211050f298e5c,ae79611e8f48cf8be3b0168e56c457d9bef2cad5,,True,True,ddaf68a6e7bfce4270454ffee8333a997cefa1115c72af36be631a80267b60fe,Tests_passed,38cf0f39aa1a0ce50a77d650636f7d5784473604919a97c116fcee9e556382de,Tests_passed,True,True,Merge_failed,b855a386b5c81a8d769440c98d7d399b36b79555ca82e766b49b4e6b296c74e6,Merge_failed,b855a386b5c81a8d769440c98d7d399b36b79555ca82e766b49b4e6b296c74e6,Merge_failed,b855a386b5c81a8d769440c98d7d399b36b79555ca82e766b49b4e6b296c74e6,Merge_failed,8c9c27ee03cac11b93dd15ce1b695b3de179f6271339d2021e5a24d69d2f032c,Merge_failed,e3fab4253661f7a44b3c6b75b1c5a27a266a9a8979ac72e0dec31e9f88f5f0fd,Merge_failed,e3fab4253661f7a44b3c6b75b1c5a27a266a9a8979ac72e0dec31e9f88f5f0fd,Merge_failed,586e8986ce76fe464c273526d07414e559cde6d0e906a611b1d47dc5b1f6bf98,Merge_failed,e5ce7ed4e820db2ddba3a17a62662aed43efad40fa27b2f4708ba640076f137b,Merge_failed,b855a386b5c81a8d769440c98d7d399b36b79555ca82e766b49b4e6b296c74e6,Merge_failed,746eba4272e595bc0167cd79807c66512cf5b5b8b62636faf6cb9d97598709bf,Merge_failed,746eba4272e595bc0167cd79807c66512cf5b5b8b62636faf6cb9d97598709bf,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,7a67939a410ed774b4a073244d26a241a84b2883513b604f3e02dc2b1d48220a,0.04201340675354004,0.04259824752807617,0.03926396369934082,0.0373377799987793,0.011531829833984375,0.04198503494262695,0.037132978439331055,0.2854464054107666,0.07583260536193848,0.26718974113464355,0.2654099464416504,0.23096537590026855,1.1284871101379395,0.1972501277923584 diff --git a/results/combined/merges_timed/sockeqwe/fragmentargs.csv b/results/combined/merges_timed/sockeqwe/fragmentargs.csv index fb86bc1a97..1e35326885 100644 --- a/results/combined/merges_timed/sockeqwe/fragmentargs.csv +++ b/results/combined/merges_timed/sockeqwe/fragmentargs.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,6e9506af9dd9fc0662d32080a9a5365ed7bffa0a,ba404aa9b8d30efd64ac6c6f281ef44a7c5958e5,64a24cd37a6707fb7dc88da55ffbee72d696a20c,,56a4283b9c9abceeea3f0f2a52461d7fddda1fe780466a9b8b1042e7ca518802,Tests_passed,9d18930b60a1cc89aa0e0089242978e2751f707bbc392f421641c679d4f6425a,Tests_passed,True,True,True,True,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,0.050516605377197266,0.04752826690673828,0.047812461853027344,0.05126690864562988,0.0478823184967041,0.04660606384277344,0.04710865020751953,0.11432290077209473,0.040242910385131836,0.17648911476135254,0.1750941276550293,0.10444259643554688,1.5301034450531006,0.1975090503692627 +4,refs/heads/master,6e9506af9dd9fc0662d32080a9a5365ed7bffa0a,ba404aa9b8d30efd64ac6c6f281ef44a7c5958e5,64a24cd37a6707fb7dc88da55ffbee72d696a20c,,56a4283b9c9abceeea3f0f2a52461d7fddda1fe780466a9b8b1042e7ca518802,Tests_passed,9d18930b60a1cc89aa0e0089242978e2751f707bbc392f421641c679d4f6425a,Tests_passed,True,True,True,True,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,0.050516605377197266,0.04752826690673828,0.047812461853027344,0.05126690864562988,0.0478823184967041,0.04660606384277344,0.04710865020751953,0.11432290077209473,0.040242910385131836,0.1772773265838623,0.17738604545593262,0.10444259643554688,1.5301034450531006,0.1975090503692627 diff --git a/results/combined/merges_timed/socketio4netty/socketio4j.csv b/results/combined/merges_timed/socketio4netty/socketio4j.csv index 1fda7b073c..7f6b6b2124 100644 --- a/results/combined/merges_timed/socketio4netty/socketio4j.csv +++ b/results/combined/merges_timed/socketio4netty/socketio4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -36,refs/heads/master,813f83b673ac76d5e779d19f146833e1646e09cf,84a94c3b791dbd85b99a40a88a75343fe831573e,f49db6acf7af63f796342cd2e201c119b4f327db,,True,True,4484a3aa7796e1e5727ca87c88ee09918915f20bac17188b87a28028c0ecffef,Tests_passed,a1bbeeb072df1c84de322caf57d0c13456d868d1ea0443836b24f86819135767,Tests_passed,True,True,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,0.04577493667602539,0.04224586486816406,0.037161827087402344,0.04689216613769531,0.047486066818237305,0.057264089584350586,0.05083060264587402,0.17453527450561523,0.05577588081359863,0.14701056480407715,0.147047758102417,0.12903261184692383,0.465667724609375,0.2174375057220459 +36,refs/heads/master,813f83b673ac76d5e779d19f146833e1646e09cf,84a94c3b791dbd85b99a40a88a75343fe831573e,f49db6acf7af63f796342cd2e201c119b4f327db,,True,True,4484a3aa7796e1e5727ca87c88ee09918915f20bac17188b87a28028c0ecffef,Tests_passed,a1bbeeb072df1c84de322caf57d0c13456d868d1ea0443836b24f86819135767,Tests_passed,True,True,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,0.04577493667602539,0.04224586486816406,0.037161827087402344,0.04689216613769531,0.047486066818237305,0.057264089584350586,0.05083060264587402,0.17453527450561523,0.05577588081359863,0.14452791213989258,0.14574098587036133,0.12903261184692383,0.465667724609375,0.2174375057220459 diff --git a/results/combined/merges_timed/sofastack/sofa-bolt.csv b/results/combined/merges_timed/sofastack/sofa-bolt.csv index 69f4db8de3..5508c53744 100644 --- a/results/combined/merges_timed/sofastack/sofa-bolt.csv +++ b/results/combined/merges_timed/sofastack/sofa-bolt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -88,refs/remotes/origin/pull/36,48c96584e07d2715f0346ea03a50e50c03b8787d,908263dbc59f0b854f1c751617bdab6aecb34693,06398729e98d1ac5779566dfd64be127c2745914,,True,True,bb5c48b1907e509e420cb177189be4ca8131ea37f739adc5acde3f4602192452,Tests_passed,e86ccd0fce2b7c392747b24b749acc01805ccfb60809db6d21419a6daa77e5d3,Tests_passed,True,True,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,c2e7d5a62eb388104c2fdf4c856623633d6b52a565b6a05b7ffb75b5c5b2fc70,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0e6061ef54baa69ef1946bcaaf9fb5cab25df1207fb539565b3687df41b7afbd,Merge_failed,0e6061ef54baa69ef1946bcaaf9fb5cab25df1207fb539565b3687df41b7afbd,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,c1b2c3cc0de3fd381797f11de552c20b563d05a0a4895a683a8d72b11b6bbf13,0.06525468826293945,0.05779147148132324,0.06747269630432129,0.08174467086791992,0.0697011947631836,0.06210970878601074,0.05730485916137695,0.7185218334197998,0.08726811408996582,1.2048735618591309,1.2108385562896729,0.5613417625427246,6.123358249664307,0.40825581550598145 +88,refs/remotes/origin/pull/36,48c96584e07d2715f0346ea03a50e50c03b8787d,908263dbc59f0b854f1c751617bdab6aecb34693,06398729e98d1ac5779566dfd64be127c2745914,,True,True,bb5c48b1907e509e420cb177189be4ca8131ea37f739adc5acde3f4602192452,Tests_passed,e86ccd0fce2b7c392747b24b749acc01805ccfb60809db6d21419a6daa77e5d3,Tests_passed,True,True,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,c2e7d5a62eb388104c2fdf4c856623633d6b52a565b6a05b7ffb75b5c5b2fc70,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0e6061ef54baa69ef1946bcaaf9fb5cab25df1207fb539565b3687df41b7afbd,Merge_failed,0e6061ef54baa69ef1946bcaaf9fb5cab25df1207fb539565b3687df41b7afbd,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,c1b2c3cc0de3fd381797f11de552c20b563d05a0a4895a683a8d72b11b6bbf13,0.06525468826293945,0.05779147148132324,0.06747269630432129,0.08174467086791992,0.0697011947631836,0.06210970878601074,0.05730485916137695,0.7185218334197998,0.08726811408996582,1.1939387321472168,1.1912357807159424,0.5613417625427246,6.123358249664307,0.40825581550598145 diff --git a/results/combined/merges_timed/softinstigate/restheart.csv b/results/combined/merges_timed/softinstigate/restheart.csv index 226703c39c..33dc587756 100644 --- a/results/combined/merges_timed/softinstigate/restheart.csv +++ b/results/combined/merges_timed/softinstigate/restheart.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -153,refs/remotes/origin/4.1.x,ef75e2ee223cd17f1f8d37bf30a3d9e193e77eac,44c6c13c0ce36263ed4dd3a6d6135c6eae02e64a,66eca10811db469358f72d28247700249d60a0bc,,True,True,b869c71dbdb92ed12aaa4d800f67d8e89074a3714cd0af5105f31789d35a566f,Tests_passed,e6a2bf7f4c3967422dba06313d49dfd4e521c19776f3b6a47efddfb7920638e8,Tests_passed,True,True,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,e79b151783c23477125cb1a4387c06b1c935cb3e7df960836b358f0eb9bcac8b,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,69aa83e454b9e4061e8d68a69ba8f8ccb6f59decf5f3146a032b1b84844daa72,Merge_failed,6ab50cf6c115c8faabd7b1f6ca5e31132e76aa700ef356f797d1a31ab70e7815,Merge_failed,6ab50cf6c115c8faabd7b1f6ca5e31132e76aa700ef356f797d1a31ab70e7815,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,054223f5af93c292aefb01bcbc19fcf7852169e4884da39ecaff5dde61300c09,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,488a2d7475cd552c9a71e4a3313cc0b058cf25aab32c1368d8978b8d8ca6b2d7,Merge_failed,4276a262bcebd9b6432868c61a2a4220bcb234ec14bb589b8ea3f44304b1eac5,Merge_failed,f6be0e629bdb30137c52618c2203fc47d088fef85a183b0d0861dbadca216217,Merge_failed,d8ad931a048544fe75da3bf05b7de624502d2f92bd2102db071e1232ceebd866,Merge_failed,eec87e7ed2a4c539c67accb9347ddb62df35d9c5f4ba333cc000fd934fc6f83e,0.02738666534423828,0.029784440994262695,0.030854463577270508,0.032196044921875,0.030838727951049805,0.031493186950683594,0.031028032302856445,0.28580403327941895,0.06652474403381348,1.9236655235290527,1.9303014278411865,0.9730720520019531,12.200442790985107,0.36272692680358887 +153,refs/remotes/origin/4.1.x,ef75e2ee223cd17f1f8d37bf30a3d9e193e77eac,44c6c13c0ce36263ed4dd3a6d6135c6eae02e64a,66eca10811db469358f72d28247700249d60a0bc,,True,True,b869c71dbdb92ed12aaa4d800f67d8e89074a3714cd0af5105f31789d35a566f,Tests_passed,e6a2bf7f4c3967422dba06313d49dfd4e521c19776f3b6a47efddfb7920638e8,Tests_passed,True,True,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,e79b151783c23477125cb1a4387c06b1c935cb3e7df960836b358f0eb9bcac8b,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,69aa83e454b9e4061e8d68a69ba8f8ccb6f59decf5f3146a032b1b84844daa72,Merge_failed,6ab50cf6c115c8faabd7b1f6ca5e31132e76aa700ef356f797d1a31ab70e7815,Merge_failed,6ab50cf6c115c8faabd7b1f6ca5e31132e76aa700ef356f797d1a31ab70e7815,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,054223f5af93c292aefb01bcbc19fcf7852169e4884da39ecaff5dde61300c09,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,488a2d7475cd552c9a71e4a3313cc0b058cf25aab32c1368d8978b8d8ca6b2d7,Merge_failed,4276a262bcebd9b6432868c61a2a4220bcb234ec14bb589b8ea3f44304b1eac5,Merge_failed,f6be0e629bdb30137c52618c2203fc47d088fef85a183b0d0861dbadca216217,Merge_failed,d8ad931a048544fe75da3bf05b7de624502d2f92bd2102db071e1232ceebd866,Merge_failed,eec87e7ed2a4c539c67accb9347ddb62df35d9c5f4ba333cc000fd934fc6f83e,0.02738666534423828,0.029784440994262695,0.030854463577270508,0.032196044921875,0.030838727951049805,0.031493186950683594,0.031028032302856445,0.28580403327941895,0.06652474403381348,1.935333251953125,1.9376697540283203,0.9730720520019531,12.200442790985107,0.36272692680358887 diff --git a/results/combined/merges_timed/solita/functional-utils.csv b/results/combined/merges_timed/solita/functional-utils.csv index 5192a9e048..279a7c26dd 100644 --- a/results/combined/merges_timed/solita/functional-utils.csv +++ b/results/combined/merges_timed/solita/functional-utils.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,a64f974e8d33134ba7f1b5e2450dfcdf9e764731,0690e9cfb6695662bfa7971480c5787864adb3cf,c9832d266ab93c8270c0a775404cd92b8cf73e18,,True,True,fac7f7c2141bfb63e58ce4f40f70e6525014f603c7ee68ce29aa925661097cfb,Tests_passed,13e2792f96dbadec538ca821da28f9f954ee1993bdbfb6e08d2eee7229d68edf,Tests_passed,True,True,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,0.05056142807006836,0.04099106788635254,0.06392908096313477,0.06911349296569824,0.06912565231323242,0.059584617614746094,0.03641843795776367,0.1906442642211914,0.050832509994506836,0.1618494987487793,0.16045331954956055,0.12222552299499512,1.0600824356079102,0.3510262966156006 +1,refs/heads/master,a64f974e8d33134ba7f1b5e2450dfcdf9e764731,0690e9cfb6695662bfa7971480c5787864adb3cf,c9832d266ab93c8270c0a775404cd92b8cf73e18,,True,True,fac7f7c2141bfb63e58ce4f40f70e6525014f603c7ee68ce29aa925661097cfb,Tests_passed,13e2792f96dbadec538ca821da28f9f954ee1993bdbfb6e08d2eee7229d68edf,Tests_passed,True,True,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,0.05056142807006836,0.04099106788635254,0.06392908096313477,0.06911349296569824,0.06912565231323242,0.059584617614746094,0.03641843795776367,0.1906442642211914,0.050832509994506836,0.15888667106628418,0.15887165069580078,0.12222552299499512,1.0600824356079102,0.3510262966156006 diff --git a/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv b/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv index fc0a20b8d6..0191fba43f 100644 --- a/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv +++ b/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,94286559181db4d3b19d0d0d814a28efe3e1d783,f7894cf76d0b1aa1f1066187a6b2213b3630e338,ae607d6bcb18f27ddfa008da90d4de8aae5c57da,,True,True,68372ceb2273588a76f20363acefb67058292d041bab067a32be34a01cc47197,Tests_passed,a068a97a3867cd212869da1291a42fe75e14bc6ab07c450f558ac3baa9c7fabc,Tests_passed,True,True,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,0.05016827583312988,0.041754722595214844,0.046508073806762695,0.05228567123413086,0.048126220703125,0.053401947021484375,0.05227398872375488,0.18311381340026855,0.04814004898071289,0.14598560333251953,0.14484357833862305,0.11677861213684082,0.5188345909118652,0.2003312110900879 +10,refs/heads/master,94286559181db4d3b19d0d0d814a28efe3e1d783,f7894cf76d0b1aa1f1066187a6b2213b3630e338,ae607d6bcb18f27ddfa008da90d4de8aae5c57da,,True,True,68372ceb2273588a76f20363acefb67058292d041bab067a32be34a01cc47197,Tests_passed,a068a97a3867cd212869da1291a42fe75e14bc6ab07c450f558ac3baa9c7fabc,Tests_passed,True,True,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,0.05016827583312988,0.041754722595214844,0.046508073806762695,0.05228567123413086,0.048126220703125,0.053401947021484375,0.05227398872375488,0.18311381340026855,0.04814004898071289,0.1434478759765625,0.14312314987182617,0.11677861213684082,0.5188345909118652,0.2003312110900879 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv b/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv index e1ef43db9c..c5683bf378 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,0a474ef6d91248a199a65c9ca24556e598116fd1,937870ed1c0f1c0f785b318bbd66d91e2080e043,6654db7b83ce2e7900c99d2540bdcca57a9fd3b7,,True,True,25357fd119adf4c68630353ed196eb309a8c4d6aa66b280a1eb22591ed7de169,Tests_passed,c4ba271d24bd7adbf3b7ab6130671ac90c9701f8e93d1483d9f500e5bde36c52,Tests_passed,True,True,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,96163a022e45a5620ec1c1ffd98557029c046aab11a7b32b8313feba8d418c32,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,96163a022e45a5620ec1c1ffd98557029c046aab11a7b32b8313feba8d418c32,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,6bb2141e158e68f022858f9e3e4d90c367561d41f2bc4818f1cd26ab96ec57aa,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,91730a13dee643d933548fe797816161d75e57ce9a8556e838bfda8f0faf6d76,Merge_failed,91730a13dee643d933548fe797816161d75e57ce9a8556e838bfda8f0faf6d76,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_failed,b1ff4092e7216c79ec869127a68b00d0f7216aac494c8935db315e63b19be3ec,0.038768768310546875,0.03595995903015137,0.036933183670043945,0.027440786361694336,0.040004730224609375,0.03994417190551758,0.03907942771911621,0.09037613868713379,0.0633237361907959,0.07973837852478027,0.07988095283508301,0.1091151237487793,0.5784099102020264,0.17989301681518555 +4,refs/heads/master,0a474ef6d91248a199a65c9ca24556e598116fd1,937870ed1c0f1c0f785b318bbd66d91e2080e043,6654db7b83ce2e7900c99d2540bdcca57a9fd3b7,,True,True,25357fd119adf4c68630353ed196eb309a8c4d6aa66b280a1eb22591ed7de169,Tests_passed,c4ba271d24bd7adbf3b7ab6130671ac90c9701f8e93d1483d9f500e5bde36c52,Tests_passed,True,True,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,96163a022e45a5620ec1c1ffd98557029c046aab11a7b32b8313feba8d418c32,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,96163a022e45a5620ec1c1ffd98557029c046aab11a7b32b8313feba8d418c32,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,6bb2141e158e68f022858f9e3e4d90c367561d41f2bc4818f1cd26ab96ec57aa,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,91730a13dee643d933548fe797816161d75e57ce9a8556e838bfda8f0faf6d76,Merge_failed,91730a13dee643d933548fe797816161d75e57ce9a8556e838bfda8f0faf6d76,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_failed,b1ff4092e7216c79ec869127a68b00d0f7216aac494c8935db315e63b19be3ec,0.038768768310546875,0.03595995903015137,0.036933183670043945,0.027440786361694336,0.040004730224609375,0.03994417190551758,0.03907942771911621,0.09037613868713379,0.0633237361907959,0.07959127426147461,0.07959699630737305,0.1091151237487793,0.5784099102020264,0.17989301681518555 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv b/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv index 16cb175ab7..83648b9996 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/1,245133355f897caada1272aff129ffe56d3ad4a2,6a81bd5a6f17f247f39784815ff5cf3966ef2865,6b7fb9409178b44ab52175ba3b2265554062d089,,True,True,89ef06aa7e710d9e8ee37ea428148cadb047f8db7b9b1be99338c239e5ff39ed,Tests_passed,9b7200002758d949a0b1fe19afc07b4d22e5a8fb3dc7e5eed52b5812075a5492,Tests_passed,True,True,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,2c21ae4c928227a6081c0cb4def1f933f1d6d4cb75e66dd01f7518718ae72dfe,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,2c21ae4c928227a6081c0cb4def1f933f1d6d4cb75e66dd01f7518718ae72dfe,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,e78f0e075844e298179d7ef737648d6a3fb4cbd04da9eb99f17255b7b1da4c92,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,1f2a8a7ed6f04417d8d62afb41af98cfa4a2c4724a1683f989694997563c9754,Merge_failed,1f2a8a7ed6f04417d8d62afb41af98cfa4a2c4724a1683f989694997563c9754,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Merge_failed,1ffdb61a5349d00bca478f741e622ae6afa3d4122666e17d240d95cea9b715d2,0.06477665901184082,0.05567026138305664,0.05591535568237305,0.05863165855407715,0.04359006881713867,0.053417205810546875,0.05775618553161621,1.9883637428283691,0.45067858695983887,3.368196487426758,3.4007415771484375,2.130169153213501,15.511932134628296,0.22547173500061035 +4,refs/remotes/origin/pull/1,245133355f897caada1272aff129ffe56d3ad4a2,6a81bd5a6f17f247f39784815ff5cf3966ef2865,6b7fb9409178b44ab52175ba3b2265554062d089,,True,True,89ef06aa7e710d9e8ee37ea428148cadb047f8db7b9b1be99338c239e5ff39ed,Tests_passed,9b7200002758d949a0b1fe19afc07b4d22e5a8fb3dc7e5eed52b5812075a5492,Tests_passed,True,True,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,2c21ae4c928227a6081c0cb4def1f933f1d6d4cb75e66dd01f7518718ae72dfe,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,2c21ae4c928227a6081c0cb4def1f933f1d6d4cb75e66dd01f7518718ae72dfe,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,e78f0e075844e298179d7ef737648d6a3fb4cbd04da9eb99f17255b7b1da4c92,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,1f2a8a7ed6f04417d8d62afb41af98cfa4a2c4724a1683f989694997563c9754,Merge_failed,1f2a8a7ed6f04417d8d62afb41af98cfa4a2c4724a1683f989694997563c9754,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Merge_failed,1ffdb61a5349d00bca478f741e622ae6afa3d4122666e17d240d95cea9b715d2,0.06477665901184082,0.05567026138305664,0.05591535568237305,0.05863165855407715,0.04359006881713867,0.053417205810546875,0.05775618553161621,1.9883637428283691,0.45067858695983887,3.287396192550659,3.282752275466919,2.130169153213501,15.511932134628296,0.22547173500061035 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-php.csv b/results/combined/merges_timed/sonarcommunity/sonar-php.csv index b682861c65..740e5ee527 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-php.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-php.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/remotes/origin/pull/536,ad3b13cdd68bfd6e2cd944ac3c10ab5cfa005135,a775f0a16cab51b5cfb2fed6c916ba2fa406fd6c,13e149f93c8a92a61ddbf8278a6bc489882fc7be,,35397118277aa8a26d7627f2723806d736b9bcf7b99b7819acb351b23f812257,Tests_passed,3a4ce9f7e5757033ec26ccec4b9cba4c5d6017effd6f87dc1b5d4039be578740,Tests_passed,True,True,True,True,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,9d67b462cba82ff269f15d4a507793ac0e30e6aec620f27ce7b7f252e05bc657,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,0.016687870025634766,0.016593217849731445,0.018274545669555664,0.017493724822998047,0.017777204513549805,0.017873525619506836,0.018300294876098633,0.04727053642272949,0.016846895217895508,0.1543586254119873,0.15519237518310547,0.07164621353149414,0.6551830768585205,0.35575342178344727 +27,refs/remotes/origin/pull/536,ad3b13cdd68bfd6e2cd944ac3c10ab5cfa005135,a775f0a16cab51b5cfb2fed6c916ba2fa406fd6c,13e149f93c8a92a61ddbf8278a6bc489882fc7be,,35397118277aa8a26d7627f2723806d736b9bcf7b99b7819acb351b23f812257,Tests_passed,3a4ce9f7e5757033ec26ccec4b9cba4c5d6017effd6f87dc1b5d4039be578740,Tests_passed,True,True,True,True,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,9d67b462cba82ff269f15d4a507793ac0e30e6aec620f27ce7b7f252e05bc657,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,0.016687870025634766,0.016593217849731445,0.018274545669555664,0.017493724822998047,0.017777204513549805,0.017873525619506836,0.018300294876098633,0.04727053642272949,0.016846895217895508,0.1545238494873047,0.15428829193115234,0.07164621353149414,0.6551830768585205,0.35575342178344727 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv b/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv index 04a2357583..628d8cf472 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -95,refs/heads/master,933775819973c32cc8a831ea756e9a6c7a10f113,0a066a0b69aba7799612a24ce4647dedddc07c2d,b118e67f15d4f913fcd4e4952ad31b56291476a2,,True,True,4eaae77b2157c186abf57a4a21fdf7b72784dc2173c933c310afe8a94f077f01,Tests_passed,9fc2f862b927e7ae6dc2d2eaba7c186fa270202ad600af9dd62af7f06802d825,Tests_passed,True,True,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8d8403ac294aa879cf0c872cc04619a9a9649dbcdd19e6a1a7b45a84c2be5737,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,04904fce5a265e7013c634a5f82d11ea221da62df393cdddb2587bff6f85af50,Merge_failed,6e27de360184fad2ddfe405ac69269b171ae7a83d29918870f166102b5cc99fa,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,6ac9740e775a8a7750f43aed5e62f206175f6d42dce94ceb258d21571e1221fe,Merge_failed,084ac0b4834afaf8faee710ddfd8fc04c8ea184679df110eac4a19de6b0272eb,0.023099422454833984,0.023203611373901367,0.02489495277404785,0.02432847023010254,0.023604869842529297,0.024251461029052734,0.024379491806030273,0.10152220726013184,0.0401148796081543,0.22587013244628906,0.22794675827026367,0.30505943298339844,1.9055724143981934,0.2592453956604004 +95,refs/heads/master,933775819973c32cc8a831ea756e9a6c7a10f113,0a066a0b69aba7799612a24ce4647dedddc07c2d,b118e67f15d4f913fcd4e4952ad31b56291476a2,,True,True,4eaae77b2157c186abf57a4a21fdf7b72784dc2173c933c310afe8a94f077f01,Tests_passed,9fc2f862b927e7ae6dc2d2eaba7c186fa270202ad600af9dd62af7f06802d825,Tests_passed,True,True,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8d8403ac294aa879cf0c872cc04619a9a9649dbcdd19e6a1a7b45a84c2be5737,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,04904fce5a265e7013c634a5f82d11ea221da62df393cdddb2587bff6f85af50,Merge_failed,6e27de360184fad2ddfe405ac69269b171ae7a83d29918870f166102b5cc99fa,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,6ac9740e775a8a7750f43aed5e62f206175f6d42dce94ceb258d21571e1221fe,Merge_failed,084ac0b4834afaf8faee710ddfd8fc04c8ea184679df110eac4a19de6b0272eb,0.023099422454833984,0.023203611373901367,0.02489495277404785,0.02432847023010254,0.023604869842529297,0.024251461029052734,0.024379491806030273,0.10152220726013184,0.0401148796081543,0.22726750373840332,0.22838306427001953,0.30505943298339844,1.9055724143981934,0.2592453956604004 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv b/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv index 369473c689..5212a5f5eb 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/remotes/origin/pull/4,eb6d39619d9c570d93b08239891ca2983e73e85c,2a004dc73737229a24009e64cfe68d8a9a4796f1,11e3ca2815a75f93ff30d276caea7caf48562f93,,d415eab3e2d82e969d504dc93244f445a5337b5d4628194e23749b95d3370da3,Tests_passed,2c4ad171e512e0f17fc186fb4f2773595f48144e8a01d634b63174b33bcefd9c,Tests_passed,True,True,True,True,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,821133f4d24858a9d7305de5dac2feabc9205af64efa352cc26b26591f4694af,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,dcee63da1ac1d5a66bfe8594be46e9599a97e82296eecfc4b5c6d32e74dff59e,Merge_failed,dcee63da1ac1d5a66bfe8594be46e9599a97e82296eecfc4b5c6d32e74dff59e,Merge_failed,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,08a86cbda8b72f5d7c672fdef2ed11f8123c0302a9f887d6d014537acceb1fe8,Merge_failed,83f2ec48105e6975d5ad75ccdf6d83c11e315cf792353e0a6290c27948a49d83,0.011174440383911133,0.011368989944458008,0.011558294296264648,0.01156926155090332,0.0118408203125,0.011393308639526367,0.011681795120239258,0.048553466796875,0.018450498580932617,0.1535813808441162,0.1556077003479004,0.12550759315490723,0.46546030044555664,0.18192720413208008 +1,refs/remotes/origin/pull/4,eb6d39619d9c570d93b08239891ca2983e73e85c,2a004dc73737229a24009e64cfe68d8a9a4796f1,11e3ca2815a75f93ff30d276caea7caf48562f93,,d415eab3e2d82e969d504dc93244f445a5337b5d4628194e23749b95d3370da3,Tests_passed,2c4ad171e512e0f17fc186fb4f2773595f48144e8a01d634b63174b33bcefd9c,Tests_passed,True,True,True,True,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,821133f4d24858a9d7305de5dac2feabc9205af64efa352cc26b26591f4694af,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,dcee63da1ac1d5a66bfe8594be46e9599a97e82296eecfc4b5c6d32e74dff59e,Merge_failed,dcee63da1ac1d5a66bfe8594be46e9599a97e82296eecfc4b5c6d32e74dff59e,Merge_failed,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,08a86cbda8b72f5d7c672fdef2ed11f8123c0302a9f887d6d014537acceb1fe8,Merge_failed,83f2ec48105e6975d5ad75ccdf6d83c11e315cf792353e0a6290c27948a49d83,0.011174440383911133,0.011368989944458008,0.011558294296264648,0.01156926155090332,0.0118408203125,0.011393308639526367,0.011681795120239258,0.048553466796875,0.018450498580932617,0.14934802055358887,0.14957046508789062,0.12550759315490723,0.46546030044555664,0.18192720413208008 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-web.csv b/results/combined/merges_timed/sonarcommunity/sonar-web.csv index e75d5d3377..5a9d14719a 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-web.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-web.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/117,b6a68a63c42d8f2dce3fd92a208351b3cf4f2857,b4c07004f18f2f89123e2f56316d1cd221efe878,d0da1ed51fca933c9028b4c6c60559f12481e617,,True,True,5cb9e4a18671d81d619d4dab64820ba17ce46aa2f7f79d4e18020936eb734b0d,Tests_passed,697a13e1ce5d0b35b8bfbdd68ea8ac4d08100b42b7a05224208e05ff85721334,Tests_passed,True,True,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,fc68bb38bd8d1b871fa1a16358f0367600c5994cabcd36bc67e8489610396620,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,285029bf46c00470d7b08b0e9bc8638ed706ec8f8c42a3b845c1fda42524a895,Merge_failed,285029bf46c00470d7b08b0e9bc8638ed706ec8f8c42a3b845c1fda42524a895,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,63ab2da013a8b9d10c44335a4adccc519f9d208e106e193d46b740f1549929e2,Merge_failed,adde5491deddc3f181201ae0bcccdc5d9b85a0e20c19146217d088694fa6ff00,0.013602256774902344,0.013594627380371094,0.013042211532592773,0.01298379898071289,0.013762712478637695,0.01301884651184082,0.013196468353271484,0.07855415344238281,0.046988725662231445,0.06894946098327637,0.06936049461364746,0.1291346549987793,0.5835535526275635,0.2859978675842285 +4,refs/remotes/origin/pull/117,b6a68a63c42d8f2dce3fd92a208351b3cf4f2857,b4c07004f18f2f89123e2f56316d1cd221efe878,d0da1ed51fca933c9028b4c6c60559f12481e617,,True,True,5cb9e4a18671d81d619d4dab64820ba17ce46aa2f7f79d4e18020936eb734b0d,Tests_passed,697a13e1ce5d0b35b8bfbdd68ea8ac4d08100b42b7a05224208e05ff85721334,Tests_passed,True,True,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,fc68bb38bd8d1b871fa1a16358f0367600c5994cabcd36bc67e8489610396620,Merge_failed,f4ab22b08f24994b9e23a8f86c5ae592643bf35781d7c35739507dde423a45bd,Merge_failed,285029bf46c00470d7b08b0e9bc8638ed706ec8f8c42a3b845c1fda42524a895,Merge_failed,285029bf46c00470d7b08b0e9bc8638ed706ec8f8c42a3b845c1fda42524a895,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,63ab2da013a8b9d10c44335a4adccc519f9d208e106e193d46b740f1549929e2,Merge_failed,adde5491deddc3f181201ae0bcccdc5d9b85a0e20c19146217d088694fa6ff00,0.013602256774902344,0.013594627380371094,0.013042211532592773,0.01298379898071289,0.013762712478637695,0.01301884651184082,0.013196468353271484,0.07855415344238281,0.046988725662231445,0.06916451454162598,0.0692601203918457,0.1291346549987793,0.5835535526275635,0.2859978675842285 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-xml.csv b/results/combined/merges_timed/sonarcommunity/sonar-xml.csv index ab7f9a312e..962e9e1d40 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-xml.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-xml.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,0e1fee2967a660d9ad773b8279e8ffe5ab4d0908,7c4f9c62a54532c13a302793523e6c5ec498c54c,90964790a53ea2e1c81906221666a3fb33ab68bf,,True,True,a77b55b7a45b441baeef7140fae50e2f005e93b8f7eaff4939fe71cf5b7f54eb,Tests_passed,a138b393b01e2f41e2588142f289fbe748e3795bc997e13f950a5f5310ace78f,Tests_passed,True,True,Merge_failed,773e41c0e900208645bdbd333ef0237191b674c51d760726d38bc21e545cd634,Merge_failed,4f618e6264bcb1a105db5e809625e8692b590508b9341a3120f9a9c9549162f7,Merge_failed,773e41c0e900208645bdbd333ef0237191b674c51d760726d38bc21e545cd634,Merge_failed,9dc1cdbeb387aeb1730d1db0bd4cc74313cdfd327047dbd5059b3aa2d7feffd1,Merge_failed,732b3e2363118a3f640d0aa3b5606bda4682df370eb3391f16603aeeff04147b,Merge_failed,732b3e2363118a3f640d0aa3b5606bda4682df370eb3391f16603aeeff04147b,Merge_failed,de237e76305754b89d06a17522db8a82243f088bcdd01f00b5642f7905ae9b4c,Merge_failed,84deb828d885f4cfa050278aaf6ae94674de263b62c77145ab6f098401a3f14f,Merge_failed,773e41c0e900208645bdbd333ef0237191b674c51d760726d38bc21e545cd634,Merge_failed,cbae81cc213fa885c592764543298da4a7ff30cb5c251f64ed01bee27ea14da6,Merge_failed,cbae81cc213fa885c592764543298da4a7ff30cb5c251f64ed01bee27ea14da6,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,5dacc30d3d17647f1644931d3371538e2d7053eaccf75866b9ac90492a247789,0.02320241928100586,0.023861169815063477,0.026244640350341797,0.025684595108032227,0.02603626251220703,0.025902509689331055,0.025763511657714844,0.24013471603393555,0.04991507530212402,1.8890659809112549,1.8956091403961182,0.936445951461792,9.596669435501099,0.31353163719177246 +2,refs/heads/master,0e1fee2967a660d9ad773b8279e8ffe5ab4d0908,7c4f9c62a54532c13a302793523e6c5ec498c54c,90964790a53ea2e1c81906221666a3fb33ab68bf,,True,True,a77b55b7a45b441baeef7140fae50e2f005e93b8f7eaff4939fe71cf5b7f54eb,Tests_passed,a138b393b01e2f41e2588142f289fbe748e3795bc997e13f950a5f5310ace78f,Tests_passed,True,True,Merge_failed,773e41c0e900208645bdbd333ef0237191b674c51d760726d38bc21e545cd634,Merge_failed,4f618e6264bcb1a105db5e809625e8692b590508b9341a3120f9a9c9549162f7,Merge_failed,773e41c0e900208645bdbd333ef0237191b674c51d760726d38bc21e545cd634,Merge_failed,9dc1cdbeb387aeb1730d1db0bd4cc74313cdfd327047dbd5059b3aa2d7feffd1,Merge_failed,732b3e2363118a3f640d0aa3b5606bda4682df370eb3391f16603aeeff04147b,Merge_failed,732b3e2363118a3f640d0aa3b5606bda4682df370eb3391f16603aeeff04147b,Merge_failed,de237e76305754b89d06a17522db8a82243f088bcdd01f00b5642f7905ae9b4c,Merge_failed,84deb828d885f4cfa050278aaf6ae94674de263b62c77145ab6f098401a3f14f,Merge_failed,773e41c0e900208645bdbd333ef0237191b674c51d760726d38bc21e545cd634,Merge_failed,cbae81cc213fa885c592764543298da4a7ff30cb5c251f64ed01bee27ea14da6,Merge_failed,cbae81cc213fa885c592764543298da4a7ff30cb5c251f64ed01bee27ea14da6,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,5dacc30d3d17647f1644931d3371538e2d7053eaccf75866b9ac90492a247789,0.02320241928100586,0.023861169815063477,0.026244640350341797,0.025684595108032227,0.02603626251220703,0.025902509689331055,0.025763511657714844,0.24013471603393555,0.04991507530212402,1.8790690898895264,1.8826344013214111,0.936445951461792,9.596669435501099,0.31353163719177246 diff --git a/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv b/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv index 5653f2d9ad..d7f920d323 100644 --- a/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv +++ b/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -35,refs/remotes/origin/pull/175,ffd5c4bca45dd46beef89274d9038c75674ebc75,8f1211f8bc2315b76bc8069e8634109c89824177,3ccb62e49f48393112a5de43295ef4ee474cf6b5,,True,True,030ae5f4f6367f13cca4292050fa23065fd5af3beef9f5b416b229bcbd34dc85,Tests_passed,10c0ee8982cb9b767179e5529f3b83de2a6b7d2d894db1afb6a05a49c01e7eb6,Tests_passed,True,True,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,0.06476116180419922,0.07024717330932617,0.05503273010253906,0.06516790390014648,0.0787506103515625,0.06492757797241211,0.06130838394165039,0.19928932189941406,0.07642078399658203,0.16980743408203125,0.1693437099456787,0.10593771934509277,0.056282997131347656,0.3242805004119873 +35,refs/remotes/origin/pull/175,ffd5c4bca45dd46beef89274d9038c75674ebc75,8f1211f8bc2315b76bc8069e8634109c89824177,3ccb62e49f48393112a5de43295ef4ee474cf6b5,,True,True,030ae5f4f6367f13cca4292050fa23065fd5af3beef9f5b416b229bcbd34dc85,Tests_passed,10c0ee8982cb9b767179e5529f3b83de2a6b7d2d894db1afb6a05a49c01e7eb6,Tests_passed,True,True,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,0.06476116180419922,0.07024717330932617,0.05503273010253906,0.06516790390014648,0.0787506103515625,0.06492757797241211,0.06130838394165039,0.19928932189941406,0.07642078399658203,0.16549444198608398,0.16721868515014648,0.10593771934509277,0.056282997131347656,0.3242805004119873 diff --git a/results/combined/merges_timed/sonarsource/sonar-findbugs.csv b/results/combined/merges_timed/sonarsource/sonar-findbugs.csv index b220ab0359..c862cd59e4 100644 --- a/results/combined/merges_timed/sonarsource/sonar-findbugs.csv +++ b/results/combined/merges_timed/sonarsource/sonar-findbugs.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -209,refs/remotes/origin/sq-10,185c5314e370b844d643c036c0bebada30bb7de6,863f3163111b75cc7bf2817f0d7862e3e7185807,8e93e5ab17b54ec7c3001ea623d999e1de863b86,,True,True,0cf61a3b4920d0659f046cc4e6d8512c0339f752894766dccd363a49fd791fa9,Tests_passed,eee6aac93552220e94ca101c359aeab1ab76c1b77e6d4e03d0e1b5fd45cbcc01,Tests_passed,True,True,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,4ed9cf2bb4f5a047325ae5b7afef8ef3e1e9b1e4b90e5246f3e8bec09018cd7c,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,f547c042aaf897244c7a42af4b27fa8f0588227c520d46095705e14b8743ca70,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,19e1e097e511c0f9c3c54f5ea4eacebb264cbc83ce7cd7652028372c990731a7,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,2eb59ef91500e5044dac4fe7285177fad0b9d73de4f3c2a46514d022a06c7c45,Merge_failed,2eb59ef91500e5044dac4fe7285177fad0b9d73de4f3c2a46514d022a06c7c45,Merge_failed,4ab53a39feb95662036d02eb85292b6645eb83cc0653e2ed3b1c8fdacb075b02,Merge_failed,2627aaf7f26988c8fcb6243deb255ad33f938fa760ba8cf2859614b427db674e,Merge_failed,4d1ecc380186058b879770abb3bbabda7e36141f1de4a6c12ade471da68d7f59,0.0604248046875,0.05564546585083008,0.0479123592376709,0.05431866645812988,0.05476117134094238,0.03700375556945801,0.05029487609863281,0.40113019943237305,0.05180215835571289,0.511967658996582,0.5159988403320312,0.31797051429748535,3.243856430053711,0.2776308059692383 +209,refs/remotes/origin/sq-10,185c5314e370b844d643c036c0bebada30bb7de6,863f3163111b75cc7bf2817f0d7862e3e7185807,8e93e5ab17b54ec7c3001ea623d999e1de863b86,,True,True,0cf61a3b4920d0659f046cc4e6d8512c0339f752894766dccd363a49fd791fa9,Tests_passed,eee6aac93552220e94ca101c359aeab1ab76c1b77e6d4e03d0e1b5fd45cbcc01,Tests_passed,True,True,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,4ed9cf2bb4f5a047325ae5b7afef8ef3e1e9b1e4b90e5246f3e8bec09018cd7c,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,f547c042aaf897244c7a42af4b27fa8f0588227c520d46095705e14b8743ca70,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,19e1e097e511c0f9c3c54f5ea4eacebb264cbc83ce7cd7652028372c990731a7,Merge_failed,8039d713a87e2be6927d726b13cd3fbdeb2ed547758207ac02ef4de87a2b5f22,Merge_failed,2eb59ef91500e5044dac4fe7285177fad0b9d73de4f3c2a46514d022a06c7c45,Merge_failed,2eb59ef91500e5044dac4fe7285177fad0b9d73de4f3c2a46514d022a06c7c45,Merge_failed,4ab53a39feb95662036d02eb85292b6645eb83cc0653e2ed3b1c8fdacb075b02,Merge_failed,2627aaf7f26988c8fcb6243deb255ad33f938fa760ba8cf2859614b427db674e,Merge_failed,4d1ecc380186058b879770abb3bbabda7e36141f1de4a6c12ade471da68d7f59,0.0604248046875,0.05564546585083008,0.0479123592376709,0.05431866645812988,0.05476117134094238,0.03700375556945801,0.05029487609863281,0.40113019943237305,0.05180215835571289,0.5148448944091797,0.5152060985565186,0.31797051429748535,3.243856430053711,0.2776308059692383 diff --git a/results/combined/merges_timed/sonatype/jgit.csv b/results/combined/merges_timed/sonatype/jgit.csv index 98d5130d3a..13c29ef8c0 100644 --- a/results/combined/merges_timed/sonatype/jgit.csv +++ b/results/combined/merges_timed/sonatype/jgit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -38,refs/remotes/origin/struberg,7ce2207c2b66c7fec63cdcb816bd570c534fb829,ea4903241e2b096d85101dc4697b0b7b9749f820,6c5dff4f907654ffb7ba99887d36d57bdd0d1f74,,True,True,4c7c9f2cfcfef5418f353e07765f9500e1bb03ab765c5b671e226773ebdc8e1b,Tests_passed,5422cfa265a3148065a2dbab138da2b11f35aed165bafc57bb3669a1ff023ae8,Tests_passed,True,True,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,f48155f8d389c0cd62cc9523770950de47623e7fe33420f0a860ef7d27c256c1,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,f48155f8d389c0cd62cc9523770950de47623e7fe33420f0a860ef7d27c256c1,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,7fea1ab49ec7b5043aba2e0fd86c75fa3f8dd88088a06841c7e8640de4abc907,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,0a1ac4365c0edb315ee4a3b22854cb93b4651d1ed8f8a0903b3a259484531637,Merge_failed,0a1ac4365c0edb315ee4a3b22854cb93b4651d1ed8f8a0903b3a259484531637,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,0.0584559440612793,0.02779841423034668,0.02100396156311035,0.018849849700927734,0.01661396026611328,0.015439033508300781,0.01610708236694336,0.07274246215820312,0.0776362419128418,0.16605138778686523,0.16602420806884766,0.13216710090637207,0.031262874603271484,0.2790710926055908 +38,refs/remotes/origin/struberg,7ce2207c2b66c7fec63cdcb816bd570c534fb829,ea4903241e2b096d85101dc4697b0b7b9749f820,6c5dff4f907654ffb7ba99887d36d57bdd0d1f74,,True,True,4c7c9f2cfcfef5418f353e07765f9500e1bb03ab765c5b671e226773ebdc8e1b,Tests_passed,5422cfa265a3148065a2dbab138da2b11f35aed165bafc57bb3669a1ff023ae8,Tests_passed,True,True,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,f48155f8d389c0cd62cc9523770950de47623e7fe33420f0a860ef7d27c256c1,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,f48155f8d389c0cd62cc9523770950de47623e7fe33420f0a860ef7d27c256c1,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,7fea1ab49ec7b5043aba2e0fd86c75fa3f8dd88088a06841c7e8640de4abc907,Merge_failed,5dc1c470c10dd6cd38adc8dcf65983a5bc0509ab226454d327ce936642d19494,Merge_failed,0a1ac4365c0edb315ee4a3b22854cb93b4651d1ed8f8a0903b3a259484531637,Merge_failed,0a1ac4365c0edb315ee4a3b22854cb93b4651d1ed8f8a0903b3a259484531637,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,0.0584559440612793,0.02779841423034668,0.02100396156311035,0.018849849700927734,0.01661396026611328,0.015439033508300781,0.01610708236694336,0.07274246215820312,0.0776362419128418,0.16150760650634766,0.16194629669189453,0.13216710090637207,0.031262874603271484,0.2790710926055908 diff --git a/results/combined/merges_timed/sonatype/plexus-compiler.csv b/results/combined/merges_timed/sonatype/plexus-compiler.csv index 7032c57d59..f17b636de1 100644 --- a/results/combined/merges_timed/sonatype/plexus-compiler.csv +++ b/results/combined/merges_timed/sonatype/plexus-compiler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/remotes/origin/pull/36,379b6114536f2f3d363d096fbe2246f5cb3b8ad1,3eb04b388662f4f3394b51983837b3065b3aa3f9,70cce375cf186440ac930c41e026b1ef614202cd,,c337201bd8796ab798364b29a4c5b47c9a1d1df453ea8b28f0ea82885c32afab,Tests_passed,f960cde03470289072c5f5033ad4910a9f0242fbc89f908d5d46ddd0e7968905,Tests_passed,True,True,True,True,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,0.03644132614135742,0.03720378875732422,0.03164196014404297,0.03416132926940918,0.04146218299865723,0.03551912307739258,0.047429561614990234,0.13329625129699707,0.03438115119934082,0.1641237735748291,0.16425347328186035,0.10052752494812012,1.1716594696044922,0.19233441352844238 +26,refs/remotes/origin/pull/36,379b6114536f2f3d363d096fbe2246f5cb3b8ad1,3eb04b388662f4f3394b51983837b3065b3aa3f9,70cce375cf186440ac930c41e026b1ef614202cd,,c337201bd8796ab798364b29a4c5b47c9a1d1df453ea8b28f0ea82885c32afab,Tests_passed,f960cde03470289072c5f5033ad4910a9f0242fbc89f908d5d46ddd0e7968905,Tests_passed,True,True,True,True,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,0.03644132614135742,0.03720378875732422,0.03164196014404297,0.03416132926940918,0.04146218299865723,0.03551912307739258,0.047429561614990234,0.13329625129699707,0.03438115119934082,0.16101312637329102,0.160447359085083,0.10052752494812012,1.1716594696044922,0.19233441352844238 diff --git a/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv b/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv index 1dc9251c3c..97c7e527a4 100644 --- a/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv +++ b/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/remotes/origin/pull/11,fd664ae55bf754fbd5764a2c19019e1ed8d5ba14,876af34a18e3dec75c57c959a230921f32cbe529,7a8337d0fb5d70f209f5bbe6838e55d9789a6b57,,0ed23bef9c2183e93b691fd4f1a2a737f46f1947cd24aa480fcc22a80f0db15f,Tests_passed,d703dcf1d53b48eb9b34cf5e1ff00a14c6d3c065c93a9cf67b27ab97ea397d0f,Tests_passed,True,True,True,True,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,94a5cbce7a207ae1cbf9129d6a8e32203eba5e52f327a05408c1149f05fc1e40,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,03696986240c6804a6e356deaa40800a842b3847dda63a7069aa8abd355f3e89,Merge_failed,03696986240c6804a6e356deaa40800a842b3847dda63a7069aa8abd355f3e89,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,9c79bac3f0b5712d3a17343102e6e09bc8639fe4b97974a442232ebd6a582fef,Merge_failed,9c79bac3f0b5712d3a17343102e6e09bc8639fe4b97974a442232ebd6a582fef,0.009229421615600586,0.00987696647644043,0.009827613830566406,0.009305000305175781,0.009278059005737305,0.009392261505126953,0.009252309799194336,0.037497758865356445,0.014984369277954102,0.0633389949798584,0.0635673999786377,0.0749821662902832,0.02507472038269043,0.16373467445373535 +5,refs/remotes/origin/pull/11,fd664ae55bf754fbd5764a2c19019e1ed8d5ba14,876af34a18e3dec75c57c959a230921f32cbe529,7a8337d0fb5d70f209f5bbe6838e55d9789a6b57,,0ed23bef9c2183e93b691fd4f1a2a737f46f1947cd24aa480fcc22a80f0db15f,Tests_passed,d703dcf1d53b48eb9b34cf5e1ff00a14c6d3c065c93a9cf67b27ab97ea397d0f,Tests_passed,True,True,True,True,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,94a5cbce7a207ae1cbf9129d6a8e32203eba5e52f327a05408c1149f05fc1e40,Merge_failed,85e1047ab6e1f25b5e54c7ce95a213bd5df2fffd9952cc448af7a2646e135b1f,Merge_failed,03696986240c6804a6e356deaa40800a842b3847dda63a7069aa8abd355f3e89,Merge_failed,03696986240c6804a6e356deaa40800a842b3847dda63a7069aa8abd355f3e89,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,9c79bac3f0b5712d3a17343102e6e09bc8639fe4b97974a442232ebd6a582fef,Merge_failed,9c79bac3f0b5712d3a17343102e6e09bc8639fe4b97974a442232ebd6a582fef,0.009229421615600586,0.00987696647644043,0.009827613830566406,0.009305000305175781,0.009278059005737305,0.009392261505126953,0.009252309799194336,0.037497758865356445,0.014984369277954102,0.0631875991821289,0.06312131881713867,0.0749821662902832,0.02507472038269043,0.16373467445373535 diff --git a/results/combined/merges_timed/spigotmc/bungeecord.csv b/results/combined/merges_timed/spigotmc/bungeecord.csv index 4ddb7684bc..5f349dd8d9 100644 --- a/results/combined/merges_timed/spigotmc/bungeecord.csv +++ b/results/combined/merges_timed/spigotmc/bungeecord.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -381,refs/remotes/origin/pull/3371,f61fa56a8a1ea5e8f471014a614f6aff85198900,75aa9eb93c3fa63038e33b682bdd1d19e22c26d9,ca8f31bdc70a2ec626274b4659b99732ec602969,,True,True,6ee17908cc61bda9bf0adfe3de861b1369efb1e7824d41ac411dcf3f29aa3d11,Tests_passed,96ffe75b7be6e3a284eec92a9e9288490db32a692ac0aa87c8a6204995bee633,Tests_passed,True,True,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,078f636bf448dc8b8705e67c04a22e344530b871295c7475c66582c8ccd488bc,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,0.03581833839416504,0.04290032386779785,0.057970523834228516,0.0571591854095459,0.05745649337768555,0.057672739028930664,0.057851314544677734,0.08434247970581055,0.042878150939941406,0.19424986839294434,0.1887679100036621,0.10061240196228027,1.0959999561309814,0.3181769847869873 +381,refs/remotes/origin/pull/3371,f61fa56a8a1ea5e8f471014a614f6aff85198900,75aa9eb93c3fa63038e33b682bdd1d19e22c26d9,ca8f31bdc70a2ec626274b4659b99732ec602969,,True,True,6ee17908cc61bda9bf0adfe3de861b1369efb1e7824d41ac411dcf3f29aa3d11,Tests_passed,96ffe75b7be6e3a284eec92a9e9288490db32a692ac0aa87c8a6204995bee633,Tests_passed,True,True,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,078f636bf448dc8b8705e67c04a22e344530b871295c7475c66582c8ccd488bc,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,0.03581833839416504,0.04290032386779785,0.057970523834228516,0.0571591854095459,0.05745649337768555,0.057672739028930664,0.057851314544677734,0.08434247970581055,0.042878150939941406,0.19185996055603027,0.19039154052734375,0.10061240196228027,1.0959999561309814,0.3181769847869873 diff --git a/results/combined/merges_timed/spinscale/dropwizard-jobs.csv b/results/combined/merges_timed/spinscale/dropwizard-jobs.csv index 68764c9f34..3ed899e1c2 100644 --- a/results/combined/merges_timed/spinscale/dropwizard-jobs.csv +++ b/results/combined/merges_timed/spinscale/dropwizard-jobs.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,f10957c9cc94f1aebe4eb4416353065fa0fc4ba1,2c65c4f0accaea4a891af4e8cd063b3c733a3a95,8f70c45b5d1ebb3d13081a504a66e686b52dae99,,True,True,e2e3fa4cc027cf9846be2fc5a9c019227dc2f044a8fe8628234e7e576d4f179a,Tests_passed,591c3c4baf550ce5eb82adbbfca17fdae086a3e951cda4972de6e0ff8a276109,Tests_passed,True,True,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Merge_failed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Merge_failed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,0.033475399017333984,0.014754056930541992,0.04237985610961914,0.04811453819274902,0.04627275466918945,0.04199671745300293,0.04508495330810547,0.16614246368408203,0.044910430908203125,0.10593390464782715,0.09367656707763672,0.11492800712585449,0.974041223526001,0.2147228717803955 +13,refs/heads/master,f10957c9cc94f1aebe4eb4416353065fa0fc4ba1,2c65c4f0accaea4a891af4e8cd063b3c733a3a95,8f70c45b5d1ebb3d13081a504a66e686b52dae99,,True,True,e2e3fa4cc027cf9846be2fc5a9c019227dc2f044a8fe8628234e7e576d4f179a,Tests_passed,591c3c4baf550ce5eb82adbbfca17fdae086a3e951cda4972de6e0ff8a276109,Tests_passed,True,True,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Merge_failed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Merge_failed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,0.033475399017333984,0.014754056930541992,0.04237985610961914,0.04811453819274902,0.04627275466918945,0.04199671745300293,0.04508495330810547,0.16614246368408203,0.044910430908203125,0.08244156837463379,0.0816812515258789,0.11492800712585449,0.974041223526001,0.2147228717803955 diff --git a/results/combined/merges_timed/splunk/splunk-library-javalogging.csv b/results/combined/merges_timed/splunk/splunk-library-javalogging.csv index a3fac65fc3..8436d3d264 100644 --- a/results/combined/merges_timed/splunk/splunk-library-javalogging.csv +++ b/results/combined/merges_timed/splunk/splunk-library-javalogging.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/main,eaabf143fcd981acedad944e96014590671bc8c5,f4c5d7d45b0dc154b2a4f2fedc4b02d0248767c9,256fc35520f005d938eda5b4bfb960c280a51580,,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,Tests_passed,47ca92145bf0073c74bb275215ae8322a50b96b68f71364744aaf45bb9d643e2,Tests_passed,True,True,True,True,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,0.012869119644165039,0.01305532455444336,0.014390230178833008,0.014469623565673828,0.014300823211669922,0.01484823226928711,0.015042781829833984,0.06598687171936035,0.013418912887573242,0.4512622356414795,0.4492611885070801,0.1744081974029541,2.417557954788208,0.1958143711090088 +13,refs/heads/main,eaabf143fcd981acedad944e96014590671bc8c5,f4c5d7d45b0dc154b2a4f2fedc4b02d0248767c9,256fc35520f005d938eda5b4bfb960c280a51580,,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,Tests_passed,47ca92145bf0073c74bb275215ae8322a50b96b68f71364744aaf45bb9d643e2,Tests_passed,True,True,True,True,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,0.012869119644165039,0.01305532455444336,0.014390230178833008,0.014469623565673828,0.014300823211669922,0.01484823226928711,0.015042781829833984,0.06598687171936035,0.013418912887573242,0.44624972343444824,0.45009589195251465,0.1744081974029541,2.417557954788208,0.1958143711090088 diff --git a/results/combined/merges_timed/spotify/apollo.csv b/results/combined/merges_timed/spotify/apollo.csv index 4101164409..b1e3c55c9c 100644 --- a/results/combined/merges_timed/spotify/apollo.csv +++ b/results/combined/merges_timed/spotify/apollo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -146,refs/heads/1.x,2fa878096eab6deaff1ea76fb125b0532bfd0eaa,44e3d9262d51874823f42ebd330599fb726a2627,54334ee2535a264d5994f3179ed89a576607e198,,True,True,3f2a34bb6f04d0802bec4291f7d94903105bcff640e0943d077223995ada3c80,Tests_passed,74ac13685abdc49322bb19abdfe0b21244c51647d4678e66d100b73186c04721,Tests_passed,True,True,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,0.06300663948059082,0.07809996604919434,0.046755075454711914,0.07096982002258301,0.0643620491027832,0.06816935539245605,0.07728242874145508,0.3040618896484375,0.031987905502319336,0.44571352005004883,0.44422411918640137,0.2470555305480957,1.6079597473144531,0.4427609443664551 +146,refs/heads/1.x,2fa878096eab6deaff1ea76fb125b0532bfd0eaa,44e3d9262d51874823f42ebd330599fb726a2627,54334ee2535a264d5994f3179ed89a576607e198,,True,True,3f2a34bb6f04d0802bec4291f7d94903105bcff640e0943d077223995ada3c80,Tests_passed,74ac13685abdc49322bb19abdfe0b21244c51647d4678e66d100b73186c04721,Tests_passed,True,True,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,0.06300663948059082,0.07809996604919434,0.046755075454711914,0.07096982002258301,0.0643620491027832,0.06816935539245605,0.07728242874145508,0.3040618896484375,0.031987905502319336,0.4386420249938965,0.439511775970459,0.2470555305480957,1.6079597473144531,0.4427609443664551 diff --git a/results/combined/merges_timed/spotify/dockerfile-maven.csv b/results/combined/merges_timed/spotify/dockerfile-maven.csv index 48472f42e7..e9a0c0e4ba 100644 --- a/results/combined/merges_timed/spotify/dockerfile-maven.csv +++ b/results/combined/merges_timed/spotify/dockerfile-maven.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -58,refs/remotes/origin/pull/59,e37bb5427d990c2dfc7aecd1e27b211b7f5a741c,b6070ff108f62ec925668b427f24e250e46cbaa9,ab2ff6ea5e9aa0e534b77d0bd9522da91ef9ad54,,True,True,726e6c0ff2eeda71db26fee3e309082b5906fbcebd132d65e2dc96ea23be5422,Tests_passed,76b95ce9a695abd1a80bb7b7c9c1ab677654c51343784aa09e7cd984150906c6,Tests_passed,True,True,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,0.04335927963256836,0.0442354679107666,0.04241204261779785,0.048003435134887695,0.04336905479431152,0.04075121879577637,0.04299187660217285,0.15304279327392578,0.04386425018310547,0.16137909889221191,0.16126680374145508,0.1180882453918457,0.7774229049682617,0.19003772735595703 +58,refs/remotes/origin/pull/59,e37bb5427d990c2dfc7aecd1e27b211b7f5a741c,b6070ff108f62ec925668b427f24e250e46cbaa9,ab2ff6ea5e9aa0e534b77d0bd9522da91ef9ad54,,True,True,726e6c0ff2eeda71db26fee3e309082b5906fbcebd132d65e2dc96ea23be5422,Tests_passed,76b95ce9a695abd1a80bb7b7c9c1ab677654c51343784aa09e7cd984150906c6,Tests_passed,True,True,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,0.04335927963256836,0.0442354679107666,0.04241204261779785,0.048003435134887695,0.04336905479431152,0.04075121879577637,0.04299187660217285,0.15304279327392578,0.04386425018310547,0.15906572341918945,0.15896892547607422,0.1180882453918457,0.7774229049682617,0.19003772735595703 diff --git a/results/combined/merges_timed/spotify/elasticsearch-index-window.csv b/results/combined/merges_timed/spotify/elasticsearch-index-window.csv index c848bcc303..73b265db34 100644 --- a/results/combined/merges_timed/spotify/elasticsearch-index-window.csv +++ b/results/combined/merges_timed/spotify/elasticsearch-index-window.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/remotes/origin/es_1.2.2/master,32d09a063be531c17ea178ffd24c1d250b560e80,5b3824bf910dc1fea1654f85fcc9c9c694b5b93c,ccf1d21762244db2a4231715da4fbfee4a0f2306,,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,b598a96eaeee7daeb50b1158a49626dc8ec0dda0c7855797644849dfda7515f1,Tests_passed,True,True,True,True,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,0.04086041450500488,0.04193449020385742,0.04231548309326172,0.04102921485900879,0.03837394714355469,0.009404897689819336,0.042809247970581055,0.15707612037658691,0.04227256774902344,0.15599894523620605,0.1563713550567627,0.11060738563537598,0.9588029384613037,0.18625402450561523 +1,refs/remotes/origin/es_1.2.2/master,32d09a063be531c17ea178ffd24c1d250b560e80,5b3824bf910dc1fea1654f85fcc9c9c694b5b93c,ccf1d21762244db2a4231715da4fbfee4a0f2306,,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,b598a96eaeee7daeb50b1158a49626dc8ec0dda0c7855797644849dfda7515f1,Tests_passed,True,True,True,True,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,0.04086041450500488,0.04193449020385742,0.04231548309326172,0.04102921485900879,0.03837394714355469,0.009404897689819336,0.042809247970581055,0.15707612037658691,0.04227256774902344,0.15538787841796875,0.15577363967895508,0.11060738563537598,0.9588029384613037,0.18625402450561523 diff --git a/results/combined/merges_timed/spotify/ffwd-java.csv b/results/combined/merges_timed/spotify/ffwd-java.csv index 9f242d569e..177eb6a035 100644 --- a/results/combined/merges_timed/spotify/ffwd-java.csv +++ b/results/combined/merges_timed/spotify/ffwd-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -72,refs/heads/master,f03fcf1bdf4070e224e56d26eb0d2da20d71bb9d,a66a58f4683f76cd189f7c976497b8d3b568722e,34934670b4760870bc03ee52ea80fc3ea32815c3,,True,True,8bd78f5802142070f576f5c30820424e9920556bb69a1bab3d14c15d80624163,Tests_passed,a67c13e0249d404dfb9d623d7289f385a2bae35904eb4996f27cdd7bb257d2f6,Tests_passed,True,True,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,0.02539658546447754,0.026096343994140625,0.03353595733642578,0.033066511154174805,0.033627986907958984,0.033824920654296875,0.033248186111450195,0.12299156188964844,0.025735139846801758,1.1411106586456299,1.1446185111999512,0.44967007637023926,4.795285940170288,0.22111082077026367 +72,refs/heads/master,f03fcf1bdf4070e224e56d26eb0d2da20d71bb9d,a66a58f4683f76cd189f7c976497b8d3b568722e,34934670b4760870bc03ee52ea80fc3ea32815c3,,True,True,8bd78f5802142070f576f5c30820424e9920556bb69a1bab3d14c15d80624163,Tests_passed,a67c13e0249d404dfb9d623d7289f385a2bae35904eb4996f27cdd7bb257d2f6,Tests_passed,True,True,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,0.02539658546447754,0.026096343994140625,0.03353595733642578,0.033066511154174805,0.033627986907958984,0.033824920654296875,0.033248186111450195,0.12299156188964844,0.025735139846801758,1.1491928100585938,1.1500294208526611,0.44967007637023926,4.795285940170288,0.22111082077026367 diff --git a/results/combined/merges_timed/spotify/hdfs2cass.csv b/results/combined/merges_timed/spotify/hdfs2cass.csv index 2ba6b845ca..c3337a99eb 100644 --- a/results/combined/merges_timed/spotify/hdfs2cass.csv +++ b/results/combined/merges_timed/spotify/hdfs2cass.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,d9ccc2bac7fe1bbb5a690b6a95ab80eac4e0fa36,7a757f461ac3132b81d96d92b7a033ca7c05bb45,f3a003a8385c087bbe4b372cfc5b3443696c2167,,True,True,55a8f0595daccbea9e464f212df864dc7c8becab629047ad413ee8045a6a75e5,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,True,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,0.04835939407348633,0.05001544952392578,0.04179024696350098,0.043401241302490234,0.047612905502319336,0.04718732833862305,0.0493931770324707,0.1671743392944336,0.04424309730529785,0.16368532180786133,0.1644432544708252,0.10576581954956055,0.8120906352996826,0.21009278297424316 +12,refs/heads/master,d9ccc2bac7fe1bbb5a690b6a95ab80eac4e0fa36,7a757f461ac3132b81d96d92b7a033ca7c05bb45,f3a003a8385c087bbe4b372cfc5b3443696c2167,,True,True,55a8f0595daccbea9e464f212df864dc7c8becab629047ad413ee8045a6a75e5,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,True,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,0.04835939407348633,0.05001544952392578,0.04179024696350098,0.043401241302490234,0.047612905502319336,0.04718732833862305,0.0493931770324707,0.1671743392944336,0.04424309730529785,0.16175532341003418,0.1612565517425537,0.10576581954956055,0.8120906352996826,0.21009278297424316 diff --git a/results/combined/merges_timed/spotify/netty-zmtp.csv b/results/combined/merges_timed/spotify/netty-zmtp.csv index e06e88d2a0..afb7ab7f47 100644 --- a/results/combined/merges_timed/spotify/netty-zmtp.csv +++ b/results/combined/merges_timed/spotify/netty-zmtp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/remotes/origin/pull/12,8d02651ebcbfc80ea17699b5547176248b2635c7,7effbc621510cc26959f25d09d5857b663f46550,21fd8022c592b2c294c77090c16654ebb493a1be,,True,True,cdc535f07b4716c09bc13a1e68c7f375a89c65152118382a129bef76c574b480,Tests_passed,6770f99f75ba645ec74aceb050a396d4616d279fb694a65a6e5f48b59d7728d1,Tests_passed,True,True,Merge_failed,cd38533dd9a73669a4bf3ee8be62d988eda7d8de6f95947d19d21036407055b7,Merge_failed,f0da4d372df28f317b2c39efd3b1eaf093bceb504c75d3b766b5024b041bae45,Merge_failed,cd38533dd9a73669a4bf3ee8be62d988eda7d8de6f95947d19d21036407055b7,Merge_failed,e28bc13307f648b2dfde05c0f75e6b337280a75703e403863ea8bf37cc041f13,Merge_failed,5640823c39e5c01cb5403d78541a7250864391982845d87ee814d942237fec71,Merge_failed,5640823c39e5c01cb5403d78541a7250864391982845d87ee814d942237fec71,Merge_failed,df93c015fb873d87f91c063098225912247eef48aeb3ec99799288242e538bd9,Merge_failed,b60d4e3956425ef521e612a008d1c48d444082a8ef36fe4af73886bc3f1377a1,Merge_failed,cd38533dd9a73669a4bf3ee8be62d988eda7d8de6f95947d19d21036407055b7,Merge_failed,bde6ffa5105031b087af904e75602016340f5d7e7d16ee6aba0481d4385ee196,Merge_failed,bde6ffa5105031b087af904e75602016340f5d7e7d16ee6aba0481d4385ee196,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c1bcd0ccb245361dbbf8ee9a3ebc490211535c0334c19c08271b805e20294e44,0.055075645446777344,0.055922508239746094,0.0539703369140625,0.04948925971984863,0.04944968223571777,0.05825376510620117,0.055877685546875,0.8547348976135254,0.1551363468170166,1.054243564605713,1.0537419319152832,0.7348642349243164,6.995342254638672,0.2307143211364746 +21,refs/remotes/origin/pull/12,8d02651ebcbfc80ea17699b5547176248b2635c7,7effbc621510cc26959f25d09d5857b663f46550,21fd8022c592b2c294c77090c16654ebb493a1be,,True,True,cdc535f07b4716c09bc13a1e68c7f375a89c65152118382a129bef76c574b480,Tests_passed,6770f99f75ba645ec74aceb050a396d4616d279fb694a65a6e5f48b59d7728d1,Tests_passed,True,True,Merge_failed,cd38533dd9a73669a4bf3ee8be62d988eda7d8de6f95947d19d21036407055b7,Merge_failed,f0da4d372df28f317b2c39efd3b1eaf093bceb504c75d3b766b5024b041bae45,Merge_failed,cd38533dd9a73669a4bf3ee8be62d988eda7d8de6f95947d19d21036407055b7,Merge_failed,e28bc13307f648b2dfde05c0f75e6b337280a75703e403863ea8bf37cc041f13,Merge_failed,5640823c39e5c01cb5403d78541a7250864391982845d87ee814d942237fec71,Merge_failed,5640823c39e5c01cb5403d78541a7250864391982845d87ee814d942237fec71,Merge_failed,df93c015fb873d87f91c063098225912247eef48aeb3ec99799288242e538bd9,Merge_failed,b60d4e3956425ef521e612a008d1c48d444082a8ef36fe4af73886bc3f1377a1,Merge_failed,cd38533dd9a73669a4bf3ee8be62d988eda7d8de6f95947d19d21036407055b7,Merge_failed,bde6ffa5105031b087af904e75602016340f5d7e7d16ee6aba0481d4385ee196,Merge_failed,bde6ffa5105031b087af904e75602016340f5d7e7d16ee6aba0481d4385ee196,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c1bcd0ccb245361dbbf8ee9a3ebc490211535c0334c19c08271b805e20294e44,0.055075645446777344,0.055922508239746094,0.0539703369140625,0.04948925971984863,0.04944968223571777,0.05825376510620117,0.055877685546875,0.8547348976135254,0.1551363468170166,1.0551371574401855,1.0534064769744873,0.7348642349243164,6.995342254638672,0.2307143211364746 diff --git a/results/combined/merges_timed/spoutcraft/legacylauncher.csv b/results/combined/merges_timed/spoutcraft/legacylauncher.csv index 2e1c715e9b..5ee4cc9607 100644 --- a/results/combined/merges_timed/spoutcraft/legacylauncher.csv +++ b/results/combined/merges_timed/spoutcraft/legacylauncher.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -42,refs/heads/master,75e5f920cfdd14b65def29aabf6fc7a981cfa82c,3957f69a5e30979056644a3ce9261ab03cd9e0ce,87a19ffce60d9f05c7a1206bbf107d1852fa952e,,True,True,e67be0dbf2347f747f6e3c4c77eb2b8c8a8423dfe6d5b206825112abf7e57572,Tests_passed,6f31180c12066cd3265cb088b8f010141fa1d04929949fb2e07fd9cd6f0bc2ba,Tests_passed,True,True,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,6523b7c559b5cb0ecb704ef304527e0f00929ab6c57b0bb336f3d04e53261545,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,0.011612653732299805,0.012366056442260742,0.012682199478149414,0.013003110885620117,0.012772321701049805,0.012521982192993164,0.01270294189453125,0.03854084014892578,0.011220693588256836,0.16457486152648926,0.16587185859680176,0.06647968292236328,1.4180631637573242,0.16974806785583496 +42,refs/heads/master,75e5f920cfdd14b65def29aabf6fc7a981cfa82c,3957f69a5e30979056644a3ce9261ab03cd9e0ce,87a19ffce60d9f05c7a1206bbf107d1852fa952e,,True,True,e67be0dbf2347f747f6e3c4c77eb2b8c8a8423dfe6d5b206825112abf7e57572,Tests_passed,6f31180c12066cd3265cb088b8f010141fa1d04929949fb2e07fd9cd6f0bc2ba,Tests_passed,True,True,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,6523b7c559b5cb0ecb704ef304527e0f00929ab6c57b0bb336f3d04e53261545,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,0.011612653732299805,0.012366056442260742,0.012682199478149414,0.013003110885620117,0.012772321701049805,0.012521982192993164,0.01270294189453125,0.03854084014892578,0.011220693588256836,0.16268038749694824,0.16152501106262207,0.06647968292236328,1.4180631637573242,0.16974806785583496 diff --git a/results/combined/merges_timed/spring-projects/spring-data-elasticsearch.csv b/results/combined/merges_timed/spring-projects/spring-data-elasticsearch.csv index 2232d67de1..037bc52b5f 100644 --- a/results/combined/merges_timed/spring-projects/spring-data-elasticsearch.csv +++ b/results/combined/merges_timed/spring-projects/spring-data-elasticsearch.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/main,923273955bba5524f566cc1df06955738772221f,7853e3da717c0e7316605796f3af7c888bde93b0,8b4da081eb68254dc4a12cdfa4fd68acc3623c4f,,True,True,0443b75acf5777a405f26f63cb6b91a3ec813c41afcfd67e4f12f00da7cf71ef,Tests_passed,fab8e5e895425947f043e9c8ca6ba4bc13b8bed4b4379ee6bcac33f28a24edf8,Tests_passed,True,True,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,0.06298828125,0.0325016975402832,0.043036699295043945,0.0440523624420166,0.047220468521118164,0.03683328628540039,0.045871734619140625,0.14998269081115723,0.04068470001220703,0.1687629222869873,0.16765093803405762,0.08961963653564453,1.1124932765960693,0.2716844081878662 +17,refs/heads/main,923273955bba5524f566cc1df06955738772221f,7853e3da717c0e7316605796f3af7c888bde93b0,8b4da081eb68254dc4a12cdfa4fd68acc3623c4f,,True,True,0443b75acf5777a405f26f63cb6b91a3ec813c41afcfd67e4f12f00da7cf71ef,Tests_passed,fab8e5e895425947f043e9c8ca6ba4bc13b8bed4b4379ee6bcac33f28a24edf8,Tests_passed,True,True,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,0.06298828125,0.0325016975402832,0.043036699295043945,0.0440523624420166,0.047220468521118164,0.03683328628540039,0.045871734619140625,0.14998269081115723,0.04068470001220703,0.16681790351867676,0.16771364212036133,0.08961963653564453,1.1124932765960693,0.2716844081878662 diff --git a/results/combined/merges_timed/spring-projects/spring-guice.csv b/results/combined/merges_timed/spring-projects/spring-guice.csv index 4ca4051b8b..c9881e4816 100644 --- a/results/combined/merges_timed/spring-projects/spring-guice.csv +++ b/results/combined/merges_timed/spring-projects/spring-guice.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/remotes/origin/pull/6,3cf16afb341868108e4b2bfd50dd6b80dec1880d,097a86e4a2005206aaa0701657afda65a1730265,1002284360c3ead3989c89d8f185aaf6f48943a0,,56a38d7ee159e751444d30b9cc5609a7a3f9f1435d9876c5a5aecbbeadf819bb,Tests_passed,7912f0e692e80a35cf51a88f0b816e71118aada0a890a6532833c1f54707ef2e,Tests_passed,True,True,True,True,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,e4a89858995b5b3a0cca4ca6b1ae482a530a7cf48a4e693d704d5c0b308e78b4,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,bca43fc380fbf929318f006a56858e9312a1aadd48d32aa5abb6d75e6c89ad03,Merge_failed,bca43fc380fbf929318f006a56858e9312a1aadd48d32aa5abb6d75e6c89ad03,Merge_failed,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,0bd07d848d5b3f7f544c2858dfc163cb1823c17e13c5cc51534378f24d6b7ad7,0.043654680252075195,0.043051719665527344,0.04335427284240723,0.049578189849853516,0.04160284996032715,0.040316104888916016,0.04358720779418945,0.2241971492767334,0.06382608413696289,0.08220934867858887,0.0826423168182373,0.15804648399353027,0.6402933597564697,0.19756627082824707 +2,refs/remotes/origin/pull/6,3cf16afb341868108e4b2bfd50dd6b80dec1880d,097a86e4a2005206aaa0701657afda65a1730265,1002284360c3ead3989c89d8f185aaf6f48943a0,,56a38d7ee159e751444d30b9cc5609a7a3f9f1435d9876c5a5aecbbeadf819bb,Tests_passed,7912f0e692e80a35cf51a88f0b816e71118aada0a890a6532833c1f54707ef2e,Tests_passed,True,True,True,True,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,e4a89858995b5b3a0cca4ca6b1ae482a530a7cf48a4e693d704d5c0b308e78b4,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,bca43fc380fbf929318f006a56858e9312a1aadd48d32aa5abb6d75e6c89ad03,Merge_failed,bca43fc380fbf929318f006a56858e9312a1aadd48d32aa5abb6d75e6c89ad03,Merge_failed,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,0bd07d848d5b3f7f544c2858dfc163cb1823c17e13c5cc51534378f24d6b7ad7,0.043654680252075195,0.043051719665527344,0.04335427284240723,0.049578189849853516,0.04160284996032715,0.040316104888916016,0.04358720779418945,0.2241971492767334,0.06382608413696289,0.0821237564086914,0.08159375190734863,0.15804648399353027,0.6402933597564697,0.19756627082824707 diff --git a/results/combined/merges_timed/sps/pushover4j.csv b/results/combined/merges_timed/sps/pushover4j.csv index 37bf616523..9ec677146e 100644 --- a/results/combined/merges_timed/sps/pushover4j.csv +++ b/results/combined/merges_timed/sps/pushover4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/remotes/origin/pull/11,88cd636fabef766f358a3a81d802a07e940a5ceb,552d38a52a74750342db1341dc0547a23b0e66ba,edd25b58e3dc39bb01e3305f27ca4b8841be38bc,,True,True,b4f52aecc8c8b4fc911d293c0dd059d1d5858ed74989b9c4ac929ada6d258925,Tests_passed,9dff968a536cc3c242a52f95638c895f20bd63963f3634f3a71ecbc153a12e1f,Tests_passed,True,True,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,b9ad70e485091e75893102eba64781f10a775f96a21c50abb8bead13741dddbc,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,b9ad70e485091e75893102eba64781f10a775f96a21c50abb8bead13741dddbc,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,88b3416928043aa47e2a5c150fcf201f1dce9446019ac61bda65c3f8df11a457,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,5b4dfea1b4601463674b0a13c437b84a1133603a0582294ead4c640ad1ad8f50,Merge_failed,5b4dfea1b4601463674b0a13c437b84a1133603a0582294ead4c640ad1ad8f50,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Merge_failed,ab7a2c1846e85d1e778b6c46955b237cdb5edf31478752637293e6635f820ec0,0.0385127067565918,0.04065680503845215,0.03860592842102051,0.03985857963562012,0.040575265884399414,0.0397489070892334,0.036165475845336914,0.2198195457458496,0.0657033920288086,0.2847018241882324,0.2845449447631836,0.15230512619018555,1.2205595970153809,0.18591094017028809 +8,refs/remotes/origin/pull/11,88cd636fabef766f358a3a81d802a07e940a5ceb,552d38a52a74750342db1341dc0547a23b0e66ba,edd25b58e3dc39bb01e3305f27ca4b8841be38bc,,True,True,b4f52aecc8c8b4fc911d293c0dd059d1d5858ed74989b9c4ac929ada6d258925,Tests_passed,9dff968a536cc3c242a52f95638c895f20bd63963f3634f3a71ecbc153a12e1f,Tests_passed,True,True,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,b9ad70e485091e75893102eba64781f10a775f96a21c50abb8bead13741dddbc,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,b9ad70e485091e75893102eba64781f10a775f96a21c50abb8bead13741dddbc,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,88b3416928043aa47e2a5c150fcf201f1dce9446019ac61bda65c3f8df11a457,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,5b4dfea1b4601463674b0a13c437b84a1133603a0582294ead4c640ad1ad8f50,Merge_failed,5b4dfea1b4601463674b0a13c437b84a1133603a0582294ead4c640ad1ad8f50,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Merge_failed,ab7a2c1846e85d1e778b6c46955b237cdb5edf31478752637293e6635f820ec0,0.0385127067565918,0.04065680503845215,0.03860592842102051,0.03985857963562012,0.040575265884399414,0.0397489070892334,0.036165475845336914,0.2198195457458496,0.0657033920288086,0.2843632698059082,0.2848501205444336,0.15230512619018555,1.2205595970153809,0.18591094017028809 diff --git a/results/combined/merges_timed/spullara/cli-parser.csv b/results/combined/merges_timed/spullara/cli-parser.csv index 782f11fa73..f79dea1d16 100644 --- a/results/combined/merges_timed/spullara/cli-parser.csv +++ b/results/combined/merges_timed/spullara/cli-parser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,a22d6462c8282339109510d2f810bc07fc09444c,2abb7cf0c7d114c33a521485910696d24f1e7ccb,7eac8a0be58bbcf8bfd82c64ec0a8c3f2fd572fe,,e51d6970040173af365bfe572f4f8a1bba650f21b06e9d2b205e6c74d0fb25ae,Tests_passed,1ee40283cef307e10d83bbf2db9fbe41d5acf38cf19480bf77a70403792e4cbf,Tests_passed,True,True,True,True,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,0.04181480407714844,0.041767120361328125,0.042313575744628906,0.04323601722717285,0.04053926467895508,0.04519796371459961,0.04488730430603027,0.09242367744445801,0.043221473693847656,0.16335844993591309,0.1637558937072754,0.10806798934936523,1.1725594997406006,0.19522547721862793 +4,refs/heads/master,a22d6462c8282339109510d2f810bc07fc09444c,2abb7cf0c7d114c33a521485910696d24f1e7ccb,7eac8a0be58bbcf8bfd82c64ec0a8c3f2fd572fe,,e51d6970040173af365bfe572f4f8a1bba650f21b06e9d2b205e6c74d0fb25ae,Tests_passed,1ee40283cef307e10d83bbf2db9fbe41d5acf38cf19480bf77a70403792e4cbf,Tests_passed,True,True,True,True,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,0.04181480407714844,0.041767120361328125,0.042313575744628906,0.04323601722717285,0.04053926467895508,0.04519796371459961,0.04488730430603027,0.09242367744445801,0.043221473693847656,0.16032004356384277,0.16170859336853027,0.10806798934936523,1.1725594997406006,0.19522547721862793 diff --git a/results/combined/merges_timed/spullara/java-future-jdk8.csv b/results/combined/merges_timed/spullara/java-future-jdk8.csv index d59499b3fc..3e6847090c 100644 --- a/results/combined/merges_timed/spullara/java-future-jdk8.csv +++ b/results/combined/merges_timed/spullara/java-future-jdk8.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/remotes/origin/jdk7,0e8ce31ebd03ba223dda4339601f61b8ffd53ace,fa524323c0baa78224724f5cf3fc4871a4648e80,5f9ff75e9c4894e2cacaea19d87c5bdf5c00e23e,,4e2a131c64eecbe0fb8936dab27bc856c2d180a28970affe87098d716d216a4e,Tests_passed,e057cba81f411c057ee988a51ecb046e23141ccaf9248c9af781b108d2187ad4,Tests_passed,True,True,True,True,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,7478d12b713baa2dd4a01bdd2797d17b7eafb83406a7422ab3061b90d7c8b62c,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,6c3e35a3666e9b8a104968e3c298f8a777463e3b7f4c67978652af094f29ede1,Merge_failed,6c3e35a3666e9b8a104968e3c298f8a777463e3b7f4c67978652af094f29ede1,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Merge_failed,0b427b860fde3a135b321190db47416b7ff895c378049ffd8c3028d653385154,0.027054548263549805,0.027018070220947266,0.014333248138427734,0.026520967483520508,0.026129484176635742,0.01507711410522461,0.020133018493652344,0.14643168449401855,0.04697608947753906,0.06299304962158203,0.06226992607116699,0.15822410583496094,1.1099374294281006,0.1758430004119873 +11,refs/remotes/origin/jdk7,0e8ce31ebd03ba223dda4339601f61b8ffd53ace,fa524323c0baa78224724f5cf3fc4871a4648e80,5f9ff75e9c4894e2cacaea19d87c5bdf5c00e23e,,4e2a131c64eecbe0fb8936dab27bc856c2d180a28970affe87098d716d216a4e,Tests_passed,e057cba81f411c057ee988a51ecb046e23141ccaf9248c9af781b108d2187ad4,Tests_passed,True,True,True,True,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,7478d12b713baa2dd4a01bdd2797d17b7eafb83406a7422ab3061b90d7c8b62c,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,6c3e35a3666e9b8a104968e3c298f8a777463e3b7f4c67978652af094f29ede1,Merge_failed,6c3e35a3666e9b8a104968e3c298f8a777463e3b7f4c67978652af094f29ede1,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Merge_failed,0b427b860fde3a135b321190db47416b7ff895c378049ffd8c3028d653385154,0.027054548263549805,0.027018070220947266,0.014333248138427734,0.026520967483520508,0.026129484176635742,0.01507711410522461,0.020133018493652344,0.14643168449401855,0.04697608947753906,0.06268548965454102,0.06265020370483398,0.15822410583496094,1.1099374294281006,0.1758430004119873 diff --git a/results/combined/merges_timed/square/burst.csv b/results/combined/merges_timed/square/burst.csv index 06f78fb76e..a1dafba15a 100644 --- a/results/combined/merges_timed/square/burst.csv +++ b/results/combined/merges_timed/square/burst.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/heads/master,08629234e54b58a5477fe85f3cb7ddc115e343db,dc83bd281d0fefd7638b8a4228d810221a1b0a0c,ee3143a23bc1ea3c1cf2a5d2c150ed3ffac08e35,,True,True,72d1bb911712919c24acd89d7729cdbad18a9ca0311c4f6b410c32aa72affbde,Tests_passed,20adda77977d15c38744d88224b928144162215bd388c8c934d97b45adafa5fc,Tests_passed,True,True,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,0.041535139083862305,0.043637990951538086,0.03125119209289551,0.04283595085144043,0.044558048248291016,0.04207468032836914,0.043247222900390625,0.16170740127563477,0.029468059539794922,0.14182138442993164,0.142181396484375,0.11283397674560547,0.5715217590332031,0.18695425987243652 +32,refs/heads/master,08629234e54b58a5477fe85f3cb7ddc115e343db,dc83bd281d0fefd7638b8a4228d810221a1b0a0c,ee3143a23bc1ea3c1cf2a5d2c150ed3ffac08e35,,True,True,72d1bb911712919c24acd89d7729cdbad18a9ca0311c4f6b410c32aa72affbde,Tests_passed,20adda77977d15c38744d88224b928144162215bd388c8c934d97b45adafa5fc,Tests_passed,True,True,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,0.041535139083862305,0.043637990951538086,0.03125119209289551,0.04283595085144043,0.044558048248291016,0.04207468032836914,0.043247222900390625,0.16170740127563477,0.029468059539794922,0.1420884132385254,0.14097809791564941,0.11283397674560547,0.5715217590332031,0.18695425987243652 diff --git a/results/combined/merges_timed/square/javapoet.csv b/results/combined/merges_timed/square/javapoet.csv index 4a1d6a62cb..819b30970f 100644 --- a/results/combined/merges_timed/square/javapoet.csv +++ b/results/combined/merges_timed/square/javapoet.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -393,refs/remotes/origin/pull/681,51a233ea132edf4d94c9b88a2dc6d4ce6e673953,23210ddf289ad3d5b9ddf22b016c32c7c9a577da,e9460b84fc41464c2aa2ef85c84dd1ac87ae1692,,e2e6681ffed01a198e0202a4622d74974dbb14499d3016111d36086671b9be1c,Tests_passed,48202a6ffdeddbfd6fce3b795943220c15ad35c63b5be60cbfb590bb2121b9a7,Tests_passed,True,True,True,True,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,d2fb2021d8f7c27ba9dbeb04c8403a964fa297630b9e799f7309486af908ccdd,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Merge_failed,e58f9421b970facb202f03992c6cf1af2deb94ee13fcd2416e007c9840613b95,Tests_passed,4265762ca47b106693710521108d246822d5344a5b9dbc9c39e39e511bce8c81,Merge_failed,ff1340e865b260488d30ef78e9e636fde111ef23eebdff77da3814ee059aed8c,0.04164004325866699,0.03193950653076172,0.04573655128479004,0.048374176025390625,0.0348658561706543,0.0527338981628418,0.04807615280151367,0.17081522941589355,0.08014941215515137,0.15935969352722168,0.15860486030578613,0.11350131034851074,0.9764175415039062,0.23201894760131836 +393,refs/remotes/origin/pull/681,51a233ea132edf4d94c9b88a2dc6d4ce6e673953,23210ddf289ad3d5b9ddf22b016c32c7c9a577da,e9460b84fc41464c2aa2ef85c84dd1ac87ae1692,,e2e6681ffed01a198e0202a4622d74974dbb14499d3016111d36086671b9be1c,Tests_passed,48202a6ffdeddbfd6fce3b795943220c15ad35c63b5be60cbfb590bb2121b9a7,Tests_passed,True,True,True,True,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,d2fb2021d8f7c27ba9dbeb04c8403a964fa297630b9e799f7309486af908ccdd,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Merge_failed,e58f9421b970facb202f03992c6cf1af2deb94ee13fcd2416e007c9840613b95,Tests_passed,4265762ca47b106693710521108d246822d5344a5b9dbc9c39e39e511bce8c81,Merge_failed,ff1340e865b260488d30ef78e9e636fde111ef23eebdff77da3814ee059aed8c,0.04164004325866699,0.03193950653076172,0.04573655128479004,0.048374176025390625,0.0348658561706543,0.0527338981628418,0.04807615280151367,0.17081522941589355,0.08014941215515137,0.159559965133667,0.16035246849060059,0.11350131034851074,0.9764175415039062,0.23201894760131836 diff --git a/results/combined/merges_timed/srdc/ontmalizer.csv b/results/combined/merges_timed/srdc/ontmalizer.csv index ec4f7165f3..6e79b27d48 100644 --- a/results/combined/merges_timed/srdc/ontmalizer.csv +++ b/results/combined/merges_timed/srdc/ontmalizer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,b20eed45e9a12168948f7c951699f7d2533356e9,92303866bd71e360416678e98c895e8f49dfb0d5,535e8c7861e8f22b042f46f624e5551a85bbde9b,,True,True,e9a250ca003f14fbfe09bf418f5b6bde5499f78658d501b59f29eebd25631b09,Tests_passed,40a96c12c202781df45badc26d0df7644d9cfee73b84a7518f09d9f3597c3a32,Tests_passed,True,True,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,0.041312456130981445,0.031078577041625977,0.04424786567687988,0.05993843078613281,0.03132009506225586,0.04942965507507324,0.03839278221130371,0.09991240501403809,0.04287528991699219,0.17439603805541992,0.17261791229248047,0.10624837875366211,1.4558322429656982,0.1781148910522461 +11,refs/heads/master,b20eed45e9a12168948f7c951699f7d2533356e9,92303866bd71e360416678e98c895e8f49dfb0d5,535e8c7861e8f22b042f46f624e5551a85bbde9b,,True,True,e9a250ca003f14fbfe09bf418f5b6bde5499f78658d501b59f29eebd25631b09,Tests_passed,40a96c12c202781df45badc26d0df7644d9cfee73b84a7518f09d9f3597c3a32,Tests_passed,True,True,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,0.041312456130981445,0.031078577041625977,0.04424786567687988,0.05993843078613281,0.03132009506225586,0.04942965507507324,0.03839278221130371,0.09991240501403809,0.04287528991699219,0.17064976692199707,0.1714942455291748,0.10624837875366211,1.4558322429656982,0.1781148910522461 diff --git a/results/combined/merges_timed/srt/asterisk-java.csv b/results/combined/merges_timed/srt/asterisk-java.csv index 572a4ce991..fdde138912 100644 --- a/results/combined/merges_timed/srt/asterisk-java.csv +++ b/results/combined/merges_timed/srt/asterisk-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -246,refs/heads/master,a4b27137cc92af086da78fdfb634a441cb07e1d0,d99448f4a1021ad00bc2d75899852f6216cb62ed,93cdc9400b591aa3696bb2c07da548985123feb3,,834ad6bf4657505b30c60af9cbb4c03fb4587ba30e7219bfe9dd98f15f78690d,Tests_passed,1f2e983d86b24afdbff5f3f8e08fcd61965a41351ef0040d23d3eadda256a9f1,Tests_passed,True,True,True,True,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,3b6246c1ba273090daf815ef99b7a09f54168ac10337e5a3af2001ca9e0a89fc,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,9b835af19cf5058e05159cdb871296b5e5ee9e48efeffe6e3d12bf0b2dc794fb,Merge_failed,631dcee78096562a66f9fd398edda208dae6cb6b56b7c257753c5f0ba08e9432,Merge_failed,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,bfec755b7828093274620c70023065911184c651fd4318081f6f90989c4e80f5,Merge_failed,2bc5141faa3c32dbcf446c03b7e010b82786ed6895101618d0a96e05c238c01a,0.025496482849121094,0.03514742851257324,0.027884483337402344,0.028696775436401367,0.027953624725341797,0.027448415756225586,0.04669499397277832,0.10853219032287598,0.0640561580657959,0.2924458980560303,0.2941286563873291,0.19387555122375488,1.107546091079712,0.5804450511932373 +246,refs/heads/master,a4b27137cc92af086da78fdfb634a441cb07e1d0,d99448f4a1021ad00bc2d75899852f6216cb62ed,93cdc9400b591aa3696bb2c07da548985123feb3,,834ad6bf4657505b30c60af9cbb4c03fb4587ba30e7219bfe9dd98f15f78690d,Tests_passed,1f2e983d86b24afdbff5f3f8e08fcd61965a41351ef0040d23d3eadda256a9f1,Tests_passed,True,True,True,True,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,3b6246c1ba273090daf815ef99b7a09f54168ac10337e5a3af2001ca9e0a89fc,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,9b835af19cf5058e05159cdb871296b5e5ee9e48efeffe6e3d12bf0b2dc794fb,Merge_failed,631dcee78096562a66f9fd398edda208dae6cb6b56b7c257753c5f0ba08e9432,Merge_failed,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,bfec755b7828093274620c70023065911184c651fd4318081f6f90989c4e80f5,Merge_failed,2bc5141faa3c32dbcf446c03b7e010b82786ed6895101618d0a96e05c238c01a,0.025496482849121094,0.03514742851257324,0.027884483337402344,0.028696775436401367,0.027953624725341797,0.027448415756225586,0.04669499397277832,0.10853219032287598,0.0640561580657959,0.3524482250213623,0.2988440990447998,0.19387555122375488,1.107546091079712,0.5804450511932373 diff --git a/results/combined/merges_timed/sstrickx/yahoofinance-api.csv b/results/combined/merges_timed/sstrickx/yahoofinance-api.csv index 1dfe3b2cd7..6578d4cb30 100644 --- a/results/combined/merges_timed/sstrickx/yahoofinance-api.csv +++ b/results/combined/merges_timed/sstrickx/yahoofinance-api.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -59,refs/remotes/origin/pull/177,c56607f37b486c62e41828b51ac752381d2974a3,1ad6c0d50ee724a2102cb3771ffe1fa93b4f5764,f06a1c19bed4df9b6ca31df7d293ac3ae7691a9c,,True,True,96e2cbbf850b49e779ba8187bf989dfe7f02efd2bb12f8baa65231db43ac54cc,Tests_passed,46c1136d45572937624c8f0c9a04adbb3a80360652f02d07e764534d3bbad1f4,Tests_passed,True,True,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,0.04486656188964844,0.04787135124206543,0.04181408882141113,0.04328632354736328,0.04027986526489258,0.041587114334106445,0.051138877868652344,0.16675615310668945,0.04143857955932617,0.14250826835632324,0.1421823501586914,0.08397936820983887,0.5200858116149902,0.2009873390197754 +59,refs/remotes/origin/pull/177,c56607f37b486c62e41828b51ac752381d2974a3,1ad6c0d50ee724a2102cb3771ffe1fa93b4f5764,f06a1c19bed4df9b6ca31df7d293ac3ae7691a9c,,True,True,96e2cbbf850b49e779ba8187bf989dfe7f02efd2bb12f8baa65231db43ac54cc,Tests_passed,46c1136d45572937624c8f0c9a04adbb3a80360652f02d07e764534d3bbad1f4,Tests_passed,True,True,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,0.04486656188964844,0.04787135124206543,0.04181408882141113,0.04328632354736328,0.04027986526489258,0.041587114334106445,0.051138877868652344,0.16675615310668945,0.04143857955932617,0.14174175262451172,0.14203739166259766,0.08397936820983887,0.5200858116149902,0.2009873390197754 diff --git a/results/combined/merges_timed/stackforge/monasca-common.csv b/results/combined/merges_timed/stackforge/monasca-common.csv index 6a90181f7c..531022bb28 100644 --- a/results/combined/merges_timed/stackforge/monasca-common.csv +++ b/results/combined/merges_timed/stackforge/monasca-common.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -114,refs/heads/master,856542f7e63ab0de3f7dcd4c6428ae30210a4ee0,f45ef6a540ca83b78fa11330201eeaed529b70d1,d832aeed98ccae4a192c61d24513b358f7837f69,,True,True,14a6d00455b889e908fd0aeb80b1591b99e2e3668493ec2954be193e809dcc96,Tests_passed,62be44340c23642979c33b417de7f5cc9a0315cb1a054ba735e2c2211aac638c,Tests_passed,True,True,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,0.03691983222961426,0.03333091735839844,0.04592490196228027,0.02376270294189453,0.029520034790039062,0.025876760482788086,0.03501749038696289,0.1588304042816162,0.046914100646972656,0.1595907211303711,0.1587812900543213,0.11148309707641602,0.7451493740081787,0.2148301601409912 +114,refs/heads/master,856542f7e63ab0de3f7dcd4c6428ae30210a4ee0,f45ef6a540ca83b78fa11330201eeaed529b70d1,d832aeed98ccae4a192c61d24513b358f7837f69,,True,True,14a6d00455b889e908fd0aeb80b1591b99e2e3668493ec2954be193e809dcc96,Tests_passed,62be44340c23642979c33b417de7f5cc9a0315cb1a054ba735e2c2211aac638c,Tests_passed,True,True,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,0.03691983222961426,0.03333091735839844,0.04592490196228027,0.02376270294189453,0.029520034790039062,0.025876760482788086,0.03501749038696289,0.1588304042816162,0.046914100646972656,0.1588146686553955,0.15952229499816895,0.11148309707641602,0.7451493740081787,0.2148301601409912 diff --git a/results/combined/merges_timed/stapler/stapler.csv b/results/combined/merges_timed/stapler/stapler.csv index 1da3e16598..3789c3a82b 100644 --- a/results/combined/merges_timed/stapler/stapler.csv +++ b/results/combined/merges_timed/stapler/stapler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,e4c10835694bc8f5db30ffa1c15c50469c60acd8,93a11d2d52296fb4b622a61baa26c1d7a6a84fc1,a9519c27c7c26e92706ae40f03a75ba002e21f6f,,True,True,105ec030e9c33296de9002d165d8cc09c95586fa5b615f81613af28af71929af,Tests_passed,50730b41fe09bb9bc597bdd89773766c895275de7426d87f7cf97850ae4af7d0,Tests_passed,True,True,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,0.027306318283081055,0.028360843658447266,0.039819955825805664,0.02346348762512207,0.02395176887512207,0.045267581939697266,0.03314805030822754,0.16994190216064453,0.014981746673583984,0.1594841480255127,0.15719366073608398,0.08597636222839355,0.6681013107299805,0.3209266662597656 +6,refs/heads/master,e4c10835694bc8f5db30ffa1c15c50469c60acd8,93a11d2d52296fb4b622a61baa26c1d7a6a84fc1,a9519c27c7c26e92706ae40f03a75ba002e21f6f,,True,True,105ec030e9c33296de9002d165d8cc09c95586fa5b615f81613af28af71929af,Tests_passed,50730b41fe09bb9bc597bdd89773766c895275de7426d87f7cf97850ae4af7d0,Tests_passed,True,True,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,0.027306318283081055,0.028360843658447266,0.039819955825805664,0.02346348762512207,0.02395176887512207,0.045267581939697266,0.03314805030822754,0.16994190216064453,0.014981746673583984,0.16733098030090332,0.16757726669311523,0.08597636222839355,0.6681013107299805,0.3209266662597656 diff --git a/results/combined/merges_timed/statefulj/statefulj.csv b/results/combined/merges_timed/statefulj/statefulj.csv index 1bac8ed9f9..507d22e177 100644 --- a/results/combined/merges_timed/statefulj/statefulj.csv +++ b/results/combined/merges_timed/statefulj/statefulj.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,04a51e8f65b0c1d909e035b63f77a12578cf0611,2fd1ec4bc04c51134b4d8f9be03713bf41cf47ef,68f69b76111e99a70e13b00fcc186531eb2cbdcf,,True,True,7780dbed8659d784b31a924e4d8eecbe72642a1f2ea88080f7fee7f04b3efa45,Tests_passed,8ab6c1b017b3ebd08f66fb343f3f7cef463c4a3e4ccfc91d3d6616e30e5a59f4,Tests_passed,True,True,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,0.03967857360839844,0.04439973831176758,0.04187130928039551,0.047775983810424805,0.042815446853637695,0.03521609306335449,0.04176783561706543,0.17615175247192383,0.013846874237060547,0.16371536254882812,0.16432499885559082,0.11277389526367188,0.6611871719360352,0.20617341995239258 +2,refs/heads/master,04a51e8f65b0c1d909e035b63f77a12578cf0611,2fd1ec4bc04c51134b4d8f9be03713bf41cf47ef,68f69b76111e99a70e13b00fcc186531eb2cbdcf,,True,True,7780dbed8659d784b31a924e4d8eecbe72642a1f2ea88080f7fee7f04b3efa45,Tests_passed,8ab6c1b017b3ebd08f66fb343f3f7cef463c4a3e4ccfc91d3d6616e30e5a59f4,Tests_passed,True,True,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,0.03967857360839844,0.04439973831176758,0.04187130928039551,0.047775983810424805,0.042815446853637695,0.03521609306335449,0.04176783561706543,0.17615175247192383,0.013846874237060547,0.16247153282165527,0.16504311561584473,0.11277389526367188,0.6611871719360352,0.20617341995239258 diff --git a/results/combined/merges_timed/stealthly/xml-avro.csv b/results/combined/merges_timed/stealthly/xml-avro.csv index 1c11bcc05e..20c8ea36d7 100644 --- a/results/combined/merges_timed/stealthly/xml-avro.csv +++ b/results/combined/merges_timed/stealthly/xml-avro.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,4cadd7d11f80af746499bcba731b0559642e621e,ac3bea4c04b2d23c845194634ab600d700989a37,9b30127c7477a4977b3a01198b06a334a229691e,,c01c9bd493a0bec33888edebebf8a2960416874d5cb5995fe54506a1d48e6f74,Tests_passed,504469fcf40bd00d054cea9564f90575d4bf1fbce2e62023b5f75a8675a1490d,Tests_passed,True,True,True,True,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,0.04396247863769531,0.04432868957519531,0.04644346237182617,0.042690277099609375,0.04962754249572754,0.05124497413635254,0.050194740295410156,0.2955362796783447,0.03647732734680176,0.3017094135284424,0.30425310134887695,0.22114086151123047,2.000974655151367,0.18495559692382812 +7,refs/heads/master,4cadd7d11f80af746499bcba731b0559642e621e,ac3bea4c04b2d23c845194634ab600d700989a37,9b30127c7477a4977b3a01198b06a334a229691e,,c01c9bd493a0bec33888edebebf8a2960416874d5cb5995fe54506a1d48e6f74,Tests_passed,504469fcf40bd00d054cea9564f90575d4bf1fbce2e62023b5f75a8675a1490d,Tests_passed,True,True,True,True,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,0.04396247863769531,0.04432868957519531,0.04644346237182617,0.042690277099609375,0.04962754249572754,0.05124497413635254,0.050194740295410156,0.2955362796783447,0.03647732734680176,0.3129086494445801,0.29787349700927734,0.22114086151123047,2.000974655151367,0.18495559692382812 diff --git a/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv b/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv index f52750b5a6..5710fe5407 100644 --- a/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv +++ b/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,fa32851fce4806699ba6828e72e145fd0107837b,90456df635b83ac37be5033d96e119f530546d5e,846229488ab051e5265797975731d9cd8ae212ad,,True,True,bc6e14b3e17641792dbbbd6ef8e66a86acdbab4678d16b7996d5eb9e3db49848,Tests_passed,57cc38753454497d67a6657a342c1c0cc4b2865738524f4c2fbc3a52174cc3ab,Tests_passed,True,True,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,7857064672993b15305d334f2dea2d4651a31402a9e971bce36bc46dd8aa531a,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,6b679b853106df6a33be2e83906d960cd00691a302e2aaec90d10cbba2da528a,Merge_failed,6b679b853106df6a33be2e83906d960cd00691a302e2aaec90d10cbba2da528a,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Merge_failed,1eb3eacf9fef4ae0bf30ff2b3ae674993e2d391fabe11f50e366aa6af0a54d89,0.022198200225830078,0.021750926971435547,0.023116111755371094,0.02328968048095703,0.024184703826904297,0.02344965934753418,0.023403406143188477,0.07099533081054688,0.03534388542175293,0.2539947032928467,0.2512550354003906,0.14589500427246094,1.235701084136963,0.28496789932250977 +6,refs/heads/master,fa32851fce4806699ba6828e72e145fd0107837b,90456df635b83ac37be5033d96e119f530546d5e,846229488ab051e5265797975731d9cd8ae212ad,,True,True,bc6e14b3e17641792dbbbd6ef8e66a86acdbab4678d16b7996d5eb9e3db49848,Tests_passed,57cc38753454497d67a6657a342c1c0cc4b2865738524f4c2fbc3a52174cc3ab,Tests_passed,True,True,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,7857064672993b15305d334f2dea2d4651a31402a9e971bce36bc46dd8aa531a,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,6b679b853106df6a33be2e83906d960cd00691a302e2aaec90d10cbba2da528a,Merge_failed,6b679b853106df6a33be2e83906d960cd00691a302e2aaec90d10cbba2da528a,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Merge_failed,1eb3eacf9fef4ae0bf30ff2b3ae674993e2d391fabe11f50e366aa6af0a54d89,0.022198200225830078,0.021750926971435547,0.023116111755371094,0.02328968048095703,0.024184703826904297,0.02344965934753418,0.023403406143188477,0.07099533081054688,0.03534388542175293,0.24652314186096191,0.24670028686523438,0.14589500427246094,1.235701084136963,0.28496789932250977 diff --git a/results/combined/merges_timed/stephenc/high-scale-lib.csv b/results/combined/merges_timed/stephenc/high-scale-lib.csv index daafe4e9ce..2f82c403b6 100644 --- a/results/combined/merges_timed/stephenc/high-scale-lib.csv +++ b/results/combined/merges_timed/stephenc/high-scale-lib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,2d63f18a07e62c62e5e72666a35d36bacbe95798,a8867cd95e0131f8c2fd9c757c6550d2e3a5aaba,634dceae3ff00fc9ae1b533dc77e5e53f969817e,,a7ec06cd2c0def7c6c313ab0a02b06ba721613f829754576fb694db950fc9de3,Tests_passed,dfc44ff8513b67e1bad86a919a8cdcf6d11563b2fa4d18ccc57d4ea75e4f5c71,Tests_passed,True,True,True,True,Merge_failed,d66894c36030017f9125a5bb498c064f1572b7116ae4538498b3eea9da1af63b,Merge_failed,d66894c36030017f9125a5bb498c064f1572b7116ae4538498b3eea9da1af63b,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,c7cba76614a2a7866eb6154868513f6c6aaf079efdc6ba630c26016d4fa019d1,Merge_failed,d66894c36030017f9125a5bb498c064f1572b7116ae4538498b3eea9da1af63b,Merge_failed,b54a49b456b98b341ce582cf169b2360bd43f7a47b9f86346420cedbee35d1b1,Merge_failed,b54a49b456b98b341ce582cf169b2360bd43f7a47b9f86346420cedbee35d1b1,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,2b351ca15081d3a8b7ae16c58d7507bff86483185b3c7d5776b8ea963619394f,Merge_failed,1603069cf0e47cb88b1263ecf0e840e996678a9db83b3b1b8b9ee85597c0b06c,0.049782752990722656,0.047698974609375,0.0700535774230957,0.06124281883239746,0.06251645088195801,0.0416109561920166,0.053411006927490234,0.796644926071167,0.09415841102600098,0.2540910243988037,0.25597667694091797,0.45923352241516113,4.700870990753174,0.2915780544281006 +3,refs/heads/master,2d63f18a07e62c62e5e72666a35d36bacbe95798,a8867cd95e0131f8c2fd9c757c6550d2e3a5aaba,634dceae3ff00fc9ae1b533dc77e5e53f969817e,,a7ec06cd2c0def7c6c313ab0a02b06ba721613f829754576fb694db950fc9de3,Tests_passed,dfc44ff8513b67e1bad86a919a8cdcf6d11563b2fa4d18ccc57d4ea75e4f5c71,Tests_passed,True,True,True,True,Merge_failed,d66894c36030017f9125a5bb498c064f1572b7116ae4538498b3eea9da1af63b,Merge_failed,d66894c36030017f9125a5bb498c064f1572b7116ae4538498b3eea9da1af63b,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,b0e335e2c814249b6cfdb8e850c7c5342708fb9263693a77f241d648cde1dca4,Merge_failed,c7cba76614a2a7866eb6154868513f6c6aaf079efdc6ba630c26016d4fa019d1,Merge_failed,d66894c36030017f9125a5bb498c064f1572b7116ae4538498b3eea9da1af63b,Merge_failed,b54a49b456b98b341ce582cf169b2360bd43f7a47b9f86346420cedbee35d1b1,Merge_failed,b54a49b456b98b341ce582cf169b2360bd43f7a47b9f86346420cedbee35d1b1,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,2b351ca15081d3a8b7ae16c58d7507bff86483185b3c7d5776b8ea963619394f,Merge_failed,1603069cf0e47cb88b1263ecf0e840e996678a9db83b3b1b8b9ee85597c0b06c,0.049782752990722656,0.047698974609375,0.0700535774230957,0.06124281883239746,0.06251645088195801,0.0416109561920166,0.053411006927490234,0.796644926071167,0.09415841102600098,0.2434096336364746,0.24329900741577148,0.45923352241516113,4.700870990753174,0.2915780544281006 diff --git a/results/combined/merges_timed/stephenc/java-iso-tools.csv b/results/combined/merges_timed/stephenc/java-iso-tools.csv index 3e0e7e87dc..f8fecccf1d 100644 --- a/results/combined/merges_timed/stephenc/java-iso-tools.csv +++ b/results/combined/merges_timed/stephenc/java-iso-tools.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/main,abb37e3cfda2f2774f128d2a4f8299b4d721b452,f1d38f9cb55dfda2daa2fdcc17450748d48e5b69,e19d5289c8764302aa3b53fabaf9b1d03742d5d6,,True,True,cf6ee7b8f349e6091661786faf71744a24ed828424573aeafeabfa71d8b7e581,Tests_passed,1b211d7188d7dcec5f00c10c2e40047a2281ccfbb5ead8a303a1bde7b9958485,Tests_passed,True,True,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,14ed9e52818ddfc4afde292df8ef9994c9e734779497696f0b07364f0873cb87,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,14ed9e52818ddfc4afde292df8ef9994c9e734779497696f0b07364f0873cb87,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,9c05a984098a3fa0c4e2e3708454523f67e30cfdea032124e45d9768abef6dc4,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,39090be796b7e9f4e9af7e1fb31d77f2c8b90eac258bd864e4810ca38e42fcc1,Merge_failed,378e919f14f338408089245ecca356106526e03c1d84c0a687eca030ad1effed,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,1ce65bf3b92d87f0970e31767226b6d380ccf770e44d6d78699b5abea3ed1836,Merge_failed,39090be796b7e9f4e9af7e1fb31d77f2c8b90eac258bd864e4810ca38e42fcc1,0.053295135498046875,0.051064252853393555,0.04543638229370117,0.04497671127319336,0.026882410049438477,0.04539132118225098,0.028838634490966797,0.21299099922180176,0.055166006088256836,0.1620185375213623,0.16155529022216797,0.16507482528686523,0.7602548599243164,0.24215984344482422 +6,refs/heads/main,abb37e3cfda2f2774f128d2a4f8299b4d721b452,f1d38f9cb55dfda2daa2fdcc17450748d48e5b69,e19d5289c8764302aa3b53fabaf9b1d03742d5d6,,True,True,cf6ee7b8f349e6091661786faf71744a24ed828424573aeafeabfa71d8b7e581,Tests_passed,1b211d7188d7dcec5f00c10c2e40047a2281ccfbb5ead8a303a1bde7b9958485,Tests_passed,True,True,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,14ed9e52818ddfc4afde292df8ef9994c9e734779497696f0b07364f0873cb87,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,14ed9e52818ddfc4afde292df8ef9994c9e734779497696f0b07364f0873cb87,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,9c05a984098a3fa0c4e2e3708454523f67e30cfdea032124e45d9768abef6dc4,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,39090be796b7e9f4e9af7e1fb31d77f2c8b90eac258bd864e4810ca38e42fcc1,Merge_failed,378e919f14f338408089245ecca356106526e03c1d84c0a687eca030ad1effed,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,1ce65bf3b92d87f0970e31767226b6d380ccf770e44d6d78699b5abea3ed1836,Merge_failed,39090be796b7e9f4e9af7e1fb31d77f2c8b90eac258bd864e4810ca38e42fcc1,0.053295135498046875,0.051064252853393555,0.04543638229370117,0.04497671127319336,0.026882410049438477,0.04539132118225098,0.028838634490966797,0.21299099922180176,0.055166006088256836,0.1587975025177002,0.15485715866088867,0.16507482528686523,0.7602548599243164,0.24215984344482422 diff --git a/results/combined/merges_timed/steveice10/mcprotocollib.csv b/results/combined/merges_timed/steveice10/mcprotocollib.csv index 81aad98932..4de21b2b80 100644 --- a/results/combined/merges_timed/steveice10/mcprotocollib.csv +++ b/results/combined/merges_timed/steveice10/mcprotocollib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -112,refs/heads/master,36e5eafd286fc1d6a554487a0a2e2f18032ece1a,f2b170bbca9eb8fed073b1c389d52ce2ca509f24,a9d83ee61b1a4ad48066c3ed4ceff0717eda6796,,True,True,105f29957a5295bf856c8ee07577efa08078758f39f0b341a03231d5f8efc83b,Tests_passed,a426c1f152032b27ed36222ecffe1c1c78a458cc3293cd720518a3a4c358a72e,Tests_passed,True,True,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,d773039d5e9321de7a5068d0b90489f235408915701162fa054886bc72604c2d,Merge_failed,d773039d5e9321de7a5068d0b90489f235408915701162fa054886bc72604c2d,Merge_failed,d773039d5e9321de7a5068d0b90489f235408915701162fa054886bc72604c2d,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,f2ac199b8ba6a7a3cc75e15c190ada6538f7e66e5b0b6d674541726e9df55f10,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,66206cedf5845e2a25c4e1d61ea307168751b161db64bb37f18750c28f379f81,Merge_failed,66206cedf5845e2a25c4e1d61ea307168751b161db64bb37f18750c28f379f81,Merge_failed,265f353be98a3521aa1d246329aea30386e231fd6ce939e18c17ca5bd686c336,Merge_failed,c67a5b0b1c5b75b764d64cff01515b212faa833a7b49f62226c53b3718c8acc8,Merge_failed,c7064249d10f688a2bdaf359a2424a803fd5575f63883884ba3ad52307f6183c,0.049477338790893555,0.04834914207458496,0.06033468246459961,0.043663978576660156,0.05930042266845703,0.05095171928405762,0.04589509963989258,0.22457575798034668,0.029387950897216797,0.18590641021728516,0.1822810173034668,0.21477341651916504,4.416977643966675,0.2668635845184326 +112,refs/heads/master,36e5eafd286fc1d6a554487a0a2e2f18032ece1a,f2b170bbca9eb8fed073b1c389d52ce2ca509f24,a9d83ee61b1a4ad48066c3ed4ceff0717eda6796,,True,True,105f29957a5295bf856c8ee07577efa08078758f39f0b341a03231d5f8efc83b,Tests_passed,a426c1f152032b27ed36222ecffe1c1c78a458cc3293cd720518a3a4c358a72e,Tests_passed,True,True,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,d773039d5e9321de7a5068d0b90489f235408915701162fa054886bc72604c2d,Merge_failed,d773039d5e9321de7a5068d0b90489f235408915701162fa054886bc72604c2d,Merge_failed,d773039d5e9321de7a5068d0b90489f235408915701162fa054886bc72604c2d,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,f2ac199b8ba6a7a3cc75e15c190ada6538f7e66e5b0b6d674541726e9df55f10,Merge_failed,f3f252f5f92364a8771ca17360c0da438fc2a9df094feb9f3b7b8a9960d707be,Merge_failed,66206cedf5845e2a25c4e1d61ea307168751b161db64bb37f18750c28f379f81,Merge_failed,66206cedf5845e2a25c4e1d61ea307168751b161db64bb37f18750c28f379f81,Merge_failed,265f353be98a3521aa1d246329aea30386e231fd6ce939e18c17ca5bd686c336,Merge_failed,c67a5b0b1c5b75b764d64cff01515b212faa833a7b49f62226c53b3718c8acc8,Merge_failed,c7064249d10f688a2bdaf359a2424a803fd5575f63883884ba3ad52307f6183c,0.049477338790893555,0.04834914207458496,0.06033468246459961,0.043663978576660156,0.05930042266845703,0.05095171928405762,0.04589509963989258,0.22457575798034668,0.029387950897216797,0.18838739395141602,0.1814112663269043,0.21477341651916504,4.416977643966675,0.2668635845184326 diff --git a/results/combined/merges_timed/steveice10/packetlib.csv b/results/combined/merges_timed/steveice10/packetlib.csv index d3faa80006..a3400f12f8 100644 --- a/results/combined/merges_timed/steveice10/packetlib.csv +++ b/results/combined/merges_timed/steveice10/packetlib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/remotes/origin/pull/38,295cf3e47add5dd28970797dbf371a7afde444b3,75e3b5a85416dfd0f0ca7e9a8eced4cca810810d,0b7557069e3f8a7ab42caccf5b0a9fed7a7b6028,,913cb9b9fa839697f26e14177e9a166fe63bf50986f065a9daf5e30ad90c625f,Tests_passed,f3b747ed50cb104aaa357420855a6955e9f034a1f452a4c2f119a96018c8b5dc,Tests_passed,True,True,True,True,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,6d66af17c2528a95cb003fe3633867bf5b0212cb645093f8b91b8d389a8256de,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,484451440f26a7f125bbffef2cfb93fd6c6986146be633442ca6a11b985ea10a,Merge_failed,484451440f26a7f125bbffef2cfb93fd6c6986146be633442ca6a11b985ea10a,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Merge_failed,d12c519e88915493c6b1b62f1d526497fdd7b05417f764f498ade1474b602b8e,0.04115581512451172,0.041048526763916016,0.04378795623779297,0.04727292060852051,0.04036664962768555,0.03858613967895508,0.041867971420288086,0.1680448055267334,0.07055544853210449,0.13715672492980957,0.1365187168121338,0.12557005882263184,0.902921199798584,0.1840667724609375 +13,refs/remotes/origin/pull/38,295cf3e47add5dd28970797dbf371a7afde444b3,75e3b5a85416dfd0f0ca7e9a8eced4cca810810d,0b7557069e3f8a7ab42caccf5b0a9fed7a7b6028,,913cb9b9fa839697f26e14177e9a166fe63bf50986f065a9daf5e30ad90c625f,Tests_passed,f3b747ed50cb104aaa357420855a6955e9f034a1f452a4c2f119a96018c8b5dc,Tests_passed,True,True,True,True,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,6d66af17c2528a95cb003fe3633867bf5b0212cb645093f8b91b8d389a8256de,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,484451440f26a7f125bbffef2cfb93fd6c6986146be633442ca6a11b985ea10a,Merge_failed,484451440f26a7f125bbffef2cfb93fd6c6986146be633442ca6a11b985ea10a,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Merge_failed,d12c519e88915493c6b1b62f1d526497fdd7b05417f764f498ade1474b602b8e,0.04115581512451172,0.041048526763916016,0.04378795623779297,0.04727292060852051,0.04036664962768555,0.03858613967895508,0.041867971420288086,0.1680448055267334,0.07055544853210449,0.14458799362182617,0.13539838790893555,0.12557005882263184,0.902921199798584,0.1840667724609375 diff --git a/results/combined/merges_timed/stevespringett/dependency-check-sonar-plugin.csv b/results/combined/merges_timed/stevespringett/dependency-check-sonar-plugin.csv index 52d362b257..20f3b1e3c2 100644 --- a/results/combined/merges_timed/stevespringett/dependency-check-sonar-plugin.csv +++ b/results/combined/merges_timed/stevespringett/dependency-check-sonar-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -45,refs/heads/master,b3cbcd1d5b0a89d5651398bc0afd9bf04b204183,64e5a244761eb7c11334ee42d9b6f5b734b202bf,64a20550b8633495a6442fdbbbb3b562fd7b6b73,,True,True,c1b23d5024b473a4add1e2d3edee58616407786d2c1ef6ef339644e4ef7cc861,Tests_passed,76ead37b6f8e0f9dd7baed602b49fb6a0552487afc863e9bb1637d3b96eb15da,Tests_passed,True,True,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,65a2acfb2f0c042363f3f5918ba8a792443ebf8165042e3fb44e44d936056bed,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,bb24087add25463adc816a3fc93a9cbb7a0e0055816e59026152df2ba9dfeb99,Merge_failed,bb24087add25463adc816a3fc93a9cbb7a0e0055816e59026152df2ba9dfeb99,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Merge_failed,5b18429a73b729cd5f08f438654ad51d1fb93b293b48b9af94b41ac6c0e28ea9,0.015884876251220703,0.019470930099487305,0.017460346221923828,0.02119731903076172,0.017284393310546875,0.01746988296508789,0.017505884170532227,0.0643923282623291,0.02906346321105957,0.22177457809448242,0.22250008583068848,0.1310744285583496,1.0309133529663086,0.21883273124694824 +45,refs/heads/master,b3cbcd1d5b0a89d5651398bc0afd9bf04b204183,64e5a244761eb7c11334ee42d9b6f5b734b202bf,64a20550b8633495a6442fdbbbb3b562fd7b6b73,,True,True,c1b23d5024b473a4add1e2d3edee58616407786d2c1ef6ef339644e4ef7cc861,Tests_passed,76ead37b6f8e0f9dd7baed602b49fb6a0552487afc863e9bb1637d3b96eb15da,Tests_passed,True,True,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,65a2acfb2f0c042363f3f5918ba8a792443ebf8165042e3fb44e44d936056bed,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,bb24087add25463adc816a3fc93a9cbb7a0e0055816e59026152df2ba9dfeb99,Merge_failed,bb24087add25463adc816a3fc93a9cbb7a0e0055816e59026152df2ba9dfeb99,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Merge_failed,5b18429a73b729cd5f08f438654ad51d1fb93b293b48b9af94b41ac6c0e28ea9,0.015884876251220703,0.019470930099487305,0.017460346221923828,0.02119731903076172,0.017284393310546875,0.01746988296508789,0.017505884170532227,0.0643923282623291,0.02906346321105957,0.22282171249389648,0.22259068489074707,0.1310744285583496,1.0309133529663086,0.21883273124694824 diff --git a/results/combined/merges_timed/stoicflame/enunciate.csv b/results/combined/merges_timed/stoicflame/enunciate.csv index 4e5fdf9a8a..9b7aad7b78 100644 --- a/results/combined/merges_timed/stoicflame/enunciate.csv +++ b/results/combined/merges_timed/stoicflame/enunciate.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -151,refs/remotes/origin/pull/1191,46949ae95bd07a25a0c66af8bd4e523ae21009d0,e5132c25ec1e98c91c9527d5b8e33ba4a5289572,1d6fe66363d73eedf0e9ba1fdb46a2010e752aa7,,True,True,cd0b8a7ad85ec9c762cbf5bcccc0bb20e235aa8dd5526110672b209085d746d3,Tests_passed,a5fbd41a2b94dacfc242203b7ffd37b4d189c4c01a11acaa9545edd6805d1d5a,Tests_passed,True,True,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,94221563edf43b1330de689fdff480ccf874ac9774f48a02bb8c68b120d8aaf8,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,c0e9b0adadbaea4f44568b6f39c156a74e1dab19c475bf933a456ed8483d09d8,Merge_failed,c0e9b0adadbaea4f44568b6f39c156a74e1dab19c475bf933a456ed8483d09d8,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Merge_failed,e965e9ee85cabb9671946bf369da55fd90758d75a9fde9ccea09be51d0deac87,0.014941930770874023,0.05138897895812988,0.06596899032592773,0.019191265106201172,0.06143069267272949,0.05439281463623047,0.06634736061096191,0.2151203155517578,0.04305839538574219,0.07340455055236816,0.07288837432861328,0.15001988410949707,0.7109589576721191,0.45273804664611816 +151,refs/remotes/origin/pull/1191,46949ae95bd07a25a0c66af8bd4e523ae21009d0,e5132c25ec1e98c91c9527d5b8e33ba4a5289572,1d6fe66363d73eedf0e9ba1fdb46a2010e752aa7,,True,True,cd0b8a7ad85ec9c762cbf5bcccc0bb20e235aa8dd5526110672b209085d746d3,Tests_passed,a5fbd41a2b94dacfc242203b7ffd37b4d189c4c01a11acaa9545edd6805d1d5a,Tests_passed,True,True,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,94221563edf43b1330de689fdff480ccf874ac9774f48a02bb8c68b120d8aaf8,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,c0e9b0adadbaea4f44568b6f39c156a74e1dab19c475bf933a456ed8483d09d8,Merge_failed,c0e9b0adadbaea4f44568b6f39c156a74e1dab19c475bf933a456ed8483d09d8,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Merge_failed,e965e9ee85cabb9671946bf369da55fd90758d75a9fde9ccea09be51d0deac87,0.014941930770874023,0.05138897895812988,0.06596899032592773,0.019191265106201172,0.06143069267272949,0.05439281463623047,0.06634736061096191,0.2151203155517578,0.04305839538574219,0.07317209243774414,0.07254481315612793,0.15001988410949707,0.7109589576721191,0.45273804664611816 diff --git a/results/combined/merges_timed/stratehm/stratum-proxy.csv b/results/combined/merges_timed/stratehm/stratum-proxy.csv index cab777e207..883d841f72 100644 --- a/results/combined/merges_timed/stratehm/stratum-proxy.csv +++ b/results/combined/merges_timed/stratehm/stratum-proxy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,185a97668a9fa06017dd079fcebb91ce44fa2ef6,9a9b1254809deb4643c384d8b67485a226781852,c03b71882dba613280d87d11f9377e9b3dde3406,,1991d719fd78aa7b9a5778f694c4626934bf650d9406f2512c64cc9468d3f430,Tests_passed,114c06533c0fe832eebd2da2679cc984368e4702995bf1ef02a468a87b985f32,Tests_passed,True,True,True,True,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,0.01815199851989746,0.017971277236938477,0.019533872604370117,0.019294261932373047,0.020151615142822266,0.020522356033325195,0.020990371704101562,0.05327153205871582,0.017740964889526367,0.16580462455749512,0.16656160354614258,0.07278561592102051,0.7091410160064697,0.20014739036560059 +8,refs/heads/master,185a97668a9fa06017dd079fcebb91ce44fa2ef6,9a9b1254809deb4643c384d8b67485a226781852,c03b71882dba613280d87d11f9377e9b3dde3406,,1991d719fd78aa7b9a5778f694c4626934bf650d9406f2512c64cc9468d3f430,Tests_passed,114c06533c0fe832eebd2da2679cc984368e4702995bf1ef02a468a87b985f32,Tests_passed,True,True,True,True,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,0.01815199851989746,0.017971277236938477,0.019533872604370117,0.019294261932373047,0.020151615142822266,0.020522356033325195,0.020990371704101562,0.05327153205871582,0.017740964889526367,0.1672213077545166,0.16329193115234375,0.07278561592102051,0.7091410160064697,0.20014739036560059 diff --git a/results/combined/merges_timed/straup/dogeared-extruder.csv b/results/combined/merges_timed/straup/dogeared-extruder.csv index 4171737719..c84e5e0549 100644 --- a/results/combined/merges_timed/straup/dogeared-extruder.csv +++ b/results/combined/merges_timed/straup/dogeared-extruder.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/main,0176ca61e4bac5035afc89e56f3063a206c3a660,4f94ff016cdf80bfa4d4484fd90811cccf32a24c,033b2ad62057286ac831cb111a73fb198852794e,,True,True,502193e884edab48b986df72b3bc764320c2e1029eac743334a557e206b73592,Tests_passed,cf551a3072e83514947fc3c543d6854819268e726746c374175de33e4aea2bc0,Tests_passed,True,True,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,b2f9d005b4d460d986a0a47b2f4d876c7318fd917056e5c0eb4b2a9aabce7d40,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,0d27f85c6dada05f57026309f447c4ff46815b6a3cbafd7995e735d2ad3912ac,Merge_failed,0d27f85c6dada05f57026309f447c4ff46815b6a3cbafd7995e735d2ad3912ac,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,e8c402eca4edaf12a977d26fa4871730ceaa2d1fecfdbd05d5b5746ed40d76c3,0.03839230537414551,0.04458427429199219,0.03794717788696289,0.03522372245788574,0.04323983192443848,0.03570675849914551,0.038968563079833984,0.26676344871520996,0.07616066932678223,0.11886763572692871,0.11800217628479004,0.17857813835144043,1.140211820602417,0.18788599967956543 +10,refs/heads/main,0176ca61e4bac5035afc89e56f3063a206c3a660,4f94ff016cdf80bfa4d4484fd90811cccf32a24c,033b2ad62057286ac831cb111a73fb198852794e,,True,True,502193e884edab48b986df72b3bc764320c2e1029eac743334a557e206b73592,Tests_passed,cf551a3072e83514947fc3c543d6854819268e726746c374175de33e4aea2bc0,Tests_passed,True,True,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,b2f9d005b4d460d986a0a47b2f4d876c7318fd917056e5c0eb4b2a9aabce7d40,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,0d27f85c6dada05f57026309f447c4ff46815b6a3cbafd7995e735d2ad3912ac,Merge_failed,0d27f85c6dada05f57026309f447c4ff46815b6a3cbafd7995e735d2ad3912ac,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,e8c402eca4edaf12a977d26fa4871730ceaa2d1fecfdbd05d5b5746ed40d76c3,0.03839230537414551,0.04458427429199219,0.03794717788696289,0.03522372245788574,0.04323983192443848,0.03570675849914551,0.038968563079833984,0.26676344871520996,0.07616066932678223,0.11893773078918457,0.1292431354522705,0.17857813835144043,1.140211820602417,0.18788599967956543 diff --git a/results/combined/merges_timed/stripesframework/stripes.csv b/results/combined/merges_timed/stripesframework/stripes.csv index 53d4280537..46195dde2a 100644 --- a/results/combined/merges_timed/stripesframework/stripes.csv +++ b/results/combined/merges_timed/stripesframework/stripes.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,28a8f08ed74f8c2082076c5b6cb79eed3a111150,61e31c483e62accafb29de9ffef8186870de57a7,a06cb5f3e874c90489f6d7f96eb22fa2546a2411,,True,True,20c6d325506af3209c7697d0e95af238cc1fada4a6ca4e1afd01baff3889c405,Tests_passed,6f6fb3639d976afe3c4dd8831fd3acbe894df671b47310088ab0075f9576df97,Tests_passed,True,True,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,0.0481874942779541,0.06094837188720703,0.04646611213684082,0.04850268363952637,0.061124563217163086,0.05701184272766113,0.049375057220458984,0.21686673164367676,0.05352187156677246,0.17820262908935547,0.20592832565307617,0.11984658241271973,1.2847588062286377,0.2791621685028076 +8,refs/heads/master,28a8f08ed74f8c2082076c5b6cb79eed3a111150,61e31c483e62accafb29de9ffef8186870de57a7,a06cb5f3e874c90489f6d7f96eb22fa2546a2411,,True,True,20c6d325506af3209c7697d0e95af238cc1fada4a6ca4e1afd01baff3889c405,Tests_passed,6f6fb3639d976afe3c4dd8831fd3acbe894df671b47310088ab0075f9576df97,Tests_passed,True,True,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,0.0481874942779541,0.06094837188720703,0.04646611213684082,0.04850268363952637,0.061124563217163086,0.05701184272766113,0.049375057220458984,0.21686673164367676,0.05352187156677246,0.20869851112365723,0.20261240005493164,0.11984658241271973,1.2847588062286377,0.2791621685028076 diff --git a/results/combined/merges_timed/structr/structr.csv b/results/combined/merges_timed/structr/structr.csv index d2d296df86..002fd167b8 100644 --- a/results/combined/merges_timed/structr/structr.csv +++ b/results/combined/merges_timed/structr/structr.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -220,refs/heads/main,6fc7c9a53b47fc2815ccf201c3bdcfd41ce40604,e4a61bdb2b0dc86c4ab2e5941d42bcd90f7f3dfe,43de2c909844a3a8be59080e4d3858bbef4696da,,True,True,879ad76a33a9111cc49adcd78160d7982225c52fb47e5fa006729cf63e5a30bb,Tests_passed,e3432ed84ea1bcc117f09e33907550780b48c106a1861198f8ae26f873a76b3c,Tests_passed,True,True,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,5ac398e53bca5fe3ca4a7e4ae7b4244c6774f2eefde4663d385f201ef86052bb,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,c58a4ebd86b108a87a5c865dab3412f33e95c65123aff29d78dbf144c0871e78,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,056eff467ff502a7cb0d8ac1c80a634f9a683b68007c5d04f17d4e2f85058e7f,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,388ccb9918f4074b7c75da25721247c99ce284cbebb11564354716c07f0647af,Merge_failed,8a6b99ad999c9b432be9c80701a10af76efa2133e7ea05b6ec8ddace6447872b,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,6c5e09e263640558fbe39c085f06fe8d6f09b5baf275eef5b8803683e9f744ad,Merge_failed,d22ead3ef7782a230ce1e4234ff9167be107e6216d94ff3e1bad64e3936181e0,0.043933868408203125,0.04338645935058594,0.04859471321105957,0.04900932312011719,0.04919576644897461,0.049001455307006836,0.04912376403808594,0.22030425071716309,0.18052411079406738,0.19794893264770508,0.19863414764404297,0.16022300720214844,1.156846046447754,1.0424859523773193 +220,refs/heads/main,6fc7c9a53b47fc2815ccf201c3bdcfd41ce40604,e4a61bdb2b0dc86c4ab2e5941d42bcd90f7f3dfe,43de2c909844a3a8be59080e4d3858bbef4696da,,True,True,879ad76a33a9111cc49adcd78160d7982225c52fb47e5fa006729cf63e5a30bb,Tests_passed,e3432ed84ea1bcc117f09e33907550780b48c106a1861198f8ae26f873a76b3c,Tests_passed,True,True,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,5ac398e53bca5fe3ca4a7e4ae7b4244c6774f2eefde4663d385f201ef86052bb,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,c58a4ebd86b108a87a5c865dab3412f33e95c65123aff29d78dbf144c0871e78,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,056eff467ff502a7cb0d8ac1c80a634f9a683b68007c5d04f17d4e2f85058e7f,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,388ccb9918f4074b7c75da25721247c99ce284cbebb11564354716c07f0647af,Merge_failed,8a6b99ad999c9b432be9c80701a10af76efa2133e7ea05b6ec8ddace6447872b,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,6c5e09e263640558fbe39c085f06fe8d6f09b5baf275eef5b8803683e9f744ad,Merge_failed,d22ead3ef7782a230ce1e4234ff9167be107e6216d94ff3e1bad64e3936181e0,0.043933868408203125,0.04338645935058594,0.04859471321105957,0.04900932312011719,0.04919576644897461,0.049001455307006836,0.04912376403808594,0.22030425071716309,0.18052411079406738,0.1992037296295166,0.19921112060546875,0.16022300720214844,1.156846046447754,1.0424859523773193 diff --git a/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv b/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv index 52a9954766..c680a8fe2a 100644 --- a/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv +++ b/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/remotes/origin/pull/24,41f878d01c4d9c8015295cdb67599294ec53d75c,1b66691a6f4f32cc2efb2748087d357277877aeb,3f3ac96ec64bd26c14dc3111f343f87054621fe2,,e575dfbb7d65d89c1209175e6f85c6cb8d1a1409dcb4559dde26d4038e774788,Tests_passed,c3af472c3d1db1511e290e0ceabaee839e53cf4c361839e20b5333c6d2630bcb,Tests_passed,True,True,True,True,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,021a0ee7aba501164086d79dfa960105811f554911aece30c4ad1243ff77a71a,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,e6bbcddb5e83db2403a08de3b169b5016a5866fd8a1f4cbc8ebc1ba34f1d6eeb,Merge_failed,e6bbcddb5e83db2403a08de3b169b5016a5866fd8a1f4cbc8ebc1ba34f1d6eeb,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,22d5ac28a0ce649b0ba23e633d0ea4c74e03f973ef9b10da4dd90686fb677b7c,0.04148530960083008,0.05640101432800293,0.044133663177490234,0.037175893783569336,0.05477643013000488,0.040110111236572266,0.044371843338012695,0.36508679389953613,0.06603336334228516,0.23272299766540527,0.23136043548583984,0.27416110038757324,1.3286709785461426,0.22024822235107422 +16,refs/remotes/origin/pull/24,41f878d01c4d9c8015295cdb67599294ec53d75c,1b66691a6f4f32cc2efb2748087d357277877aeb,3f3ac96ec64bd26c14dc3111f343f87054621fe2,,e575dfbb7d65d89c1209175e6f85c6cb8d1a1409dcb4559dde26d4038e774788,Tests_passed,c3af472c3d1db1511e290e0ceabaee839e53cf4c361839e20b5333c6d2630bcb,Tests_passed,True,True,True,True,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,021a0ee7aba501164086d79dfa960105811f554911aece30c4ad1243ff77a71a,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,e6bbcddb5e83db2403a08de3b169b5016a5866fd8a1f4cbc8ebc1ba34f1d6eeb,Merge_failed,e6bbcddb5e83db2403a08de3b169b5016a5866fd8a1f4cbc8ebc1ba34f1d6eeb,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,22d5ac28a0ce649b0ba23e633d0ea4c74e03f973ef9b10da4dd90686fb677b7c,0.04148530960083008,0.05640101432800293,0.044133663177490234,0.037175893783569336,0.05477643013000488,0.040110111236572266,0.044371843338012695,0.36508679389953613,0.06603336334228516,0.22845196723937988,0.23079156875610352,0.27416110038757324,1.3286709785461426,0.22024822235107422 diff --git a/results/combined/merges_timed/sviperll/static-mustache.csv b/results/combined/merges_timed/sviperll/static-mustache.csv index 0dd70a0326..80add7ccde 100644 --- a/results/combined/merges_timed/sviperll/static-mustache.csv +++ b/results/combined/merges_timed/sviperll/static-mustache.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,271693c779061cde2069af7507b5721c208da8e4,98354a47addf041d851017ae5af25db72d481fa5,85f6735c24b80909fb2cef22a1eb133c7b651f09,,fc7abdfc47de3fdbe7c4b5773135afc05e4fe616ea6ed47b66286fe43784ab10,Tests_passed,5416ff038be468f55ff05f041e8725b6acf330f3dfe928100964b6c05f520a80,Tests_passed,True,True,True,True,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,39c0484515dcb3f813fd9c1f07861d57091775e6cc2e74caa829ff07503aa6e3,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,9fcbca57079652a68f2bad3b784639646b60dfd037bc091d04101f696abd0b98,Merge_failed,9fcbca57079652a68f2bad3b784639646b60dfd037bc091d04101f696abd0b98,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Merge_failed,af09563c005363bc80b70ae5537a7436d1d923a64781494999db107ec6a78dfc,0.010977506637573242,0.011341333389282227,0.011127948760986328,0.011146783828735352,0.01127004623413086,0.011226415634155273,0.01140594482421875,0.060337066650390625,0.017618894577026367,0.25782299041748047,0.2573416233062744,0.17992687225341797,1.360405445098877,0.1896364688873291 +2,refs/heads/master,271693c779061cde2069af7507b5721c208da8e4,98354a47addf041d851017ae5af25db72d481fa5,85f6735c24b80909fb2cef22a1eb133c7b651f09,,fc7abdfc47de3fdbe7c4b5773135afc05e4fe616ea6ed47b66286fe43784ab10,Tests_passed,5416ff038be468f55ff05f041e8725b6acf330f3dfe928100964b6c05f520a80,Tests_passed,True,True,True,True,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,39c0484515dcb3f813fd9c1f07861d57091775e6cc2e74caa829ff07503aa6e3,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,9fcbca57079652a68f2bad3b784639646b60dfd037bc091d04101f696abd0b98,Merge_failed,9fcbca57079652a68f2bad3b784639646b60dfd037bc091d04101f696abd0b98,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Merge_failed,af09563c005363bc80b70ae5537a7436d1d923a64781494999db107ec6a78dfc,0.010977506637573242,0.011341333389282227,0.011127948760986328,0.011146783828735352,0.01127004623413086,0.011226415634155273,0.01140594482421875,0.060337066650390625,0.017618894577026367,0.25923681259155273,0.2598912715911865,0.17992687225341797,1.360405445098877,0.1896364688873291 diff --git a/results/combined/merges_timed/swagger-api/swagger-codegen.csv b/results/combined/merges_timed/swagger-api/swagger-codegen.csv index 7786480ccb..410801482b 100644 --- a/results/combined/merges_timed/swagger-api/swagger-codegen.csv +++ b/results/combined/merges_timed/swagger-api/swagger-codegen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -466,refs/heads/master,4a3d9358eed45dde1ca5541526b224466b65177b,75bd838d23b44e842c3873ebc39d180ed304e6b1,cff573f3ddb38d35053d648a921b4517719abf35,,True,True,6f36a44c98caf3f8f191fd46208cfa0ba9ea5d5b4141180def3ea94e2c9599a3,Tests_passed,116184c2153309ed2b8e7382e7e2251bdd4f6f083a53e52cf0e39a9386481316,Tests_passed,True,True,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,abdcda207648f20ec1f55b4a3a9411b0a38251b538222fa566c5769329875966,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,ebd3b6b8a305d023c57776ca630a31745b9cfb22b9099a693bfbe917af779f98,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,0.11798787117004395,0.1209554672241211,0.19637155532836914,0.20195722579956055,0.19887614250183105,0.19826650619506836,0.20042657852172852,0.2284870147705078,0.10812258720397949,0.2549271583557129,0.2549450397491455,0.17418527603149414,0.8080813884735107,3.2460575103759766 +466,refs/heads/master,4a3d9358eed45dde1ca5541526b224466b65177b,75bd838d23b44e842c3873ebc39d180ed304e6b1,cff573f3ddb38d35053d648a921b4517719abf35,,True,True,6f36a44c98caf3f8f191fd46208cfa0ba9ea5d5b4141180def3ea94e2c9599a3,Tests_passed,116184c2153309ed2b8e7382e7e2251bdd4f6f083a53e52cf0e39a9386481316,Tests_passed,True,True,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,abdcda207648f20ec1f55b4a3a9411b0a38251b538222fa566c5769329875966,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,ebd3b6b8a305d023c57776ca630a31745b9cfb22b9099a693bfbe917af779f98,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,0.11798787117004395,0.1209554672241211,0.19637155532836914,0.20195722579956055,0.19887614250183105,0.19826650619506836,0.20042657852172852,0.2284870147705078,0.10812258720397949,0.25600624084472656,0.25288820266723633,0.17418527603149414,0.8080813884735107,3.2460575103759766 diff --git a/results/combined/merges_timed/swagger-api/swagger-parser.csv b/results/combined/merges_timed/swagger-api/swagger-parser.csv index 89db86ea67..43e52c8078 100644 --- a/results/combined/merges_timed/swagger-api/swagger-parser.csv +++ b/results/combined/merges_timed/swagger-api/swagger-parser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -18,refs/heads/master,9c6ec9e5c91fa04147c9e52ad7fabf9bd7caf192,58fe433c6572bb5ca364fed5c568a7d845f6a510,98e8a4e27d42a270b530fe15a3a772334390dd21,,True,True,20c1799e360412d3fd52574fe812708c804abbab2c00f39925d3948656c3e011,Tests_passed,af5168a0ef53169f3669daec10cc09c1b5140468b45768ee0929be7dced3c4f6,Tests_passed,True,True,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,4b7046c75b2ca5d1c3864c1c5cc989fa526c2b02fcadb82687eb8916d5717363,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,98ffd24d96c3c708c7df5a30e1ed35c77eae4ce575ae451b4a744e6294139871,Merge_failed,98ffd24d96c3c708c7df5a30e1ed35c77eae4ce575ae451b4a744e6294139871,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Merge_failed,d5761cc206eaf84a13d7b54539f7bb7ba27dc351395470413af75218aba6f6ae,0.037400245666503906,0.03524374961853027,0.01166081428527832,0.042859554290771484,0.045549869537353516,0.044206857681274414,0.04946446418762207,0.16750597953796387,0.08383321762084961,0.09762358665466309,0.09823465347290039,0.11723852157592773,0.6091639995574951,0.25946545600891113 +18,refs/heads/master,9c6ec9e5c91fa04147c9e52ad7fabf9bd7caf192,58fe433c6572bb5ca364fed5c568a7d845f6a510,98e8a4e27d42a270b530fe15a3a772334390dd21,,True,True,20c1799e360412d3fd52574fe812708c804abbab2c00f39925d3948656c3e011,Tests_passed,af5168a0ef53169f3669daec10cc09c1b5140468b45768ee0929be7dced3c4f6,Tests_passed,True,True,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,4b7046c75b2ca5d1c3864c1c5cc989fa526c2b02fcadb82687eb8916d5717363,Merge_failed,6be602e5676c12ec9ba7c8ab07e73c32952e5b5cdfac68457f62f6d86c6eceea,Merge_failed,98ffd24d96c3c708c7df5a30e1ed35c77eae4ce575ae451b4a744e6294139871,Merge_failed,98ffd24d96c3c708c7df5a30e1ed35c77eae4ce575ae451b4a744e6294139871,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Merge_failed,d5761cc206eaf84a13d7b54539f7bb7ba27dc351395470413af75218aba6f6ae,0.037400245666503906,0.03524374961853027,0.01166081428527832,0.042859554290771484,0.045549869537353516,0.044206857681274414,0.04946446418762207,0.16750597953796387,0.08383321762084961,0.09934329986572266,0.09722375869750977,0.11723852157592773,0.6091639995574951,0.25946545600891113 diff --git a/results/combined/merges_timed/swagger-api/validator-badge.csv b/results/combined/merges_timed/swagger-api/validator-badge.csv index 0cd6250720..53fa3b40c1 100644 --- a/results/combined/merges_timed/swagger-api/validator-badge.csv +++ b/results/combined/merges_timed/swagger-api/validator-badge.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -97,refs/remotes/origin/pull/20,2adc075f5b157cb6cdd555e4757691aa3a64bccd,7dc4cab9ca327e4717ff60cecd03e816e669cdff,faa0dbe1995a027075ea369c41b369baa9ab7c15,,50c8add3df8a2d8df425529ca8ef8758412ea256b517762c667244cf876a96f5,Tests_passed,c785097acfede3937a05ba66e846c855c1bb74aa94ed974a680e05d1afef20d1,Tests_passed,True,True,True,True,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,95450ef69108b32fad2ceedc780f7b057f5559fd61e6cbaf643261c4e60452a0,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,acab701d0292d257d279b7cf4947c1e911592546c8f142fd2ade7b867fb1ad58,Merge_failed,acab701d0292d257d279b7cf4947c1e911592546c8f142fd2ade7b867fb1ad58,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Merge_failed,56aca6bf41f52da11308561a97dea1b07b45555e257577c4ce1b0dc71f5d0541,0.041629791259765625,0.041890621185302734,0.03996586799621582,0.035828351974487305,0.03858184814453125,0.04163169860839844,0.0398707389831543,0.23205065727233887,0.08123493194580078,0.251096248626709,0.25188541412353516,0.16985750198364258,1.3908233642578125,0.19095253944396973 +97,refs/remotes/origin/pull/20,2adc075f5b157cb6cdd555e4757691aa3a64bccd,7dc4cab9ca327e4717ff60cecd03e816e669cdff,faa0dbe1995a027075ea369c41b369baa9ab7c15,,50c8add3df8a2d8df425529ca8ef8758412ea256b517762c667244cf876a96f5,Tests_passed,c785097acfede3937a05ba66e846c855c1bb74aa94ed974a680e05d1afef20d1,Tests_passed,True,True,True,True,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,95450ef69108b32fad2ceedc780f7b057f5559fd61e6cbaf643261c4e60452a0,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,acab701d0292d257d279b7cf4947c1e911592546c8f142fd2ade7b867fb1ad58,Merge_failed,acab701d0292d257d279b7cf4947c1e911592546c8f142fd2ade7b867fb1ad58,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Merge_failed,56aca6bf41f52da11308561a97dea1b07b45555e257577c4ce1b0dc71f5d0541,0.041629791259765625,0.041890621185302734,0.03996586799621582,0.035828351974487305,0.03858184814453125,0.04163169860839844,0.0398707389831543,0.23205065727233887,0.08123493194580078,0.25148844718933105,0.24428105354309082,0.16985750198364258,1.3908233642578125,0.19095253944396973 diff --git a/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv b/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv index af050df684..69542a1478 100644 --- a/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv +++ b/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -41,refs/heads/master,4072a5bef34ba969de10ef3aac0401f487632ab0,3b94c80a8dcb04aaea5b51494afe4d495163c4d3,47dc44315b4dc9e09a3d37384e14a6b536fcca20,,True,True,52d21b457040105f6ed59b54c43f4c86b377194348b308d23e73e9c2e3c11252,Tests_passed,dcfef962eecb9455166d77c9a86cadd2f7cfdf2c1f9d53c981e9b4d3adfb898e,Tests_passed,True,True,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,0.06017804145812988,0.058310508728027344,0.09206104278564453,0.08856725692749023,0.08423614501953125,0.09364104270935059,0.0847787857055664,0.15560078620910645,0.06175994873046875,0.2028980255126953,0.20093107223510742,0.11568212509155273,0.8433101177215576,0.24418258666992188 +41,refs/heads/master,4072a5bef34ba969de10ef3aac0401f487632ab0,3b94c80a8dcb04aaea5b51494afe4d495163c4d3,47dc44315b4dc9e09a3d37384e14a6b536fcca20,,True,True,52d21b457040105f6ed59b54c43f4c86b377194348b308d23e73e9c2e3c11252,Tests_passed,dcfef962eecb9455166d77c9a86cadd2f7cfdf2c1f9d53c981e9b4d3adfb898e,Tests_passed,True,True,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,0.06017804145812988,0.058310508728027344,0.09206104278564453,0.08856725692749023,0.08423614501953125,0.09364104270935059,0.0847787857055664,0.15560078620910645,0.06175994873046875,0.197953462600708,0.19893813133239746,0.11568212509155273,0.8433101177215576,0.24418258666992188 diff --git a/results/combined/merges_timed/synbiodex/libsbolj.csv b/results/combined/merges_timed/synbiodex/libsbolj.csv index dba096c2e6..837a98b885 100644 --- a/results/combined/merges_timed/synbiodex/libsbolj.csv +++ b/results/combined/merges_timed/synbiodex/libsbolj.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,0ceaff01a914de507b9e40736a6730d9038c022c,92859a9bd3fd681c0e316af0472d00337d803ea4,39258e9b59518bcebb9c6d5a174b7d71ac2a5cdb,,True,True,af285d8d27b1e3142d62ffc0ff5deedb4220a4d8be04bac04ae3d4c70bad3af2,Tests_passed,b57e30f3ec812c0f49f3783627bb97f37c350c4f35775f0ef80a7600ec992860,Tests_passed,True,True,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,0.01741766929626465,0.018407106399536133,0.02079486846923828,0.02154397964477539,0.020008325576782227,0.02008986473083496,0.0201413631439209,0.05031847953796387,0.017715930938720703,0.25476861000061035,0.24337053298950195,0.07264924049377441,3.177938938140869,0.35230255126953125 +2,refs/heads/master,0ceaff01a914de507b9e40736a6730d9038c022c,92859a9bd3fd681c0e316af0472d00337d803ea4,39258e9b59518bcebb9c6d5a174b7d71ac2a5cdb,,True,True,af285d8d27b1e3142d62ffc0ff5deedb4220a4d8be04bac04ae3d4c70bad3af2,Tests_passed,b57e30f3ec812c0f49f3783627bb97f37c350c4f35775f0ef80a7600ec992860,Tests_passed,True,True,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,0.01741766929626465,0.018407106399536133,0.02079486846923828,0.02154397964477539,0.020008325576782227,0.02008986473083496,0.0201413631439209,0.05031847953796387,0.017715930938720703,0.24616670608520508,0.24019742012023926,0.07264924049377441,3.177938938140869,0.35230255126953125 diff --git a/results/combined/merges_timed/syncleus/ferma.csv b/results/combined/merges_timed/syncleus/ferma.csv index 539fe23289..1170785047 100644 --- a/results/combined/merges_timed/syncleus/ferma.csv +++ b/results/combined/merges_timed/syncleus/ferma.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -22,refs/heads/master,f113f2c4af4aae68f922c437a4c3d6acad4daece,f1e3ab2409e5fea718b17f5d7d00b6d21fa97a0a,c89d36cdc198d6b4c6e9036e746066c98b1919a1,,True,True,2065aef7e8b721079b788aecc58a7fc6c2df07fc6cc66e197abf007b325b55cd,Tests_passed,5d9f7b3e8ecb7d7178f78881cf17daf90771e64966a105cc5ccd9798deee2e8c,Tests_passed,True,True,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,0.06989574432373047,0.05419278144836426,0.0653538703918457,0.05479931831359863,0.07117772102355957,0.06744647026062012,0.06168699264526367,0.2442326545715332,0.053958892822265625,0.3074219226837158,0.30913615226745605,0.18275737762451172,1.5998272895812988,0.27056884765625 +22,refs/heads/master,f113f2c4af4aae68f922c437a4c3d6acad4daece,f1e3ab2409e5fea718b17f5d7d00b6d21fa97a0a,c89d36cdc198d6b4c6e9036e746066c98b1919a1,,True,True,2065aef7e8b721079b788aecc58a7fc6c2df07fc6cc66e197abf007b325b55cd,Tests_passed,5d9f7b3e8ecb7d7178f78881cf17daf90771e64966a105cc5ccd9798deee2e8c,Tests_passed,True,True,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,0.06989574432373047,0.05419278144836426,0.0653538703918457,0.05479931831359863,0.07117772102355957,0.06744647026062012,0.06168699264526367,0.2442326545715332,0.053958892822265625,0.309781551361084,0.3103675842285156,0.18275737762451172,1.5998272895812988,0.27056884765625 diff --git a/results/combined/merges_timed/synergian/wagon-git.csv b/results/combined/merges_timed/synergian/wagon-git.csv index 23a2c6f679..33e3213ec1 100644 --- a/results/combined/merges_timed/synergian/wagon-git.csv +++ b/results/combined/merges_timed/synergian/wagon-git.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,b56e7945f404c808deb3efd468a888226dca89bf,b86d4a227212ac808ab985a4d1c66e13dd0e3080,284865d5c003c3cac22dd04ccee674be985f1e29,,5aad08b0e2f9dd4ad1dd81c8f11b002e7cb0aab6958ebade9101d3473017642b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,True,True,True,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,0.04148244857788086,0.03937363624572754,0.04178261756896973,0.0382380485534668,0.040834903717041016,0.03988790512084961,0.03753018379211426,0.16123485565185547,0.03572440147399902,0.14909815788269043,0.15322661399841309,0.09822225570678711,0.66471266746521,0.19214296340942383 +2,refs/heads/master,b56e7945f404c808deb3efd468a888226dca89bf,b86d4a227212ac808ab985a4d1c66e13dd0e3080,284865d5c003c3cac22dd04ccee674be985f1e29,,5aad08b0e2f9dd4ad1dd81c8f11b002e7cb0aab6958ebade9101d3473017642b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,True,True,True,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,0.04148244857788086,0.03937363624572754,0.04178261756896973,0.0382380485534668,0.040834903717041016,0.03988790512084961,0.03753018379211426,0.16123485565185547,0.03572440147399902,0.14602088928222656,0.14533066749572754,0.09822225570678711,0.66471266746521,0.19214296340942383 diff --git a/results/combined/merges_timed/t-oster/liblasercut.csv b/results/combined/merges_timed/t-oster/liblasercut.csv index add6bbb212..0e622d55cf 100644 --- a/results/combined/merges_timed/t-oster/liblasercut.csv +++ b/results/combined/merges_timed/t-oster/liblasercut.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,1b8d7560d2e41b046bf2141db37a0026ef3cac1f,b1a2853dbb655ba49769907231c486fff2ed7815,cf14d4d95c09f27c4efaa35b2ebc3b4530b06315,,True,True,6a4aadcab00381ab8c6b16c5b31b2cb6163486c7d0c4c500abd726bc6b36f687,Tests_passed,ca59dda4d0ec61d0c35e61e10e3625837bbbe79c2055ba483b7af0658082eeb5,Tests_passed,True,True,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,0.04989457130432129,0.0581815242767334,0.05586695671081543,0.055925846099853516,0.0675802230834961,0.019044876098632812,0.019267559051513672,0.11400127410888672,0.014687299728393555,0.2139890193939209,0.19690799713134766,0.09880208969116211,1.6819303035736084,0.24785447120666504 +4,refs/heads/master,1b8d7560d2e41b046bf2141db37a0026ef3cac1f,b1a2853dbb655ba49769907231c486fff2ed7815,cf14d4d95c09f27c4efaa35b2ebc3b4530b06315,,True,True,6a4aadcab00381ab8c6b16c5b31b2cb6163486c7d0c4c500abd726bc6b36f687,Tests_passed,ca59dda4d0ec61d0c35e61e10e3625837bbbe79c2055ba483b7af0658082eeb5,Tests_passed,True,True,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,0.04989457130432129,0.0581815242767334,0.05586695671081543,0.055925846099853516,0.0675802230834961,0.019044876098632812,0.019267559051513672,0.11400127410888672,0.014687299728393555,0.21185994148254395,0.1854081153869629,0.09880208969116211,1.6819303035736084,0.24785447120666504 diff --git a/results/combined/merges_timed/t0xa/gelfj.csv b/results/combined/merges_timed/t0xa/gelfj.csv index 5f98b0082a..8cf92dab78 100644 --- a/results/combined/merges_timed/t0xa/gelfj.csv +++ b/results/combined/merges_timed/t0xa/gelfj.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -39,refs/heads/master,f57a572d8c372b60afde1f1f300fdb93e3d1a194,12b0e906d74e71e914a53f94d127a54f65cc5886,6a073dd4aeab69bfe117076da40f41433126bc74,,True,True,4ac95891390d37748067ac2a2e08f79e1f2969c88a163ffa3fd952b5d169fd73,Tests_passed,ad9f380f9ad1fe692f75c7c87c3bbc1c64b31f26ed925f28fcab37e64d0f2e6c,Tests_passed,True,True,Merge_failed,23d05411efc396add1ded6e20caffba96d752989f4049073a07a94561816f517,Merge_failed,5f9da4e070e3787abf07629727db09e4761c376ce50f87081c02557bdf56216d,Merge_failed,23d05411efc396add1ded6e20caffba96d752989f4049073a07a94561816f517,Merge_failed,8291fbd4919178a0a27c44aa3dc57445e286d73d8d0605854ea1407e69711c2c,Merge_failed,2bbb9a2fb5189612f2fd090231e40580bbb7846685a711315de7928aada55326,Merge_failed,2bbb9a2fb5189612f2fd090231e40580bbb7846685a711315de7928aada55326,Merge_failed,23d05411efc396add1ded6e20caffba96d752989f4049073a07a94561816f517,Merge_failed,65f8b64acb814733e47cb7597e5bc67dadc4b6ee5a20cd08fc1edcfafa1ccbae,Merge_failed,23d05411efc396add1ded6e20caffba96d752989f4049073a07a94561816f517,Merge_failed,8f0853dc06a8de047882e72f1e8d19c77125936a089de72a299de6825a943b0c,Merge_failed,8f0853dc06a8de047882e72f1e8d19c77125936a089de72a299de6825a943b0c,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Merge_failed,fa254aa966a604f0349e3def88b3b44b5e3a4a9df66ac5bba14c3e0250fbc03f,0.034657955169677734,0.04533243179321289,0.04227709770202637,0.042845964431762695,0.04363751411437988,0.03152346611022949,0.04490208625793457,0.49304723739624023,0.10642814636230469,0.6180121898651123,0.617518424987793,0.4368579387664795,3.882582426071167,0.20582318305969238 +39,refs/heads/master,f57a572d8c372b60afde1f1f300fdb93e3d1a194,12b0e906d74e71e914a53f94d127a54f65cc5886,6a073dd4aeab69bfe117076da40f41433126bc74,,True,True,4ac95891390d37748067ac2a2e08f79e1f2969c88a163ffa3fd952b5d169fd73,Tests_passed,ad9f380f9ad1fe692f75c7c87c3bbc1c64b31f26ed925f28fcab37e64d0f2e6c,Tests_passed,True,True,Merge_failed,23d05411efc396add1ded6e20caffba96d752989f4049073a07a94561816f517,Merge_failed,5f9da4e070e3787abf07629727db09e4761c376ce50f87081c02557bdf56216d,Merge_failed,23d05411efc396add1ded6e20caffba96d752989f4049073a07a94561816f517,Merge_failed,8291fbd4919178a0a27c44aa3dc57445e286d73d8d0605854ea1407e69711c2c,Merge_failed,2bbb9a2fb5189612f2fd090231e40580bbb7846685a711315de7928aada55326,Merge_failed,2bbb9a2fb5189612f2fd090231e40580bbb7846685a711315de7928aada55326,Merge_failed,23d05411efc396add1ded6e20caffba96d752989f4049073a07a94561816f517,Merge_failed,65f8b64acb814733e47cb7597e5bc67dadc4b6ee5a20cd08fc1edcfafa1ccbae,Merge_failed,23d05411efc396add1ded6e20caffba96d752989f4049073a07a94561816f517,Merge_failed,8f0853dc06a8de047882e72f1e8d19c77125936a089de72a299de6825a943b0c,Merge_failed,8f0853dc06a8de047882e72f1e8d19c77125936a089de72a299de6825a943b0c,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Merge_failed,fa254aa966a604f0349e3def88b3b44b5e3a4a9df66ac5bba14c3e0250fbc03f,0.034657955169677734,0.04533243179321289,0.04227709770202637,0.042845964431762695,0.04363751411437988,0.03152346611022949,0.04490208625793457,0.49304723739624023,0.10642814636230469,0.613811731338501,0.6115028858184814,0.4368579387664795,3.882582426071167,0.20582318305969238 diff --git a/results/combined/merges_timed/tabulapdf/tabula-java.csv b/results/combined/merges_timed/tabulapdf/tabula-java.csv index 4ee1b8a4e0..90f6d5da6d 100644 --- a/results/combined/merges_timed/tabulapdf/tabula-java.csv +++ b/results/combined/merges_timed/tabulapdf/tabula-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -78,refs/remotes/origin/pull/217,03052f76c71af1b9b91e2c8023490c30456e2d45,5d90107c4a8a2c6a9bc2019dcfd3e119603fe6a0,1eafa3e2cda365e57967ca2b618b6b5aa08770a3,,True,True,147a7b0309bfe281310d919ce0204b76525d7b7adecd13954c427c90272add03,Tests_passed,f897ea7da8f55e50f011b4dc53a2582cdca7da12032b0cb6c5a3786ceb5695f0,Tests_passed,True,True,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,f4ac12024ac3d22e652d0d27774e70003cab9999dc818ee210923e1715891499,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,0.048470497131347656,0.052896738052368164,0.0530552864074707,0.045711517333984375,0.05224776268005371,0.049524545669555664,0.049344778060913086,0.2246718406677246,0.04679226875305176,0.31990885734558105,0.3307826519012451,0.16437721252441406,2.7011666297912598,0.25299859046936035 +78,refs/remotes/origin/pull/217,03052f76c71af1b9b91e2c8023490c30456e2d45,5d90107c4a8a2c6a9bc2019dcfd3e119603fe6a0,1eafa3e2cda365e57967ca2b618b6b5aa08770a3,,True,True,147a7b0309bfe281310d919ce0204b76525d7b7adecd13954c427c90272add03,Tests_passed,f897ea7da8f55e50f011b4dc53a2582cdca7da12032b0cb6c5a3786ceb5695f0,Tests_passed,True,True,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,f4ac12024ac3d22e652d0d27774e70003cab9999dc818ee210923e1715891499,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,0.048470497131347656,0.052896738052368164,0.0530552864074707,0.045711517333984375,0.05224776268005371,0.049524545669555664,0.049344778060913086,0.2246718406677246,0.04679226875305176,0.32851576805114746,0.33148980140686035,0.16437721252441406,2.7011666297912598,0.25299859046936035 diff --git a/results/combined/merges_timed/tacitknowledge/jcr-mock.csv b/results/combined/merges_timed/tacitknowledge/jcr-mock.csv index 8f17df80ed..b8b8685d50 100644 --- a/results/combined/merges_timed/tacitknowledge/jcr-mock.csv +++ b/results/combined/merges_timed/tacitknowledge/jcr-mock.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,5c7849bea5cd1f26dc97a5b85f069a3b586485ed,cb49187d9a84ab070a49d6af8a16bb00b59da572,399a1ef752b17491e80b0fedc1f4b2668e51ed36,,True,True,1b7bdf6ccaca77f530e33d4247aab27392b865be1741ee544661d01ccaa061d5,Tests_passed,5f9b74f3ba14a3159e310483d79e86567f1d607d607205095d5288a11ded26d0,Tests_passed,True,True,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,0.05289626121520996,0.04740548133850098,0.054036855697631836,0.05247759819030762,0.04678964614868164,0.05577564239501953,0.04749703407287598,0.16563010215759277,0.03943920135498047,0.1567249298095703,0.15531134605407715,0.10259485244750977,0.877765417098999,0.18656611442565918 +14,refs/heads/master,5c7849bea5cd1f26dc97a5b85f069a3b586485ed,cb49187d9a84ab070a49d6af8a16bb00b59da572,399a1ef752b17491e80b0fedc1f4b2668e51ed36,,True,True,1b7bdf6ccaca77f530e33d4247aab27392b865be1741ee544661d01ccaa061d5,Tests_passed,5f9b74f3ba14a3159e310483d79e86567f1d607d607205095d5288a11ded26d0,Tests_passed,True,True,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,0.05289626121520996,0.04740548133850098,0.054036855697631836,0.05247759819030762,0.04678964614868164,0.05577564239501953,0.04749703407287598,0.16563010215759277,0.03943920135498047,0.15416646003723145,0.1544499397277832,0.10259485244750977,0.877765417098999,0.18656611442565918 diff --git a/results/combined/merges_timed/tackley/dbdeploy.csv b/results/combined/merges_timed/tackley/dbdeploy.csv index 5013ceb9ff..9a5e483e61 100644 --- a/results/combined/merges_timed/tackley/dbdeploy.csv +++ b/results/combined/merges_timed/tackley/dbdeploy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,50e6bb3003bf2e91512f9263a966f9e30fb17113,22c01a36a381eea3fc3650a2761bd55c14c84e28,d879c80b39966a526add4c1917914fd609194273,,13ba18ea3211bcde7d10dd3ba2c942c8c3555683e1f05456f3770576345438f6,Tests_passed,a3dbe934c9df25f77e2804d71d996605a5d5c712105a4f43af8b6a188f2ba0ee,Tests_passed,True,True,True,True,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,67815747f1ea12ef0e1de937fd763b6cb8ac6d97cd27276cdc27a1632d8addd1,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,67815747f1ea12ef0e1de937fd763b6cb8ac6d97cd27276cdc27a1632d8addd1,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,558dd22fcc7e4db65c262f8685510468ec77edb3597daab495314a04479ef968,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,cdbbc288545d3754ab2907f1d2cc010c5d95a384a933fcb2d0142118a3dee17d,Merge_failed,0a9aac46e2874f606757fbfb0816e0ca18c02eefbb47654cdc1f0641cbb411c3,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,fb914efb04b7928ab7ebb9b937f7352943bd7639c52d0933b29120090e2610f0,Merge_failed,ea3619407f3e9007774c4c21425d79abb5ed7a2663e2c82b8fba2f5a35634241,0.04839038848876953,0.052559614181518555,0.04446077346801758,0.038683176040649414,0.05119824409484863,0.052079200744628906,0.056581974029541016,0.6682753562927246,0.11531925201416016,0.5495948791503906,0.5481257438659668,0.5694789886474609,2.651601552963257,0.22514653205871582 +1,refs/heads/master,50e6bb3003bf2e91512f9263a966f9e30fb17113,22c01a36a381eea3fc3650a2761bd55c14c84e28,d879c80b39966a526add4c1917914fd609194273,,13ba18ea3211bcde7d10dd3ba2c942c8c3555683e1f05456f3770576345438f6,Tests_passed,a3dbe934c9df25f77e2804d71d996605a5d5c712105a4f43af8b6a188f2ba0ee,Tests_passed,True,True,True,True,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,67815747f1ea12ef0e1de937fd763b6cb8ac6d97cd27276cdc27a1632d8addd1,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,67815747f1ea12ef0e1de937fd763b6cb8ac6d97cd27276cdc27a1632d8addd1,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,558dd22fcc7e4db65c262f8685510468ec77edb3597daab495314a04479ef968,Merge_failed,1c2b3d37ffd19e58359b5fc8ff56c8975309fc45e6a9b9b3e2c92c969f42259d,Merge_failed,cdbbc288545d3754ab2907f1d2cc010c5d95a384a933fcb2d0142118a3dee17d,Merge_failed,0a9aac46e2874f606757fbfb0816e0ca18c02eefbb47654cdc1f0641cbb411c3,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,fb914efb04b7928ab7ebb9b937f7352943bd7639c52d0933b29120090e2610f0,Merge_failed,ea3619407f3e9007774c4c21425d79abb5ed7a2663e2c82b8fba2f5a35634241,0.04839038848876953,0.052559614181518555,0.04446077346801758,0.038683176040649414,0.05119824409484863,0.052079200744628906,0.056581974029541016,0.6682753562927246,0.11531925201416016,0.5434119701385498,0.5424730777740479,0.5694789886474609,2.651601552963257,0.22514653205871582 diff --git a/results/combined/merges_timed/tadglines/socket.io-java.csv b/results/combined/merges_timed/tadglines/socket.io-java.csv index eaa12764c0..42b804a7ff 100644 --- a/results/combined/merges_timed/tadglines/socket.io-java.csv +++ b/results/combined/merges_timed/tadglines/socket.io-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/remotes/origin/pull/5,0b8d2cd18442e598db6bdb1df67e815bc23b0e24,8e7d52406fd6ab70d0f536846c547179da689598,9e85c5a5b25fca09c22322af5b99dc6c77986cdb,,True,True,4702dd6ada2d6c527be42fe3757e01ccdb6d201b21a29c284a2b33476ae4fd5a,Tests_passed,dc317441af3533bf1923b17fdbf79590fe733faac43f91aace9952a1c33348b2,Tests_passed,True,True,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,243a5299972eaeb1835ad399c6fe13ca630851356e960c76277df57607a2d977,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,9567fdda47edbce306fcd341f99f525dfd2f390978c3e9fee4fadfaf44bd871e,Merge_failed,9567fdda47edbce306fcd341f99f525dfd2f390978c3e9fee4fadfaf44bd871e,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,d7b4982b99e0389c22e167ab4a063b3386410857d08ce186df4a6deefbccd637,0.05713057518005371,0.05605483055114746,0.04126691818237305,0.05292916297912598,0.07038998603820801,0.06493210792541504,0.05194401741027832,0.23194026947021484,0.07172679901123047,0.06910848617553711,0.06919360160827637,0.13475394248962402,0.5069625377655029,0.264662504196167 +9,refs/remotes/origin/pull/5,0b8d2cd18442e598db6bdb1df67e815bc23b0e24,8e7d52406fd6ab70d0f536846c547179da689598,9e85c5a5b25fca09c22322af5b99dc6c77986cdb,,True,True,4702dd6ada2d6c527be42fe3757e01ccdb6d201b21a29c284a2b33476ae4fd5a,Tests_passed,dc317441af3533bf1923b17fdbf79590fe733faac43f91aace9952a1c33348b2,Tests_passed,True,True,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,243a5299972eaeb1835ad399c6fe13ca630851356e960c76277df57607a2d977,Merge_failed,0dec64167dbdfae276ea98dd775cd42659108cecefcbbdf03c5ae01a9a794d25,Merge_failed,9567fdda47edbce306fcd341f99f525dfd2f390978c3e9fee4fadfaf44bd871e,Merge_failed,9567fdda47edbce306fcd341f99f525dfd2f390978c3e9fee4fadfaf44bd871e,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,d7b4982b99e0389c22e167ab4a063b3386410857d08ce186df4a6deefbccd637,0.05713057518005371,0.05605483055114746,0.04126691818237305,0.05292916297912598,0.07038998603820801,0.06493210792541504,0.05194401741027832,0.23194026947021484,0.07172679901123047,0.06898665428161621,0.06913590431213379,0.13475394248962402,0.5069625377655029,0.264662504196167 diff --git a/results/combined/merges_timed/taimos/daemon-framework.csv b/results/combined/merges_timed/taimos/daemon-framework.csv index 599299880b..d58f581f96 100644 --- a/results/combined/merges_timed/taimos/daemon-framework.csv +++ b/results/combined/merges_timed/taimos/daemon-framework.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,f1696c8958a9311d29297b106064211abec721dd,f0d0273d57f9788f4ec9f67e775b72cd3f67989d,734108ae9a6c9041a6cc9d2dae044288a15a5914,,36e16e2a7b16c01841741244c419038c7b176b2b6ad930d96fbb491c9a40ea02,Tests_passed,23e98da8783a222b4f3eef095527de5997fc4f2df434492d0e43913138abe462,Tests_passed,True,True,True,True,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,1e2dc7afeb4f81015cd7900e280a4cabe07b915faadc16935528b3a9cd2e6afc,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,664691f2cf128f3d2020fe63936d9f3e2cf5b04dafcb37617c3531ffc454ba64,Merge_failed,664691f2cf128f3d2020fe63936d9f3e2cf5b04dafcb37617c3531ffc454ba64,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,482605dc79de940fa50c2b5abe64c904203554de03a2ffc0451665caedd1f523,Merge_failed,ac760d4bb31cfac6c106dfdca47545de4a8d1ab3bbf00c7ebbdf386fecf8418e,0.04091382026672363,0.03199124336242676,0.03783845901489258,0.031865835189819336,0.03195905685424805,0.04061484336853027,0.04035615921020508,0.17400908470153809,0.07959294319152832,0.06438660621643066,0.06436991691589355,0.18381094932556152,0.8892562389373779,0.196608304977417 +5,refs/heads/master,f1696c8958a9311d29297b106064211abec721dd,f0d0273d57f9788f4ec9f67e775b72cd3f67989d,734108ae9a6c9041a6cc9d2dae044288a15a5914,,36e16e2a7b16c01841741244c419038c7b176b2b6ad930d96fbb491c9a40ea02,Tests_passed,23e98da8783a222b4f3eef095527de5997fc4f2df434492d0e43913138abe462,Tests_passed,True,True,True,True,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,1e2dc7afeb4f81015cd7900e280a4cabe07b915faadc16935528b3a9cd2e6afc,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,664691f2cf128f3d2020fe63936d9f3e2cf5b04dafcb37617c3531ffc454ba64,Merge_failed,664691f2cf128f3d2020fe63936d9f3e2cf5b04dafcb37617c3531ffc454ba64,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,482605dc79de940fa50c2b5abe64c904203554de03a2ffc0451665caedd1f523,Merge_failed,ac760d4bb31cfac6c106dfdca47545de4a8d1ab3bbf00c7ebbdf386fecf8418e,0.04091382026672363,0.03199124336242676,0.03783845901489258,0.031865835189819336,0.03195905685424805,0.04061484336853027,0.04035615921020508,0.17400908470153809,0.07959294319152832,0.06319880485534668,0.06381773948669434,0.18381094932556152,0.8892562389373779,0.196608304977417 diff --git a/results/combined/merges_timed/takari/maven-polyglot.csv b/results/combined/merges_timed/takari/maven-polyglot.csv index 8851980470..e12984378f 100644 --- a/results/combined/merges_timed/takari/maven-polyglot.csv +++ b/results/combined/merges_timed/takari/maven-polyglot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -112,refs/remotes/origin/pull/257,746ef5141b10b1281a83864bd72ff5b78816762b,81f25ea0fffb6c4e6f06b45fbf095ec1cd5c8faa,64c31c9ec3f960f91c03c9190058ce46015e92d1,,True,True,b467f82db537e206fa5bb04b80cd2d9cfd68ef9a4a64c9e2b042012887ac8311,Tests_passed,9f6c159422c4e3c711e033a45403aed025b389ca66eb5de3ac9d11cd54d9baf0,Tests_passed,True,True,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,8811edd17fb5eeca45b6aa1dc46a49adacc32a6336a1408d68af7e4cac643d59,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,8811edd17fb5eeca45b6aa1dc46a49adacc32a6336a1408d68af7e4cac643d59,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,22705396dbe3b7f5ecdc7c0d053862d1cac418c2b2dc1f0f278d0208b8643d7f,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,1b97ab4de50813d15f685a52b54cda1164aefa35125c2c4b0de4a3b0c6612699,Merge_failed,1b97ab4de50813d15f685a52b54cda1164aefa35125c2c4b0de4a3b0c6612699,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,e08ed24e65b4f80ffc67cc8efbe016edca9276f3f374d73da0b47b56cfc3e27c,Merge_failed,0d9a72dcd41dd6794888fea88d34f018039d46faa4413f373bb095f42a5ef78e,0.01901984214782715,0.018642425537109375,0.020608186721801758,0.020964622497558594,0.03937101364135742,0.02161693572998047,0.021588563919067383,0.10232329368591309,0.046140432357788086,0.41950559616088867,0.420665979385376,0.29697418212890625,2.5837721824645996,0.29970550537109375 +112,refs/remotes/origin/pull/257,746ef5141b10b1281a83864bd72ff5b78816762b,81f25ea0fffb6c4e6f06b45fbf095ec1cd5c8faa,64c31c9ec3f960f91c03c9190058ce46015e92d1,,True,True,b467f82db537e206fa5bb04b80cd2d9cfd68ef9a4a64c9e2b042012887ac8311,Tests_passed,9f6c159422c4e3c711e033a45403aed025b389ca66eb5de3ac9d11cd54d9baf0,Tests_passed,True,True,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,8811edd17fb5eeca45b6aa1dc46a49adacc32a6336a1408d68af7e4cac643d59,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,8811edd17fb5eeca45b6aa1dc46a49adacc32a6336a1408d68af7e4cac643d59,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,22705396dbe3b7f5ecdc7c0d053862d1cac418c2b2dc1f0f278d0208b8643d7f,Merge_failed,7d83352575512ec4081e8a1ae97186fd602b1a6fb6e2553029d04dc03f910ada,Merge_failed,1b97ab4de50813d15f685a52b54cda1164aefa35125c2c4b0de4a3b0c6612699,Merge_failed,1b97ab4de50813d15f685a52b54cda1164aefa35125c2c4b0de4a3b0c6612699,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,e08ed24e65b4f80ffc67cc8efbe016edca9276f3f374d73da0b47b56cfc3e27c,Merge_failed,0d9a72dcd41dd6794888fea88d34f018039d46faa4413f373bb095f42a5ef78e,0.01901984214782715,0.018642425537109375,0.020608186721801758,0.020964622497558594,0.03937101364135742,0.02161693572998047,0.021588563919067383,0.10232329368591309,0.046140432357788086,0.4283771514892578,0.417100191116333,0.29697418212890625,2.5837721824645996,0.29970550537109375 diff --git a/results/combined/merges_timed/takari/maven-profiler.csv b/results/combined/merges_timed/takari/maven-profiler.csv index f46f2e6aa0..eacbe7d03b 100644 --- a/results/combined/merges_timed/takari/maven-profiler.csv +++ b/results/combined/merges_timed/takari/maven-profiler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,2d7f5eba094953230771d27e6d178cfe31373c6d,1b28f199e81f4644158ce00777be0a01c9ec352d,bd79a8b0afb29357df3d1e6567a4a08b8fee6b07,,62069443749a1b72cee7ba90461fc8b46c73539adbe0031cb0a851e36898629a,Tests_passed,acbacc44c3b64f710cbe0eb3d76b2e42ff12df0cc78a946c4ddc765bdd747ed7,Tests_passed,True,True,True,True,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,237b60a9d7ecef48390b0a7d41e5940753a453249807802133f53246b30a9bd4,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7410ea17e3e6c1d685c1b5deb76ff24175b6b7628a998af86fe3076547ff82b7,Merge_failed,7410ea17e3e6c1d685c1b5deb76ff24175b6b7628a998af86fe3076547ff82b7,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Merge_failed,ed40156f5490b63837f907c565591233550936d714500809a9229934eda900bc,0.03977608680725098,0.03958272933959961,0.03516364097595215,0.035744667053222656,0.03660225868225098,0.035181522369384766,0.03385448455810547,0.16474246978759766,0.06409955024719238,0.13964104652404785,0.13991379737854004,0.11278104782104492,0.43213319778442383,0.18578171730041504 +1,refs/heads/master,2d7f5eba094953230771d27e6d178cfe31373c6d,1b28f199e81f4644158ce00777be0a01c9ec352d,bd79a8b0afb29357df3d1e6567a4a08b8fee6b07,,62069443749a1b72cee7ba90461fc8b46c73539adbe0031cb0a851e36898629a,Tests_passed,acbacc44c3b64f710cbe0eb3d76b2e42ff12df0cc78a946c4ddc765bdd747ed7,Tests_passed,True,True,True,True,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,237b60a9d7ecef48390b0a7d41e5940753a453249807802133f53246b30a9bd4,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7410ea17e3e6c1d685c1b5deb76ff24175b6b7628a998af86fe3076547ff82b7,Merge_failed,7410ea17e3e6c1d685c1b5deb76ff24175b6b7628a998af86fe3076547ff82b7,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Merge_failed,ed40156f5490b63837f907c565591233550936d714500809a9229934eda900bc,0.03977608680725098,0.03958272933959961,0.03516364097595215,0.035744667053222656,0.03660225868225098,0.035181522369384766,0.03385448455810547,0.16474246978759766,0.06409955024719238,0.12872767448425293,0.12977075576782227,0.11278104782104492,0.43213319778442383,0.18578171730041504 diff --git a/results/combined/merges_timed/taotaotheripper/sault.csv b/results/combined/merges_timed/taotaotheripper/sault.csv index 366bac4a4c..9e662d14aa 100644 --- a/results/combined/merges_timed/taotaotheripper/sault.csv +++ b/results/combined/merges_timed/taotaotheripper/sault.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,c42a266c8aca381fb541ecf5cabf1ad9594f7026,933d69d97a75b7e2b5e6f8eabd004a6bcf789e86,9cda7b949bf4e8acfb7afba7dc17e83307b83b50,,a916198305d4b0c58d332060d3084a179fa14278dc36ebf80d30d62fe86cde03,Tests_passed,0863541900daa4d3cad7f5d42ce2a82a639377ad1192b6b490b0b778e8ae51a1,Tests_passed,True,True,True,True,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,fa71d4138307c1b58f28d072ea01f438c8994ab5e2961aa3899678796e05b221,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,3724662ff57f59717b5e65c478161949b9e4f63df2920ccba1d700e7d96c523e,Merge_failed,3724662ff57f59717b5e65c478161949b9e4f63df2920ccba1d700e7d96c523e,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Merge_failed,29706de50159bdc32df7068894300360f5ec3fb2131ad54adc9052f43fadf892,0.008306741714477539,0.008397817611694336,0.008479595184326172,0.008207559585571289,0.00822901725769043,0.008214235305786133,0.008481025695800781,0.04323387145996094,0.015218734741210938,0.12233686447143555,0.12256193161010742,0.12239646911621094,1.458219051361084,0.17210984230041504 +1,refs/heads/master,c42a266c8aca381fb541ecf5cabf1ad9594f7026,933d69d97a75b7e2b5e6f8eabd004a6bcf789e86,9cda7b949bf4e8acfb7afba7dc17e83307b83b50,,a916198305d4b0c58d332060d3084a179fa14278dc36ebf80d30d62fe86cde03,Tests_passed,0863541900daa4d3cad7f5d42ce2a82a639377ad1192b6b490b0b778e8ae51a1,Tests_passed,True,True,True,True,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,fa71d4138307c1b58f28d072ea01f438c8994ab5e2961aa3899678796e05b221,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,3724662ff57f59717b5e65c478161949b9e4f63df2920ccba1d700e7d96c523e,Merge_failed,3724662ff57f59717b5e65c478161949b9e4f63df2920ccba1d700e7d96c523e,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Merge_failed,29706de50159bdc32df7068894300360f5ec3fb2131ad54adc9052f43fadf892,0.008306741714477539,0.008397817611694336,0.008479595184326172,0.008207559585571289,0.00822901725769043,0.008214235305786133,0.008481025695800781,0.04323387145996094,0.015218734741210938,0.12105250358581543,0.12183642387390137,0.12239646911621094,1.458219051361084,0.17210984230041504 diff --git a/results/combined/merges_timed/tarql/tarql.csv b/results/combined/merges_timed/tarql/tarql.csv index 1ced14400e..1529c3df8a 100644 --- a/results/combined/merges_timed/tarql/tarql.csv +++ b/results/combined/merges_timed/tarql/tarql.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/remotes/origin/pull/83,0644473c2bd9194e86eed5131e12cc580cf2956b,343224e3375158c06a2e4fafc7f4463c39a3822d,8f17e28a9cb099b6c1c4dfe8e03f800c8d947a81,,6a39c94c100e8e5f5435520039216821f405f5bd3435be6742f2c7ee147af28d,Tests_passed,e62e083db65054b04132adc83c650d77d3b07ec2da039b6a31904ca3a7a1fd83,Tests_passed,True,True,True,True,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,eb15c4879377776fe522e35b7ea78a8f1a107b02c114c62292dc1dfd80f6f6ec,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,6a025c8d33f45034f4515115b95d3275753aeb09c4c7f813000c6d75b212f250,Merge_failed,6a025c8d33f45034f4515115b95d3275753aeb09c4c7f813000c6d75b212f250,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Merge_failed,c99221f5662bf0691a4942b646a9624eb138ccf3696832084bb0a71e0cb4b382,0.035048484802246094,0.03992176055908203,0.03750753402709961,0.0318598747253418,0.022405385971069336,0.03984332084655762,0.03847360610961914,0.15937566757202148,0.06822562217712402,0.06470370292663574,0.06377077102661133,0.10741233825683594,0.9291791915893555,0.19496965408325195 +10,refs/remotes/origin/pull/83,0644473c2bd9194e86eed5131e12cc580cf2956b,343224e3375158c06a2e4fafc7f4463c39a3822d,8f17e28a9cb099b6c1c4dfe8e03f800c8d947a81,,6a39c94c100e8e5f5435520039216821f405f5bd3435be6742f2c7ee147af28d,Tests_passed,e62e083db65054b04132adc83c650d77d3b07ec2da039b6a31904ca3a7a1fd83,Tests_passed,True,True,True,True,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,eb15c4879377776fe522e35b7ea78a8f1a107b02c114c62292dc1dfd80f6f6ec,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,6a025c8d33f45034f4515115b95d3275753aeb09c4c7f813000c6d75b212f250,Merge_failed,6a025c8d33f45034f4515115b95d3275753aeb09c4c7f813000c6d75b212f250,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Merge_failed,c99221f5662bf0691a4942b646a9624eb138ccf3696832084bb0a71e0cb4b382,0.035048484802246094,0.03992176055908203,0.03750753402709961,0.0318598747253418,0.022405385971069336,0.03984332084655762,0.03847360610961914,0.15937566757202148,0.06822562217712402,0.06448221206665039,0.06457161903381348,0.10741233825683594,0.9291791915893555,0.19496965408325195 diff --git a/results/combined/merges_timed/tasermonkey/thumbnailator.csv b/results/combined/merges_timed/tasermonkey/thumbnailator.csv index 25639fa3cd..5c85d0b250 100644 --- a/results/combined/merges_timed/tasermonkey/thumbnailator.csv +++ b/results/combined/merges_timed/tasermonkey/thumbnailator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,a5b774ffb53f86f36b97d39dbfbe0741ea203438,f7798c6a0ce4ad760eacb103bc33cefd3e1f6455,1576ec739a73e4416fe431f8249aeb74aa6e5b97,,True,True,fa3b945e2f9a7d0d09f0a740b2685a5332a9694ade8b0bed86b5a69b6c2cbf86,Tests_passed,2de97e5c3df6490ed251b3184db36772e6c29b89f81972a053cde7015cddd5e9,Tests_passed,True,True,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,0.050701141357421875,0.013884782791137695,0.014980077743530273,0.013988971710205078,0.01704883575439453,0.049243927001953125,0.056847333908081055,0.16471004486083984,0.03531217575073242,0.22969937324523926,0.22152185440063477,0.11032509803771973,2.0568888187408447,0.2440049648284912 +5,refs/heads/master,a5b774ffb53f86f36b97d39dbfbe0741ea203438,f7798c6a0ce4ad760eacb103bc33cefd3e1f6455,1576ec739a73e4416fe431f8249aeb74aa6e5b97,,True,True,fa3b945e2f9a7d0d09f0a740b2685a5332a9694ade8b0bed86b5a69b6c2cbf86,Tests_passed,2de97e5c3df6490ed251b3184db36772e6c29b89f81972a053cde7015cddd5e9,Tests_passed,True,True,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,0.050701141357421875,0.013884782791137695,0.014980077743530273,0.013988971710205078,0.01704883575439453,0.049243927001953125,0.056847333908081055,0.16471004486083984,0.03531217575073242,0.23923897743225098,0.23396706581115723,0.11032509803771973,2.0568888187408447,0.2440049648284912 diff --git a/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv b/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv index 4497226fa8..718d222ba3 100644 --- a/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv +++ b/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/heads/master,c3b38c0b78286623022b1bfb8b4cac5a5d732e8e,05f1be895ef13eca5ebc195863a901093d9c63be,e05ab77b5f2e5562b109f4669bbaad0ab6113b5f,,True,True,4d1b2e312f9a0da65efae4eaebe70fb50d864c7d88bdaef362d831fbf69c6eff,Tests_passed,1143f6a8dbb39ab2a96152b6ffdd09ce909ccbf0a52546980c6458c4933a2630,Tests_passed,True,True,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,0.016752243041992188,0.017255067825317383,0.020101308822631836,0.020272016525268555,0.020020246505737305,0.01999354362487793,0.02037358283996582,0.11244726181030273,0.01747894287109375,1.0176022052764893,1.018979787826538,0.3364527225494385,6.4538414478302,0.20489144325256348 +25,refs/heads/master,c3b38c0b78286623022b1bfb8b4cac5a5d732e8e,05f1be895ef13eca5ebc195863a901093d9c63be,e05ab77b5f2e5562b109f4669bbaad0ab6113b5f,,True,True,4d1b2e312f9a0da65efae4eaebe70fb50d864c7d88bdaef362d831fbf69c6eff,Tests_passed,1143f6a8dbb39ab2a96152b6ffdd09ce909ccbf0a52546980c6458c4933a2630,Tests_passed,True,True,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,0.016752243041992188,0.017255067825317383,0.020101308822631836,0.020272016525268555,0.020020246505737305,0.01999354362487793,0.02037358283996582,0.11244726181030273,0.01747894287109375,0.9864132404327393,0.9795212745666504,0.3364527225494385,6.4538414478302,0.20489144325256348 diff --git a/results/combined/merges_timed/tcurdt/jdeb.csv b/results/combined/merges_timed/tcurdt/jdeb.csv index 658c2948b8..6e5e55358f 100644 --- a/results/combined/merges_timed/tcurdt/jdeb.csv +++ b/results/combined/merges_timed/tcurdt/jdeb.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -84,refs/remotes/origin/pull/139,bbf1c1ad25cd27b141e5973cc7d70575a951faf4,cd5398c82520d7200a428fa90daa50f1b5b79413,f5a3be7ac1c646b94e9c197d12061cb33d2fa32e,,True,True,e9fd9b2e220fb8c5f4bcf29f8d1650e34aecc6d37d82ee24ba32cd3c742628da,Tests_passed,aafeef1a862eb9c473dd7e94a56b69b88eebb106923abe3d272f035c60d1d94c,Tests_passed,True,True,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,77fda33ff09e31f78c50d26309260a422d2a1129b7d4d29f6198bb72d9de4d35,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,77fda33ff09e31f78c50d26309260a422d2a1129b7d4d29f6198bb72d9de4d35,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,c073abc40c352829b050b15cefad3f430a1264f44b617bb7562465f5e69869d1,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,a4037b90f1b61bf400ac76cafc674b857d856a09807d79befee34869ffae6297,Merge_failed,fe162c29260385ea206bdc918e73570fbde11f7bb4fd842dda8e5fc1b443db40,Merge_failed,303e3dcc51e61fc5b9ba20dc26972ac5daac72162e07f70ccc5972ea92ad1b0f,Merge_failed,5e6dc71ec77754919e16c07220afa8fbfc92e273eee2ec73e8f37297f0e8dab4,Merge_failed,b87ea880f7c1e2f51a543e76e5f59e87994333e695f730d1cbff230eeb81acab,0.056647539138793945,0.04537677764892578,0.0582125186920166,0.04661226272583008,0.035658836364746094,0.05364274978637695,0.05900263786315918,0.3859422206878662,0.07831454277038574,0.37306809425354004,0.37125277519226074,0.28548479080200195,1.781719446182251,0.25260448455810547 +84,refs/remotes/origin/pull/139,bbf1c1ad25cd27b141e5973cc7d70575a951faf4,cd5398c82520d7200a428fa90daa50f1b5b79413,f5a3be7ac1c646b94e9c197d12061cb33d2fa32e,,True,True,e9fd9b2e220fb8c5f4bcf29f8d1650e34aecc6d37d82ee24ba32cd3c742628da,Tests_passed,aafeef1a862eb9c473dd7e94a56b69b88eebb106923abe3d272f035c60d1d94c,Tests_passed,True,True,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,77fda33ff09e31f78c50d26309260a422d2a1129b7d4d29f6198bb72d9de4d35,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,77fda33ff09e31f78c50d26309260a422d2a1129b7d4d29f6198bb72d9de4d35,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,c073abc40c352829b050b15cefad3f430a1264f44b617bb7562465f5e69869d1,Merge_failed,e38dd197aef2989fb44ed7add6b4c7627c286fb0e04d7021868407054c0522dd,Merge_failed,a4037b90f1b61bf400ac76cafc674b857d856a09807d79befee34869ffae6297,Merge_failed,fe162c29260385ea206bdc918e73570fbde11f7bb4fd842dda8e5fc1b443db40,Merge_failed,303e3dcc51e61fc5b9ba20dc26972ac5daac72162e07f70ccc5972ea92ad1b0f,Merge_failed,5e6dc71ec77754919e16c07220afa8fbfc92e273eee2ec73e8f37297f0e8dab4,Merge_failed,b87ea880f7c1e2f51a543e76e5f59e87994333e695f730d1cbff230eeb81acab,0.056647539138793945,0.04537677764892578,0.0582125186920166,0.04661226272583008,0.035658836364746094,0.05364274978637695,0.05900263786315918,0.3859422206878662,0.07831454277038574,0.3684399127960205,0.36726808547973633,0.28548479080200195,1.781719446182251,0.25260448455810547 diff --git a/results/combined/merges_timed/tdebatty/string-similarity.csv b/results/combined/merges_timed/tdebatty/string-similarity.csv index d819b824a1..36018a9c97 100644 --- a/results/combined/merges_timed/tdebatty/string-similarity.csv +++ b/results/combined/merges_timed/tdebatty/string-similarity.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/master,2b2930e1f500efd5f9efbd95891a62ab7da3a818,4f03e3415088bf26bbef62b06090b525974a7cd8,25ac055200fb6fc1f762258aee8cf30d166b0cc1,,True,True,f8ff744cc3f1436d03a0f83e3199e8eb96e1b55d3191e23453c641baaa17ee35,Tests_passed,f51968e07c00a98b945404ab66db082ac8a53bd51cf50a948c54c1ca803f354a,Tests_passed,True,True,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,b00ede1d197a5939dc211eda4e5a00a002bfb0e44aa407f8f1b061f443776c8e,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Merge_failed,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,ed9a7f5d930117d6b1016d2a3ab2a1a9f9d9f872ea71ee3f488971b9e4d7715d,0.03553462028503418,0.03863644599914551,0.03687739372253418,0.03499579429626465,0.03679299354553223,0.027471065521240234,0.029201507568359375,0.16185355186462402,0.05669546127319336,0.1522963047027588,0.15105605125427246,0.11900568008422852,0.6155436038970947,0.19305872917175293 +26,refs/heads/master,2b2930e1f500efd5f9efbd95891a62ab7da3a818,4f03e3415088bf26bbef62b06090b525974a7cd8,25ac055200fb6fc1f762258aee8cf30d166b0cc1,,True,True,f8ff744cc3f1436d03a0f83e3199e8eb96e1b55d3191e23453c641baaa17ee35,Tests_passed,f51968e07c00a98b945404ab66db082ac8a53bd51cf50a948c54c1ca803f354a,Tests_passed,True,True,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,b00ede1d197a5939dc211eda4e5a00a002bfb0e44aa407f8f1b061f443776c8e,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Merge_failed,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,ed9a7f5d930117d6b1016d2a3ab2a1a9f9d9f872ea71ee3f488971b9e4d7715d,0.03553462028503418,0.03863644599914551,0.03687739372253418,0.03499579429626465,0.03679299354553223,0.027471065521240234,0.029201507568359375,0.16185355186462402,0.05669546127319336,0.15013384819030762,0.14963889122009277,0.11900568008422852,0.6155436038970947,0.19305872917175293 diff --git a/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv b/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv index 66b99d893e..b798ccda89 100644 --- a/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv +++ b/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -112,refs/remotes/origin/pull/64,89bea69f8eea1dfa5e8cc75c0dc1a941e6306aa4,5550df625dfea8ee9cdccc0c0cb4f4c68fd46fd0,92604b1effaeee499cc82b3e833466c1303bec80,,True,True,1b2b48bdf7513b63b9be55f04eaf0057a560a16a7a3ce244c4ec83569cd52ec7,Tests_passed,54b465ab5a627006d402301d7c245fafd6ef29de9b2d2c6e192f94d6417a8997,Tests_passed,True,True,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,c47918a7442e42dfa24a7a222ab3ebf88fa737b1d93496a454095e107060a25c,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,c47918a7442e42dfa24a7a222ab3ebf88fa737b1d93496a454095e107060a25c,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,359146caa77eefb30b2fc063f34fbaf022b66a1fce81604e8585a702b283884e,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,0994bb4b03d8f9b4d67ee1b5a548d4bf1b9e9b8682bbf6cf4af2ac6ac7fb8271,Merge_failed,0994bb4b03d8f9b4d67ee1b5a548d4bf1b9e9b8682bbf6cf4af2ac6ac7fb8271,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,dd8f339e65965937767b23a452a9d847306c1f98859f3c29e4786c87e05c1b67,0.04657745361328125,0.046735286712646484,0.051160335540771484,0.0288541316986084,0.04456925392150879,0.0327916145324707,0.04673600196838379,0.9252209663391113,0.21095967292785645,1.1703393459320068,1.1736979484558105,0.8061039447784424,5.48820161819458,0.2750675678253174 +112,refs/remotes/origin/pull/64,89bea69f8eea1dfa5e8cc75c0dc1a941e6306aa4,5550df625dfea8ee9cdccc0c0cb4f4c68fd46fd0,92604b1effaeee499cc82b3e833466c1303bec80,,True,True,1b2b48bdf7513b63b9be55f04eaf0057a560a16a7a3ce244c4ec83569cd52ec7,Tests_passed,54b465ab5a627006d402301d7c245fafd6ef29de9b2d2c6e192f94d6417a8997,Tests_passed,True,True,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,c47918a7442e42dfa24a7a222ab3ebf88fa737b1d93496a454095e107060a25c,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,c47918a7442e42dfa24a7a222ab3ebf88fa737b1d93496a454095e107060a25c,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,359146caa77eefb30b2fc063f34fbaf022b66a1fce81604e8585a702b283884e,Merge_failed,168cdeb0e092ed005da3903dee3e106ef310e819e45600d97923eab0e6f38011,Merge_failed,0994bb4b03d8f9b4d67ee1b5a548d4bf1b9e9b8682bbf6cf4af2ac6ac7fb8271,Merge_failed,0994bb4b03d8f9b4d67ee1b5a548d4bf1b9e9b8682bbf6cf4af2ac6ac7fb8271,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,dd8f339e65965937767b23a452a9d847306c1f98859f3c29e4786c87e05c1b67,0.04657745361328125,0.046735286712646484,0.051160335540771484,0.0288541316986084,0.04456925392150879,0.0327916145324707,0.04673600196838379,0.9252209663391113,0.21095967292785645,1.1776869297027588,1.177983045578003,0.8061039447784424,5.48820161819458,0.2750675678253174 diff --git a/results/combined/merges_timed/tdunning/log-synth.csv b/results/combined/merges_timed/tdunning/log-synth.csv index e96078ad42..9688cc6664 100644 --- a/results/combined/merges_timed/tdunning/log-synth.csv +++ b/results/combined/merges_timed/tdunning/log-synth.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,2e2af435a69c21d5c6ad352db9c030ae8e0abf89,1b65c0f09bb7cb301c4bce5ff90700ef7b43b24b,c8fae8ddb4b84601bdf5ab75e1674b512a129ac3,,True,True,4512c6e152d4ea54ff471d3459ee563966be8d63a6f860ceb09c9c54c7430f81,Tests_passed,691ad4c2f8927ebc887c33c802ba8031ba86bc423406f275a570edc990691176,Tests_passed,True,True,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,0.03777003288269043,0.05052804946899414,0.0839383602142334,0.06653404235839844,0.08615827560424805,0.08973956108093262,0.0925607681274414,0.2381596565246582,0.06050682067871094,0.1912691593170166,0.1926579475402832,0.17780160903930664,0.7133419513702393,0.25737833976745605 +9,refs/heads/master,2e2af435a69c21d5c6ad352db9c030ae8e0abf89,1b65c0f09bb7cb301c4bce5ff90700ef7b43b24b,c8fae8ddb4b84601bdf5ab75e1674b512a129ac3,,True,True,4512c6e152d4ea54ff471d3459ee563966be8d63a6f860ceb09c9c54c7430f81,Tests_passed,691ad4c2f8927ebc887c33c802ba8031ba86bc423406f275a570edc990691176,Tests_passed,True,True,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,0.03777003288269043,0.05052804946899414,0.0839383602142334,0.06653404235839844,0.08615827560424805,0.08973956108093262,0.0925607681274414,0.2381596565246582,0.06050682067871094,0.18901586532592773,0.1897878646850586,0.17780160903930664,0.7133419513702393,0.25737833976745605 diff --git a/results/combined/merges_timed/tdunning/t-digest.csv b/results/combined/merges_timed/tdunning/t-digest.csv index 5cfa518618..d0d31bdb92 100644 --- a/results/combined/merges_timed/tdunning/t-digest.csv +++ b/results/combined/merges_timed/tdunning/t-digest.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -30,refs/heads/main,f028aa397892b426fe384f551b7ccc36b2f1ade7,2460bd11d91a2a9a2e1b4eca0c20b005e856effd,f0ca2a55413b4b8346a7e7a7ba0bcbedfd411aff,,True,True,783d6dbf5fa1370e7c447d893f1ced461f7194c88d0c06ebb460ced4b9651709,Tests_passed,f9cbf54b3bba2f3f6dfc3ea779e24dcd02e273a0839a3289b86b6576d4efd874,Tests_passed,True,True,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,0.04175567626953125,0.03976869583129883,0.07410430908203125,0.054636240005493164,0.055344581604003906,0.05438947677612305,0.0605473518371582,0.3115413188934326,0.05529928207397461,0.49550700187683105,0.4927036762237549,0.21319890022277832,3.320234775543213,0.2655773162841797 +30,refs/heads/main,f028aa397892b426fe384f551b7ccc36b2f1ade7,2460bd11d91a2a9a2e1b4eca0c20b005e856effd,f0ca2a55413b4b8346a7e7a7ba0bcbedfd411aff,,True,True,783d6dbf5fa1370e7c447d893f1ced461f7194c88d0c06ebb460ced4b9651709,Tests_passed,f9cbf54b3bba2f3f6dfc3ea779e24dcd02e273a0839a3289b86b6576d4efd874,Tests_passed,True,True,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,0.04175567626953125,0.03976869583129883,0.07410430908203125,0.054636240005493164,0.055344581604003906,0.05438947677612305,0.0605473518371582,0.3115413188934326,0.05529928207397461,0.49042725563049316,0.49173712730407715,0.21319890022277832,3.320234775543213,0.2655773162841797 diff --git a/results/combined/merges_timed/teamed/qulice.csv b/results/combined/merges_timed/teamed/qulice.csv index 101592a917..4f04d560bd 100644 --- a/results/combined/merges_timed/teamed/qulice.csv +++ b/results/combined/merges_timed/teamed/qulice.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,ad93f0b28b154ea6cbd4901d05f3bedc74a0ec82,d577051ce5ead53e8c888a9be4624835169cfc68,4b1608ac72f3a55879cc4583143355faf3982981,,ecc11d354ac877a3b85318e386e12953880405b21d219f54a7a9bd5172e8e594,Tests_passed,02d78e81a6e221767be4ff4f33fc7c29f8c16406a4ff54afc6981d0c7a40c334,Tests_passed,True,True,True,True,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,0.05356478691101074,0.04167675971984863,0.050629377365112305,0.06312346458435059,0.05175304412841797,0.05104851722717285,0.055185556411743164,0.29207921028137207,0.04196500778198242,0.3325514793395996,0.33448195457458496,0.22446084022521973,0.03240346908569336,0.2669663429260254 +3,refs/heads/master,ad93f0b28b154ea6cbd4901d05f3bedc74a0ec82,d577051ce5ead53e8c888a9be4624835169cfc68,4b1608ac72f3a55879cc4583143355faf3982981,,ecc11d354ac877a3b85318e386e12953880405b21d219f54a7a9bd5172e8e594,Tests_passed,02d78e81a6e221767be4ff4f33fc7c29f8c16406a4ff54afc6981d0c7a40c334,Tests_passed,True,True,True,True,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,0.05356478691101074,0.04167675971984863,0.050629377365112305,0.06312346458435059,0.05175304412841797,0.05104851722717285,0.055185556411743164,0.29207921028137207,0.04196500778198242,0.32865166664123535,0.3297545909881592,0.22446084022521973,0.03240346908569336,0.2669663429260254 diff --git a/results/combined/merges_timed/tech-advantage/sonar-gerrit-plugin.csv b/results/combined/merges_timed/tech-advantage/sonar-gerrit-plugin.csv index a7309a2f7f..e9e478afca 100644 --- a/results/combined/merges_timed/tech-advantage/sonar-gerrit-plugin.csv +++ b/results/combined/merges_timed/tech-advantage/sonar-gerrit-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/master,7599e6becd5b64bb5a00786c488b037f257b2f20,fabf6eeec8809cf1b9f7e775c07db71a41578dfe,df0d909e3fe4165912b13a76ad6ee40bca8b2eb0,,True,True,0d70fe434f25b498fdf5718709d7e7114e72fb25b78c94f2186f16ed2d7cb286,Tests_passed,2ae4f768488199e8511c6de69c952047a050633ad5b1bf1397d6f88898ad8ed3,Tests_passed,True,True,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,0.02446126937866211,0.03871917724609375,0.03851795196533203,0.04145002365112305,0.0369105339050293,0.04306507110595703,0.04577231407165527,0.1595461368560791,0.04471111297607422,0.14471840858459473,0.14487218856811523,0.10589385032653809,0.519024133682251,0.18685126304626465 +31,refs/heads/master,7599e6becd5b64bb5a00786c488b037f257b2f20,fabf6eeec8809cf1b9f7e775c07db71a41578dfe,df0d909e3fe4165912b13a76ad6ee40bca8b2eb0,,True,True,0d70fe434f25b498fdf5718709d7e7114e72fb25b78c94f2186f16ed2d7cb286,Tests_passed,2ae4f768488199e8511c6de69c952047a050633ad5b1bf1397d6f88898ad8ed3,Tests_passed,True,True,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,0.02446126937866211,0.03871917724609375,0.03851795196533203,0.04145002365112305,0.0369105339050293,0.04306507110595703,0.04577231407165527,0.1595461368560791,0.04471111297607422,0.14485645294189453,0.1451709270477295,0.10589385032653809,0.519024133682251,0.18685126304626465 diff --git a/results/combined/merges_timed/techblue/alfresco-restclient.csv b/results/combined/merges_timed/techblue/alfresco-restclient.csv index c24979335b..10237f4523 100644 --- a/results/combined/merges_timed/techblue/alfresco-restclient.csv +++ b/results/combined/merges_timed/techblue/alfresco-restclient.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,8e71d5b8d714d63b1c3cdd4b8d70de278f04bc07,039b6f1fd1e3d214a90f74ff0c60319be73f0e24,d803b272aa0c08461eb4e0e9c63e12be5ebda020,,7c128dff941dbe2fd39139010b2994aa344030a8cc92ed36f19c8095c583a2f6,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,True,True,True,True,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,0.011607646942138672,0.011668920516967773,0.012777328491210938,0.01245880126953125,0.012756586074829102,0.01267695426940918,0.012707948684692383,0.038208723068237305,0.011650323867797852,0.153886079788208,0.15607881546020508,0.06641554832458496,0.7202482223510742,0.1905674934387207 +2,refs/heads/master,8e71d5b8d714d63b1c3cdd4b8d70de278f04bc07,039b6f1fd1e3d214a90f74ff0c60319be73f0e24,d803b272aa0c08461eb4e0e9c63e12be5ebda020,,7c128dff941dbe2fd39139010b2994aa344030a8cc92ed36f19c8095c583a2f6,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,True,True,True,True,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,0.011607646942138672,0.011668920516967773,0.012777328491210938,0.01245880126953125,0.012756586074829102,0.01267695426940918,0.012707948684692383,0.038208723068237305,0.011650323867797852,0.15230607986450195,0.15508055686950684,0.06641554832458496,0.7202482223510742,0.1905674934387207 diff --git a/results/combined/merges_timed/technicpack/launchercore.csv b/results/combined/merges_timed/technicpack/launchercore.csv index 0c68e5144a..9a4486cfbe 100644 --- a/results/combined/merges_timed/technicpack/launchercore.csv +++ b/results/combined/merges_timed/technicpack/launchercore.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,Tests_passed,True,True,Merge_failed,70fb76d957580fb3e80592cd59cf7f8423aaa9e46e50ee4088dda1c5b29261f0,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,70fb76d957580fb3e80592cd59cf7f8423aaa9e46e50ee4088dda1c5b29261f0,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,7ecb913233cbeb0045ede40784433fcab2a1daade480aff655b31372674cf28d,Merge_failed,7ecb913233cbeb0045ede40784433fcab2a1daade480aff655b31372674cf28d,Merge_failed,6fa49d21c35ccf179b33ff0ff4f0180243bc2fee8953373b771f8ad56296d1a0,Merge_failed,8488bb4e533591ec445a3b739190831981a721303671407e50849618cb7459e1,Merge_failed,70fb76d957580fb3e80592cd59cf7f8423aaa9e46e50ee4088dda1c5b29261f0,Merge_failed,8285dd1d247377df660a20e1056fb973510ee403a57321073641ed1023c5a60b,Merge_failed,8285dd1d247377df660a20e1056fb973510ee403a57321073641ed1023c5a60b,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,0.06716561317443848,0.06340694427490234,0.06884217262268066,0.06488442420959473,0.07603025436401367,0.07026505470275879,0.08099937438964844,3.6564536094665527,0.4203629493713379,5.458120822906494,5.41059136390686,3.164231777191162,23.768027305603027,0.32140088081359863 +4,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,Tests_passed,True,True,Merge_failed,70fb76d957580fb3e80592cd59cf7f8423aaa9e46e50ee4088dda1c5b29261f0,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,70fb76d957580fb3e80592cd59cf7f8423aaa9e46e50ee4088dda1c5b29261f0,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,7ecb913233cbeb0045ede40784433fcab2a1daade480aff655b31372674cf28d,Merge_failed,7ecb913233cbeb0045ede40784433fcab2a1daade480aff655b31372674cf28d,Merge_failed,6fa49d21c35ccf179b33ff0ff4f0180243bc2fee8953373b771f8ad56296d1a0,Merge_failed,8488bb4e533591ec445a3b739190831981a721303671407e50849618cb7459e1,Merge_failed,70fb76d957580fb3e80592cd59cf7f8423aaa9e46e50ee4088dda1c5b29261f0,Merge_failed,8285dd1d247377df660a20e1056fb973510ee403a57321073641ed1023c5a60b,Merge_failed,8285dd1d247377df660a20e1056fb973510ee403a57321073641ed1023c5a60b,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,0.06716561317443848,0.06340694427490234,0.06884217262268066,0.06488442420959473,0.07603025436401367,0.07026505470275879,0.08099937438964844,3.6564536094665527,0.4203629493713379,5.4328248500823975,5.429731369018555,3.164231777191162,23.768027305603027,0.32140088081359863 diff --git a/results/combined/merges_timed/technicpack/launcherv3.csv b/results/combined/merges_timed/technicpack/launcherv3.csv index bb5a312d0b..ffa7448627 100644 --- a/results/combined/merges_timed/technicpack/launcherv3.csv +++ b/results/combined/merges_timed/technicpack/launcherv3.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -42,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,Tests_passed,True,True,Merge_failed,a7e37ce75c898f8d6202d2bccdd75e831b372d219bd66aa8a0c562420d75a32d,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,a7e37ce75c898f8d6202d2bccdd75e831b372d219bd66aa8a0c562420d75a32d,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,ce89fdd48b06940a1e7ff05031e57a4048d64c6bbe97a504378434b103f3fd49,Merge_failed,ce89fdd48b06940a1e7ff05031e57a4048d64c6bbe97a504378434b103f3fd49,Merge_failed,b9d6b97f93972958f88a4423f19a198cacb74644c4186ce16727ffb5e3722739,Merge_failed,8488bb4e533591ec445a3b739190831981a721303671407e50849618cb7459e1,Merge_failed,a7e37ce75c898f8d6202d2bccdd75e831b372d219bd66aa8a0c562420d75a32d,Merge_failed,8285dd1d247377df660a20e1056fb973510ee403a57321073641ed1023c5a60b,Merge_failed,8285dd1d247377df660a20e1056fb973510ee403a57321073641ed1023c5a60b,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,0.07431674003601074,0.06747078895568848,0.06656146049499512,0.06886124610900879,0.07654523849487305,0.06823492050170898,0.06670117378234863,3.738886594772339,0.414034366607666,5.430892467498779,5.4472434520721436,3.1322431564331055,23.719077587127686,0.31593823432922363 +42,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,Tests_passed,True,True,Merge_failed,a7e37ce75c898f8d6202d2bccdd75e831b372d219bd66aa8a0c562420d75a32d,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,a7e37ce75c898f8d6202d2bccdd75e831b372d219bd66aa8a0c562420d75a32d,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,ce89fdd48b06940a1e7ff05031e57a4048d64c6bbe97a504378434b103f3fd49,Merge_failed,ce89fdd48b06940a1e7ff05031e57a4048d64c6bbe97a504378434b103f3fd49,Merge_failed,b9d6b97f93972958f88a4423f19a198cacb74644c4186ce16727ffb5e3722739,Merge_failed,8488bb4e533591ec445a3b739190831981a721303671407e50849618cb7459e1,Merge_failed,a7e37ce75c898f8d6202d2bccdd75e831b372d219bd66aa8a0c562420d75a32d,Merge_failed,8285dd1d247377df660a20e1056fb973510ee403a57321073641ed1023c5a60b,Merge_failed,8285dd1d247377df660a20e1056fb973510ee403a57321073641ed1023c5a60b,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,0.07431674003601074,0.06747078895568848,0.06656146049499512,0.06886124610900879,0.07654523849487305,0.06823492050170898,0.06670117378234863,3.738886594772339,0.414034366607666,5.455688238143921,5.401432514190674,3.1322431564331055,23.719077587127686,0.31593823432922363 diff --git a/results/combined/merges_timed/technophobia/substeps-core.csv b/results/combined/merges_timed/technophobia/substeps-core.csv index f392b52c8f..bbb9b44bef 100644 --- a/results/combined/merges_timed/technophobia/substeps-core.csv +++ b/results/combined/merges_timed/technophobia/substeps-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -28,refs/heads/master,07b94728d642a789e11b45c284432544e6a013a9,982720d6b47d67d338b4af39487f52731500066e,0e08102f130e1d739ae7817224315b4608324526,,c4037c0e6b73121199741ada7d8c9765365744051cf7ffd757a5a731822f46f8,Tests_passed,452f1ef83993cfcc6a3c675604ff2e7a4bba5bc0c0b8707c4dbf64de774c2a83,Tests_passed,True,True,True,True,Merge_failed,d5cc4eb6f0c78a4fb787f599adf6977c094c70b22f42013ef5c4d6985736f859,Merge_failed,17770f7032bea6bf3cf7a6d80b042db1bbbe2eb57ba5b75d99a44579b1a44435,Merge_failed,d5cc4eb6f0c78a4fb787f599adf6977c094c70b22f42013ef5c4d6985736f859,Merge_failed,0fd42750da68675e139682c7511e8c76db14e1e5bdd568648d3793833551b7b2,Merge_failed,61ef9b1381629b81236cf6eca33e2887f629971f8ccb5018dae36ed247235bf3,Merge_failed,61ef9b1381629b81236cf6eca33e2887f629971f8ccb5018dae36ed247235bf3,Merge_failed,d57a9c2e3404ab37afebc9c06f1a8ce53a7922a5841e8ae18677c6e8b98c4669,Merge_failed,bab1e7fb1edb7b7c9032419340b0b27aab630b5f2236cca46878a8665b8eadcb,Merge_failed,d5cc4eb6f0c78a4fb787f599adf6977c094c70b22f42013ef5c4d6985736f859,Merge_failed,68ba46ab6fdddce3d99832eaec32e13a1198e2e299d2ceee8175fc6238337f01,Merge_failed,68ba46ab6fdddce3d99832eaec32e13a1198e2e299d2ceee8175fc6238337f01,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Merge_failed,9523937b94b9ae281cfad74d91ef7c4903c164016a255fdf786fd5e4c7a4fdbc,0.05379438400268555,0.05382037162780762,0.05042099952697754,0.05613350868225098,0.05984091758728027,0.06731557846069336,0.059821367263793945,0.34575891494750977,0.08776998519897461,0.4867122173309326,0.4869198799133301,0.39374828338623047,3.4483702182769775,0.2458648681640625 +28,refs/heads/master,07b94728d642a789e11b45c284432544e6a013a9,982720d6b47d67d338b4af39487f52731500066e,0e08102f130e1d739ae7817224315b4608324526,,c4037c0e6b73121199741ada7d8c9765365744051cf7ffd757a5a731822f46f8,Tests_passed,452f1ef83993cfcc6a3c675604ff2e7a4bba5bc0c0b8707c4dbf64de774c2a83,Tests_passed,True,True,True,True,Merge_failed,d5cc4eb6f0c78a4fb787f599adf6977c094c70b22f42013ef5c4d6985736f859,Merge_failed,17770f7032bea6bf3cf7a6d80b042db1bbbe2eb57ba5b75d99a44579b1a44435,Merge_failed,d5cc4eb6f0c78a4fb787f599adf6977c094c70b22f42013ef5c4d6985736f859,Merge_failed,0fd42750da68675e139682c7511e8c76db14e1e5bdd568648d3793833551b7b2,Merge_failed,61ef9b1381629b81236cf6eca33e2887f629971f8ccb5018dae36ed247235bf3,Merge_failed,61ef9b1381629b81236cf6eca33e2887f629971f8ccb5018dae36ed247235bf3,Merge_failed,d57a9c2e3404ab37afebc9c06f1a8ce53a7922a5841e8ae18677c6e8b98c4669,Merge_failed,bab1e7fb1edb7b7c9032419340b0b27aab630b5f2236cca46878a8665b8eadcb,Merge_failed,d5cc4eb6f0c78a4fb787f599adf6977c094c70b22f42013ef5c4d6985736f859,Merge_failed,68ba46ab6fdddce3d99832eaec32e13a1198e2e299d2ceee8175fc6238337f01,Merge_failed,68ba46ab6fdddce3d99832eaec32e13a1198e2e299d2ceee8175fc6238337f01,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Merge_failed,9523937b94b9ae281cfad74d91ef7c4903c164016a255fdf786fd5e4c7a4fdbc,0.05379438400268555,0.05382037162780762,0.05042099952697754,0.05613350868225098,0.05984091758728027,0.06731557846069336,0.059821367263793945,0.34575891494750977,0.08776998519897461,0.4823436737060547,0.48764801025390625,0.39374828338623047,3.4483702182769775,0.2458648681640625 diff --git a/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv b/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv index c8877d97ec..afcacf4b38 100644 --- a/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv +++ b/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/develop,17deab171882d57f5d02052ea6e631cb11aa0d55,46488ced29a30f06d91e594c3e8e31e4345410d6,9f9fcbcf522fd5cf99bd44b8dfa146bd4bfecf8b,,True,True,d048ccc41e8a36c201a618801271ae063c616800933def0d128a3d0418ef2901,Tests_passed,7061200a232d54e21761bb3a497208a97c2d70466f7787f4b61516b866987e72,Tests_passed,True,True,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,017d80d9cba1ee8a0cc8b9a0d36d518dc02270fc371552e4150d2975bb962058,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,017d80d9cba1ee8a0cc8b9a0d36d518dc02270fc371552e4150d2975bb962058,Merge_failed,e7ece4a8f8dd7345bbf0774731d1cb3adbb40c64485cc05816bfa6b9551a1a88,Merge_failed,e7ece4a8f8dd7345bbf0774731d1cb3adbb40c64485cc05816bfa6b9551a1a88,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,ceabd9979b9663c779f7bf199aa8a865039ecf956f5bee080f3d779fa2414080,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,189b5d3a0a3f87be05cb0e7937514f0711ad29359d4dff5d0fd9012fccc7ead7,Merge_failed,189b5d3a0a3f87be05cb0e7937514f0711ad29359d4dff5d0fd9012fccc7ead7,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,0f73de83f944567a46dc00878a55d6f9f063678d3a318a4580a67a0ec5b88c41,0.0112152099609375,0.010804176330566406,0.011072874069213867,0.010826826095581055,0.011476755142211914,0.011279582977294922,0.01110529899597168,0.12340760231018066,0.030493974685668945,0.9405238628387451,0.9387924671173096,0.4709489345550537,4.063489675521851,0.18892717361450195 +5,refs/heads/develop,17deab171882d57f5d02052ea6e631cb11aa0d55,46488ced29a30f06d91e594c3e8e31e4345410d6,9f9fcbcf522fd5cf99bd44b8dfa146bd4bfecf8b,,True,True,d048ccc41e8a36c201a618801271ae063c616800933def0d128a3d0418ef2901,Tests_passed,7061200a232d54e21761bb3a497208a97c2d70466f7787f4b61516b866987e72,Tests_passed,True,True,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,017d80d9cba1ee8a0cc8b9a0d36d518dc02270fc371552e4150d2975bb962058,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,017d80d9cba1ee8a0cc8b9a0d36d518dc02270fc371552e4150d2975bb962058,Merge_failed,e7ece4a8f8dd7345bbf0774731d1cb3adbb40c64485cc05816bfa6b9551a1a88,Merge_failed,e7ece4a8f8dd7345bbf0774731d1cb3adbb40c64485cc05816bfa6b9551a1a88,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,ceabd9979b9663c779f7bf199aa8a865039ecf956f5bee080f3d779fa2414080,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,189b5d3a0a3f87be05cb0e7937514f0711ad29359d4dff5d0fd9012fccc7ead7,Merge_failed,189b5d3a0a3f87be05cb0e7937514f0711ad29359d4dff5d0fd9012fccc7ead7,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,0f73de83f944567a46dc00878a55d6f9f063678d3a318a4580a67a0ec5b88c41,0.0112152099609375,0.010804176330566406,0.011072874069213867,0.010826826095581055,0.011476755142211914,0.011279582977294922,0.01110529899597168,0.12340760231018066,0.030493974685668945,0.9918844699859619,0.9587841033935547,0.4709489345550537,4.063489675521851,0.18892717361450195 diff --git a/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv b/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv index 466a82c1c8..8b125c1aaa 100644 --- a/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv +++ b/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/master,44919e4a94b5992d04186779c82da587aa5e3bc8,ef3cd2327f0ddcbcf186789fbf279ff312c45d7f,6c226b6329de94a4a026717628bad8f9eda81b02,,True,True,a95fb0bfc0ead9397c75ce5ad54d0f7d11d1c76db19311af2f085f7f13556c4c,Tests_passed,6f494c650b125f509d23c1430260b0c7f266bb80bfa8631a1274d4d7a9a8aa45,Tests_passed,True,True,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_failed,ca07d4371a294d738726924743e60f9ebc40f1854b7002bb991b91e64ab40844,Tests_failed,ca07d4371a294d738726924743e60f9ebc40f1854b7002bb991b91e64ab40844,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,4a0ad4325e08006f95ba15fab41f12e4446b3c83a33e6120bf13fd8d39a15970,0.048279523849487305,0.04612231254577637,0.052570343017578125,0.04571104049682617,0.0456850528717041,0.05443882942199707,0.047806501388549805,0.23520445823669434,0.06174421310424805,0.16547942161560059,0.1639409065246582,0.15998005867004395,0.6936957836151123,0.25684022903442383 +31,refs/heads/master,44919e4a94b5992d04186779c82da587aa5e3bc8,ef3cd2327f0ddcbcf186789fbf279ff312c45d7f,6c226b6329de94a4a026717628bad8f9eda81b02,,True,True,a95fb0bfc0ead9397c75ce5ad54d0f7d11d1c76db19311af2f085f7f13556c4c,Tests_passed,6f494c650b125f509d23c1430260b0c7f266bb80bfa8631a1274d4d7a9a8aa45,Tests_passed,True,True,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_failed,ca07d4371a294d738726924743e60f9ebc40f1854b7002bb991b91e64ab40844,Tests_failed,ca07d4371a294d738726924743e60f9ebc40f1854b7002bb991b91e64ab40844,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,4a0ad4325e08006f95ba15fab41f12e4446b3c83a33e6120bf13fd8d39a15970,0.048279523849487305,0.04612231254577637,0.052570343017578125,0.04571104049682617,0.0456850528717041,0.05443882942199707,0.047806501388549805,0.23520445823669434,0.06174421310424805,0.17857980728149414,0.17837190628051758,0.15998005867004395,0.6936957836151123,0.25684022903442383 diff --git a/results/combined/merges_timed/termd/termd.csv b/results/combined/merges_timed/termd/termd.csv index 4951bd51f7..e7473cf926 100644 --- a/results/combined/merges_timed/termd/termd.csv +++ b/results/combined/merges_timed/termd/termd.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,19a671985cce2db348b07fdf8481409a45b6dcb4,5a8501c46c9b1fc7ed5ec9285f11e5e7967f36fc,7e6b7a094b2b465243053bd149d66eef6714fe55,,bd13331eef5933ea20f4f5e7e84465d0616704b65b5094e13eee7fda24e46435,Tests_passed,6c1e8e98b61e4af0b0394738dc6850bcaa8c34cb3c62db5c4d92a1c3140ef811,Tests_passed,True,True,True,True,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,0.01897597312927246,0.01926112174987793,0.025281429290771484,0.025454044342041016,0.0254366397857666,0.025339126586914062,0.0250091552734375,0.05398869514465332,0.019685029983520508,0.1601276397705078,0.15924692153930664,0.07519054412841797,0.6783711910247803,0.20619964599609375 +4,refs/heads/master,19a671985cce2db348b07fdf8481409a45b6dcb4,5a8501c46c9b1fc7ed5ec9285f11e5e7967f36fc,7e6b7a094b2b465243053bd149d66eef6714fe55,,bd13331eef5933ea20f4f5e7e84465d0616704b65b5094e13eee7fda24e46435,Tests_passed,6c1e8e98b61e4af0b0394738dc6850bcaa8c34cb3c62db5c4d92a1c3140ef811,Tests_passed,True,True,True,True,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,0.01897597312927246,0.01926112174987793,0.025281429290771484,0.025454044342041016,0.0254366397857666,0.025339126586914062,0.0250091552734375,0.05398869514465332,0.019685029983520508,0.15726017951965332,0.15849590301513672,0.07519054412841797,0.6783711910247803,0.20619964599609375 diff --git a/results/combined/merges_timed/testingbot/testingbot-tunnel.csv b/results/combined/merges_timed/testingbot/testingbot-tunnel.csv index 72a34c4a27..f3c8404756 100644 --- a/results/combined/merges_timed/testingbot/testingbot-tunnel.csv +++ b/results/combined/merges_timed/testingbot/testingbot-tunnel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,ce11672c43fa8e85ed7201f026f455e7382da7e1,32db181f6873158694db8e270063e62fef2c5947,facda2b071f90624ea57358b6613b9979dadb7b1,,True,True,76ca400bc42ae691ec4003653e48bf9597a12cd525506661e6038f171f133a22,Tests_passed,ea2398f2962636de879c22b9fc3ad3835f7e0889dc3ffe426deb884e2223472a,Tests_passed,True,True,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,0.01547551155090332,0.0164644718170166,0.019103527069091797,0.019920825958251953,0.019588232040405273,0.019629716873168945,0.019219636917114258,0.05976581573486328,0.015398025512695312,0.3299236297607422,0.3154332637786865,0.12343192100524902,1.5274429321289062,0.18323898315429688 +11,refs/heads/master,ce11672c43fa8e85ed7201f026f455e7382da7e1,32db181f6873158694db8e270063e62fef2c5947,facda2b071f90624ea57358b6613b9979dadb7b1,,True,True,76ca400bc42ae691ec4003653e48bf9597a12cd525506661e6038f171f133a22,Tests_passed,ea2398f2962636de879c22b9fc3ad3835f7e0889dc3ffe426deb884e2223472a,Tests_passed,True,True,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,0.01547551155090332,0.0164644718170166,0.019103527069091797,0.019920825958251953,0.019588232040405273,0.019629716873168945,0.019219636917114258,0.05976581573486328,0.015398025512695312,0.3205099105834961,0.312516450881958,0.12343192100524902,1.5274429321289062,0.18323898315429688 diff --git a/results/combined/merges_timed/texasdigitallibrary/vireo.csv b/results/combined/merges_timed/texasdigitallibrary/vireo.csv index d13a00e390..6afd2e1ea8 100644 --- a/results/combined/merges_timed/texasdigitallibrary/vireo.csv +++ b/results/combined/merges_timed/texasdigitallibrary/vireo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -85,refs/heads/main,4b5dc59cfe12549b797941e4dd561c0b6665b5cf,652d9f280761401d9f774df9769214bcf6091696,7d947fc0539bdb535cf3f63e51ee25f056a79dfc,,True,True,db129a66d3a14cf0aa68dc89350f975f0f81a43a9fd301bf781dc447e4ef5745,Tests_passed,83e5c85de437b95fdabd72c20fd98096ff1958a8ebc0b76b5cda9957f71a3f9e,Tests_passed,True,True,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,0.014161825180053711,0.014272212982177734,0.015602588653564453,0.01565265655517578,0.014933586120605469,0.015428543090820312,0.014975547790527344,0.04386568069458008,0.013571739196777344,0.1865675449371338,0.19544148445129395,0.06969738006591797,1.7412195205688477,0.2807040214538574 +85,refs/heads/main,4b5dc59cfe12549b797941e4dd561c0b6665b5cf,652d9f280761401d9f774df9769214bcf6091696,7d947fc0539bdb535cf3f63e51ee25f056a79dfc,,True,True,db129a66d3a14cf0aa68dc89350f975f0f81a43a9fd301bf781dc447e4ef5745,Tests_passed,83e5c85de437b95fdabd72c20fd98096ff1958a8ebc0b76b5cda9957f71a3f9e,Tests_passed,True,True,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,0.014161825180053711,0.014272212982177734,0.015602588653564453,0.01565265655517578,0.014933586120605469,0.015428543090820312,0.014975547790527344,0.04386568069458008,0.013571739196777344,0.18696069717407227,0.18521523475646973,0.06969738006591797,1.7412195205688477,0.2807040214538574 diff --git a/results/combined/merges_timed/tgac/miso-lims.csv b/results/combined/merges_timed/tgac/miso-lims.csv index 9d6bb40538..04aac4dab4 100644 --- a/results/combined/merges_timed/tgac/miso-lims.csv +++ b/results/combined/merges_timed/tgac/miso-lims.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -566,refs/remotes/origin/pull/2747,fa7593e209edb54b5a5c11eeb0b07103c0b02a94,4507173cbdcd0d2389767fe4aeb43936629af24a,0955feeaaab386ffc307e46d7c65bbbaa953ee8d,,36a1c96b6544b5018bbb56254c2f658744a0aca87cfa1e7284e6fa1b78384261,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,True,True,True,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,a72f4eced35feafdd2d6609dfb84240897b09b3a0a6968300e624ec648143b84,Tests_passed,a72f4eced35feafdd2d6609dfb84240897b09b3a0a6968300e624ec648143b84,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,0.05723285675048828,0.047110557556152344,0.06276941299438477,0.06278014183044434,0.047406673431396484,0.0583646297454834,0.0655519962310791,0.1997087001800537,0.06673359870910645,0.17177724838256836,0.16272425651550293,0.0822145938873291,0.8062405586242676,0.5520093441009521 +566,refs/remotes/origin/pull/2747,fa7593e209edb54b5a5c11eeb0b07103c0b02a94,4507173cbdcd0d2389767fe4aeb43936629af24a,0955feeaaab386ffc307e46d7c65bbbaa953ee8d,,36a1c96b6544b5018bbb56254c2f658744a0aca87cfa1e7284e6fa1b78384261,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,True,True,True,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,a72f4eced35feafdd2d6609dfb84240897b09b3a0a6968300e624ec648143b84,Tests_passed,a72f4eced35feafdd2d6609dfb84240897b09b3a0a6968300e624ec648143b84,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,0.05723285675048828,0.047110557556152344,0.06276941299438477,0.06278014183044434,0.047406673431396484,0.0583646297454834,0.0655519962310791,0.1997087001800537,0.06673359870910645,0.1650218963623047,0.17046427726745605,0.0822145938873291,0.8062405586242676,0.5520093441009521 diff --git a/results/combined/merges_timed/thealgorithms/java.csv b/results/combined/merges_timed/thealgorithms/java.csv index 580e180cc4..2bd71f02bb 100644 --- a/results/combined/merges_timed/thealgorithms/java.csv +++ b/results/combined/merges_timed/thealgorithms/java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -884,refs/remotes/origin/pull/2983,1b5ed154bb8206cfbd6a59ee61affc5f8b12866a,583ceabde1cee7050a9e04683aa0b741c648ede2,7d5de041ebeea76cea257b03d5bd792adeb27b4e,,True,True,52f77ccd11e915fb96ec90edd7500bfd907394eccb0cb0fd872a3fa020563072,Tests_passed,c5c363c3cb50bfc106182f59b9061d3d85f68aecdc065462b38042030377599f,Tests_passed,True,True,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,2ad62f9843f992482061f6a245a76a8ad90a8de64a4a1ffc7136df7509aed821,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,a7f650d7ae422c2b309c9b942f248be7d403a1f75fa78a1a61a93fab4c1c83a3,Merge_failed,a7f650d7ae422c2b309c9b942f248be7d403a1f75fa78a1a61a93fab4c1c83a3,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,1ea451368f60577b6918cb575912f1fc7de0f4040ed1117ff362db1d8533447a,0.04273271560668945,0.015909194946289062,0.04032754898071289,0.03788328170776367,0.03939199447631836,0.03731226921081543,0.0488436222076416,0.23323750495910645,0.12015056610107422,0.0749044418334961,0.08478355407714844,0.11980676651000977,0.752741813659668,0.3952362537384033 +884,refs/remotes/origin/pull/2983,1b5ed154bb8206cfbd6a59ee61affc5f8b12866a,583ceabde1cee7050a9e04683aa0b741c648ede2,7d5de041ebeea76cea257b03d5bd792adeb27b4e,,True,True,52f77ccd11e915fb96ec90edd7500bfd907394eccb0cb0fd872a3fa020563072,Tests_passed,c5c363c3cb50bfc106182f59b9061d3d85f68aecdc065462b38042030377599f,Tests_passed,True,True,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,2ad62f9843f992482061f6a245a76a8ad90a8de64a4a1ffc7136df7509aed821,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,a7f650d7ae422c2b309c9b942f248be7d403a1f75fa78a1a61a93fab4c1c83a3,Merge_failed,a7f650d7ae422c2b309c9b942f248be7d403a1f75fa78a1a61a93fab4c1c83a3,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,1ea451368f60577b6918cb575912f1fc7de0f4040ed1117ff362db1d8533447a,0.04273271560668945,0.015909194946289062,0.04032754898071289,0.03788328170776367,0.03939199447631836,0.03731226921081543,0.0488436222076416,0.23323750495910645,0.12015056610107422,0.0752873420715332,0.06544637680053711,0.11980676651000977,0.752741813659668,0.3952362537384033 diff --git a/results/combined/merges_timed/theholywaffle/teamspeak-3-java-api.csv b/results/combined/merges_timed/theholywaffle/teamspeak-3-java-api.csv index b900ed9ebe..4813f89158 100644 --- a/results/combined/merges_timed/theholywaffle/teamspeak-3-java-api.csv +++ b/results/combined/merges_timed/theholywaffle/teamspeak-3-java-api.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/heads/master,d41446711b7338794a8c348f50c7a53b99a08d4f,4811ec5f9bf8b712817248a7808bc329a3946189,a43548c29475a68e4e6b2b5a2a7dca5d803691a0,,True,True,5f3c598a5cc7ecc43addc7b2286c8f86b8421a79ff9f5155e95a9374cb0bf4e1,Tests_passed,58c91f8610af1f116ca759dc3c846aea399da76a38be8d75dd8439f9f4311908,Tests_passed,True,True,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,30514edda86720a36a5f119b1ce6481a6a4b4da343d1f5671e0ea45c57bb8fe0,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,73d5262660e06b0afb734f5e01bce534dd571128cd92170f2b8ba3b4d60e6226,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,b58e100800aea89b5a286ffe5b991246e3147fab98e85d16bf3021b29aa9b3e1,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Merge_failed,4237e54530396890e457edb1fde269e787cf7b8f93d5d4a1fae6b2be450baa2d,0.04725289344787598,0.03384852409362793,0.046283721923828125,0.03459930419921875,0.04184842109680176,0.031975746154785156,0.045328617095947266,0.47111988067626953,0.09165596961975098,0.8309066295623779,0.829552412033081,0.4185802936553955,2.903336763381958,0.40981125831604004 +10,refs/heads/master,d41446711b7338794a8c348f50c7a53b99a08d4f,4811ec5f9bf8b712817248a7808bc329a3946189,a43548c29475a68e4e6b2b5a2a7dca5d803691a0,,True,True,5f3c598a5cc7ecc43addc7b2286c8f86b8421a79ff9f5155e95a9374cb0bf4e1,Tests_passed,58c91f8610af1f116ca759dc3c846aea399da76a38be8d75dd8439f9f4311908,Tests_passed,True,True,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,30514edda86720a36a5f119b1ce6481a6a4b4da343d1f5671e0ea45c57bb8fe0,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,73d5262660e06b0afb734f5e01bce534dd571128cd92170f2b8ba3b4d60e6226,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Merge_failed,b58e100800aea89b5a286ffe5b991246e3147fab98e85d16bf3021b29aa9b3e1,Merge_failed,3ae480b89d0c74a3efdafe70a77b37f27fdcc4b055eb2489e38b5458ef6783a6,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Merge_failed,4237e54530396890e457edb1fde269e787cf7b8f93d5d4a1fae6b2be450baa2d,0.04725289344787598,0.03384852409362793,0.046283721923828125,0.03459930419921875,0.04184842109680176,0.031975746154785156,0.045328617095947266,0.47111988067626953,0.09165596961975098,0.8218932151794434,0.8326306343078613,0.4185802936553955,2.903336763381958,0.40981125831604004 diff --git a/results/combined/merges_timed/thelinmichael/spotify-web-api-java.csv b/results/combined/merges_timed/thelinmichael/spotify-web-api-java.csv index f30ef89bd8..c68aaa1a31 100644 --- a/results/combined/merges_timed/thelinmichael/spotify-web-api-java.csv +++ b/results/combined/merges_timed/thelinmichael/spotify-web-api-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,486691eb608d4758d2b6aadb231913f9d1f0dccf,d78ea37c1f9171e9394128660eedbc0fd1d6e186,7683a952cc154155e775f98e41aeb23fa70e9d77,,True,True,de790a0d58cefb7e3c67ff2e97297f288ae8364b76be222223da3399933612e7,Tests_passed,b79d5e3c4efbc0d8958a39c2ba0d689cd7a7fddb8832fc0e7b20825ecd040fe9,Tests_passed,True,True,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,0.05703020095825195,0.06425833702087402,0.06943655014038086,0.06445741653442383,0.0654900074005127,0.06991219520568848,0.06636595726013184,0.20519375801086426,0.06459164619445801,0.160811185836792,0.15973258018493652,0.12740421295166016,0.8734674453735352,0.2982208728790283 +6,refs/heads/master,486691eb608d4758d2b6aadb231913f9d1f0dccf,d78ea37c1f9171e9394128660eedbc0fd1d6e186,7683a952cc154155e775f98e41aeb23fa70e9d77,,True,True,de790a0d58cefb7e3c67ff2e97297f288ae8364b76be222223da3399933612e7,Tests_passed,b79d5e3c4efbc0d8958a39c2ba0d689cd7a7fddb8832fc0e7b20825ecd040fe9,Tests_passed,True,True,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,0.05703020095825195,0.06425833702087402,0.06943655014038086,0.06445741653442383,0.0654900074005127,0.06991219520568848,0.06636595726013184,0.20519375801086426,0.06459164619445801,0.16258692741394043,0.15818381309509277,0.12740421295166016,0.8734674453735352,0.2982208728790283 diff --git a/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv b/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv index c1351d0952..4cac1245d4 100644 --- a/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv +++ b/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/remotes/origin/new-cheatsheet,7ec9c1b4bb69e9fbd58d5bef0bab16a09ca7bf68,a133049b147a4e77cbb9fd22068680adec4a8dca,28040ef7891dd8179ccfb25a3d3b1ef7dfa40553,,98a80124f8d4c0863a2bd42439a176d63b90d0530f12a64781de8351e97140b2,Tests_passed,68e8015eee2df1f6c36c9288f4ead74cd1dd26d81d1b9470ff64dfd53a267937,Tests_passed,True,True,True,True,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,243523469f6880593037d7b859e2efa22dac6590f814f172e6f520c63a70fbed,Merge_failed,ae1b5ed1894e1d9bc71888c251707d3c5cd0c8df7e5ec14fd26d40ac042db68f,Merge_failed,ae1b5ed1894e1d9bc71888c251707d3c5cd0c8df7e5ec14fd26d40ac042db68f,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,13735db13a08f3bda2ecfcae430ce92a1eb66fe4db3faca50c20b1bbe940656a,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,50e6c06488e5bcad0b6bd5431910fa231aafc3d93a1ed0aa45748f55cacc9063,Merge_failed,50e6c06488e5bcad0b6bd5431910fa231aafc3d93a1ed0aa45748f55cacc9063,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Merge_failed,620938d8f8acc4841d607ea6bd8971334bac7b0fcbe2be76c09d5625774f2755,0.008947134017944336,0.008824825286865234,0.009146690368652344,0.00893712043762207,0.009183406829833984,0.009041309356689453,0.009010553359985352,0.03586435317993164,0.013946771621704102,0.1303701400756836,0.12979412078857422,0.07046270370483398,0.603801965713501,0.1632397174835205 +1,refs/remotes/origin/new-cheatsheet,7ec9c1b4bb69e9fbd58d5bef0bab16a09ca7bf68,a133049b147a4e77cbb9fd22068680adec4a8dca,28040ef7891dd8179ccfb25a3d3b1ef7dfa40553,,98a80124f8d4c0863a2bd42439a176d63b90d0530f12a64781de8351e97140b2,Tests_passed,68e8015eee2df1f6c36c9288f4ead74cd1dd26d81d1b9470ff64dfd53a267937,Tests_passed,True,True,True,True,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,243523469f6880593037d7b859e2efa22dac6590f814f172e6f520c63a70fbed,Merge_failed,ae1b5ed1894e1d9bc71888c251707d3c5cd0c8df7e5ec14fd26d40ac042db68f,Merge_failed,ae1b5ed1894e1d9bc71888c251707d3c5cd0c8df7e5ec14fd26d40ac042db68f,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,13735db13a08f3bda2ecfcae430ce92a1eb66fe4db3faca50c20b1bbe940656a,Merge_failed,0a1d5c206955c1e967de36c3cf89001f475604855fc2ffcf4ddf8b044ea8ab93,Merge_failed,50e6c06488e5bcad0b6bd5431910fa231aafc3d93a1ed0aa45748f55cacc9063,Merge_failed,50e6c06488e5bcad0b6bd5431910fa231aafc3d93a1ed0aa45748f55cacc9063,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Merge_failed,620938d8f8acc4841d607ea6bd8971334bac7b0fcbe2be76c09d5625774f2755,0.008947134017944336,0.008824825286865234,0.009146690368652344,0.00893712043762207,0.009183406829833984,0.009041309356689453,0.009010553359985352,0.03586435317993164,0.013946771621704102,0.12880682945251465,0.12928032875061035,0.07046270370483398,0.603801965713501,0.1632397174835205 diff --git a/results/combined/merges_timed/thepoofy/foursquare_v2_java_adapter.csv b/results/combined/merges_timed/thepoofy/foursquare_v2_java_adapter.csv index 470fbabeec..0956e2f3c1 100644 --- a/results/combined/merges_timed/thepoofy/foursquare_v2_java_adapter.csv +++ b/results/combined/merges_timed/thepoofy/foursquare_v2_java_adapter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,dacecfc813308901bc17bdf1bc849c3ca820eb01,8a91258647f7283dfc59c43c5cb9e6947e668d16,7251dbe912796e499451016170d0dd1dca2bb969,,c29ee449380aa2417cfb01a4e30ce6e1a22810275ef08fb3d474cc4c47fdc3bb,Tests_passed,ba1018dcc74b75db03bb7a977ce73f721171735346fcf70550b72f44be193aac,Tests_passed,True,True,True,True,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,dfd6d8b12de54df1f50b9362c26cd53798e6f97d0e5f80a1892b86b9e64c00c2,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,75d8961a73e5901b8ed4b0f1dc706b2b03e7a35d05038b55779219ff8d98752f,Merge_failed,75d8961a73e5901b8ed4b0f1dc706b2b03e7a35d05038b55779219ff8d98752f,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_failed,0f9357a7a7fd9ddac38bc806d4e2e97bde861c080d98f9e723234489b2dfcdf3,0.032804250717163086,0.04710817337036133,0.04077005386352539,0.038506269454956055,0.02958202362060547,0.028903961181640625,0.05150794982910156,0.1609952449798584,0.0593264102935791,0.07157325744628906,0.07162690162658691,0.1306319236755371,0.6017105579376221,0.20627689361572266 +1,refs/heads/master,dacecfc813308901bc17bdf1bc849c3ca820eb01,8a91258647f7283dfc59c43c5cb9e6947e668d16,7251dbe912796e499451016170d0dd1dca2bb969,,c29ee449380aa2417cfb01a4e30ce6e1a22810275ef08fb3d474cc4c47fdc3bb,Tests_passed,ba1018dcc74b75db03bb7a977ce73f721171735346fcf70550b72f44be193aac,Tests_passed,True,True,True,True,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,dfd6d8b12de54df1f50b9362c26cd53798e6f97d0e5f80a1892b86b9e64c00c2,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,75d8961a73e5901b8ed4b0f1dc706b2b03e7a35d05038b55779219ff8d98752f,Merge_failed,75d8961a73e5901b8ed4b0f1dc706b2b03e7a35d05038b55779219ff8d98752f,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_failed,0f9357a7a7fd9ddac38bc806d4e2e97bde861c080d98f9e723234489b2dfcdf3,0.032804250717163086,0.04710817337036133,0.04077005386352539,0.038506269454956055,0.02958202362060547,0.028903961181640625,0.05150794982910156,0.1609952449798584,0.0593264102935791,0.07087492942810059,0.07102751731872559,0.1306319236755371,0.6017105579376221,0.20627689361572266 diff --git a/results/combined/merges_timed/theupswell/appengine-counter.csv b/results/combined/merges_timed/theupswell/appengine-counter.csv index 68507cc428..06417b2760 100644 --- a/results/combined/merges_timed/theupswell/appengine-counter.csv +++ b/results/combined/merges_timed/theupswell/appengine-counter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/master,303ad503d31a1b375af2a85f46a0c512ace1dfd1,40b139ac04cd6c2e2a4ddfe86bf2fff7b90a1bbf,2eaf5b5c27c22c411eb066f546cb5051b1a73a9d,,True,True,8ddc69f47b9783365844b5ca259198e29c2cc640bf60ac9b5bdda52451107b18,Tests_passed,185dc3f8bb12a351eb4fec64ca8012277f6264c27174b768a1320c7c08c8b5a2,Tests_passed,True,True,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Tests_passed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,482e08994ae56474e53699f1d083c36625f5144c9dd7fcabec6dec5275626d70,Merge_failed,482e08994ae56474e53699f1d083c36625f5144c9dd7fcabec6dec5275626d70,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Tests_passed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,0.01147150993347168,0.012592792510986328,0.012764930725097656,0.013081550598144531,0.012677907943725586,0.012376785278320312,0.012668132781982422,0.05925273895263672,0.013848543167114258,0.328275203704834,0.3272087574005127,0.11979484558105469,2.0322532653808594,0.18638920783996582 +16,refs/heads/master,303ad503d31a1b375af2a85f46a0c512ace1dfd1,40b139ac04cd6c2e2a4ddfe86bf2fff7b90a1bbf,2eaf5b5c27c22c411eb066f546cb5051b1a73a9d,,True,True,8ddc69f47b9783365844b5ca259198e29c2cc640bf60ac9b5bdda52451107b18,Tests_passed,185dc3f8bb12a351eb4fec64ca8012277f6264c27174b768a1320c7c08c8b5a2,Tests_passed,True,True,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Tests_passed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,482e08994ae56474e53699f1d083c36625f5144c9dd7fcabec6dec5275626d70,Merge_failed,482e08994ae56474e53699f1d083c36625f5144c9dd7fcabec6dec5275626d70,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Tests_passed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,0.01147150993347168,0.012592792510986328,0.012764930725097656,0.013081550598144531,0.012677907943725586,0.012376785278320312,0.012668132781982422,0.05925273895263672,0.013848543167114258,0.33127832412719727,0.3303718566894531,0.11979484558105469,2.0322532653808594,0.18638920783996582 diff --git a/results/combined/merges_timed/thinkgem/jeesite.csv b/results/combined/merges_timed/thinkgem/jeesite.csv index e9cfc1bc8b..9e09c2896a 100644 --- a/results/combined/merges_timed/thinkgem/jeesite.csv +++ b/results/combined/merges_timed/thinkgem/jeesite.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -74,refs/heads/master,618aafef63176f57f1b37ce8ed27900defad488d,e899db71e9da23b3387f7cc499cdae35eef8092d,42b86512b01066f6f3820ce319d00c00b9ca6900,,True,True,31c68b2105e95fa976964408cb53292866dc6639a59700b4f4b5208e5a046e6e,Tests_passed,b15ce129447eb73ea54b1b6306ad9c1db10124b2c1e336d34e94219a5ef2b6b4,Tests_passed,True,True,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,8c86d03b2f7394761159028cd9072804f81fa60b32c0940864e408898950b37f,Merge_failed,c56af07c32e076764e6d18382ce5e80b5c3e03daf4419a68d733749639b90249,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,7933b74af6845fc779dc4e6168cbb49882f7b0d7d1c34abb57248727dc7eaa41,Merge_failed,7933b74af6845fc779dc4e6168cbb49882f7b0d7d1c34abb57248727dc7eaa41,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,c787b7fa919d5f9e0e99de02712ceb9064dacca4ac29baf97eba6b1afd33c7aa,0.03728294372558594,0.0598902702331543,0.06261682510375977,0.05206036567687988,0.06624245643615723,0.05527758598327637,0.0629739761352539,0.19293904304504395,0.10345196723937988,0.08099985122680664,0.0813298225402832,0.13468718528747559,1.0537712574005127,0.35123276710510254 +74,refs/heads/master,618aafef63176f57f1b37ce8ed27900defad488d,e899db71e9da23b3387f7cc499cdae35eef8092d,42b86512b01066f6f3820ce319d00c00b9ca6900,,True,True,31c68b2105e95fa976964408cb53292866dc6639a59700b4f4b5208e5a046e6e,Tests_passed,b15ce129447eb73ea54b1b6306ad9c1db10124b2c1e336d34e94219a5ef2b6b4,Tests_passed,True,True,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,8c86d03b2f7394761159028cd9072804f81fa60b32c0940864e408898950b37f,Merge_failed,c56af07c32e076764e6d18382ce5e80b5c3e03daf4419a68d733749639b90249,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,7933b74af6845fc779dc4e6168cbb49882f7b0d7d1c34abb57248727dc7eaa41,Merge_failed,7933b74af6845fc779dc4e6168cbb49882f7b0d7d1c34abb57248727dc7eaa41,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,c787b7fa919d5f9e0e99de02712ceb9064dacca4ac29baf97eba6b1afd33c7aa,0.03728294372558594,0.0598902702331543,0.06261682510375977,0.05206036567687988,0.06624245643615723,0.05527758598327637,0.0629739761352539,0.19293904304504395,0.10345196723937988,0.08127832412719727,0.0814201831817627,0.13468718528747559,1.0537712574005127,0.35123276710510254 diff --git a/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv b/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv index b35bda24ea..a42797d375 100644 --- a/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv +++ b/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,fc1359b4df627beb16aa657b3d6944e83b72fb9b,d1d5bf43bcc12996715030a6e73461cf507d7a88,275ff63bccd4e5d57f763840ef9eb118616bf987,,True,True,b8a2e2248c52cb23a5e8009aee6124142b3988a3fd94effbc60ec6f585b509bc,Tests_passed,34077f203c3b3faf45c45fe12d6ebdf626e4e25dd64df57b67f8eaceb1adac9b,Tests_passed,True,True,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,0.055756330490112305,0.056215763092041016,0.07534575462341309,0.07629919052124023,0.08039331436157227,0.0699605941772461,0.07189488410949707,0.14732003211975098,0.052895545959472656,0.20436501502990723,0.2038583755493164,0.10773420333862305,1.039766550064087,0.2286059856414795 +3,refs/heads/master,fc1359b4df627beb16aa657b3d6944e83b72fb9b,d1d5bf43bcc12996715030a6e73461cf507d7a88,275ff63bccd4e5d57f763840ef9eb118616bf987,,True,True,b8a2e2248c52cb23a5e8009aee6124142b3988a3fd94effbc60ec6f585b509bc,Tests_passed,34077f203c3b3faf45c45fe12d6ebdf626e4e25dd64df57b67f8eaceb1adac9b,Tests_passed,True,True,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,0.055756330490112305,0.056215763092041016,0.07534575462341309,0.07629919052124023,0.08039331436157227,0.0699605941772461,0.07189488410949707,0.14732003211975098,0.052895545959472656,0.19950294494628906,0.20154213905334473,0.10773420333862305,1.039766550064087,0.2286059856414795 diff --git a/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv b/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv index 5cd079efdf..029c584d11 100644 --- a/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv +++ b/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,e93e48e4d4a1335c20d31794ba41eea7641603d3,87ca2f19f4519fdc576c7344aeda35855a369dd2,551e96fbb6c1231e912ea3110c677e2d0c8421df,,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Tests_passed,0176f50d794e17693f7406820808543e7951cb19d7d44d4f2e8ae980ad90907e,Tests_passed,True,True,True,True,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,2ae9fcf5a63d1583bf72fe78cb815e8f5d1325377e12cd958290c89763cdb9e0,Merge_failed,2ae9fcf5a63d1583bf72fe78cb815e8f5d1325377e12cd958290c89763cdb9e0,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,3fc0c01ca386e9fef321d14e0c43291c1fec12009bd29db2410ab4ffe5ea4868,0.0396115779876709,0.04133439064025879,0.0396575927734375,0.035677433013916016,0.040308475494384766,0.03750729560852051,0.04199624061584473,0.15165162086486816,0.0633230209350586,0.06365680694580078,0.06345081329345703,0.11079645156860352,0.558215856552124,0.1807539463043213 +5,refs/heads/master,e93e48e4d4a1335c20d31794ba41eea7641603d3,87ca2f19f4519fdc576c7344aeda35855a369dd2,551e96fbb6c1231e912ea3110c677e2d0c8421df,,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Tests_passed,0176f50d794e17693f7406820808543e7951cb19d7d44d4f2e8ae980ad90907e,Tests_passed,True,True,True,True,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Merge_failed,a4c76a82fa1656fd8351b21df886f5920087e193f11f5354ac7194ebbf4d68c8,Merge_failed,2ae9fcf5a63d1583bf72fe78cb815e8f5d1325377e12cd958290c89763cdb9e0,Merge_failed,2ae9fcf5a63d1583bf72fe78cb815e8f5d1325377e12cd958290c89763cdb9e0,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,3fc0c01ca386e9fef321d14e0c43291c1fec12009bd29db2410ab4ffe5ea4868,0.0396115779876709,0.04133439064025879,0.0396575927734375,0.035677433013916016,0.040308475494384766,0.03750729560852051,0.04199624061584473,0.15165162086486816,0.0633230209350586,0.062109947204589844,0.06279563903808594,0.11079645156860352,0.558215856552124,0.1807539463043213 diff --git a/results/combined/merges_timed/thoqbk/traprange.csv b/results/combined/merges_timed/thoqbk/traprange.csv index 974dfcf1b6..e41f147583 100644 --- a/results/combined/merges_timed/thoqbk/traprange.csv +++ b/results/combined/merges_timed/thoqbk/traprange.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/remotes/origin/pull/22,8227158f2f52cc7a01bb3775e7dd0b6a3274e0a3,7efc7d786d536bac577259823f5425dd7b357bbc,2fda0c4474fc8f1563ec41b24d631118570f5203,,4d8e34a5097ed424996d23ebc356045a3d3ad38c5dcada4bfc800ff23535cfa9,Tests_passed,b95b1ba3a6af63749572a2696a0d13ad71bb37198d8fa3ec6ff260b1c802f19c,Tests_passed,True,True,True,True,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,29e3b54d712a223cc40f98977f472bb8933b58c94f3a4ffdd6855fcabafc1a9c,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,61079e1b32a60aaa0c5b6894a5c7a7c51c3216e6fb06171dffc7ada5ac94276b,Merge_failed,700e7c4d1c9cf8f7dee73a12bdfeacdbcd65473b153838ad96aaf286625d3543,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Merge_failed,b984a160fca105ecc56390c6b7a446ef7bf3ac37b11e058a278e8c5626555249,0.11645388603210449,0.11516046524047852,0.12140059471130371,0.12118697166442871,0.1390094757080078,0.12848901748657227,0.14404916763305664,0.25577735900878906,0.11853981018066406,0.22913503646850586,0.2293553352355957,0.23910236358642578,1.195561170578003,0.33452534675598145 +5,refs/remotes/origin/pull/22,8227158f2f52cc7a01bb3775e7dd0b6a3274e0a3,7efc7d786d536bac577259823f5425dd7b357bbc,2fda0c4474fc8f1563ec41b24d631118570f5203,,4d8e34a5097ed424996d23ebc356045a3d3ad38c5dcada4bfc800ff23535cfa9,Tests_passed,b95b1ba3a6af63749572a2696a0d13ad71bb37198d8fa3ec6ff260b1c802f19c,Tests_passed,True,True,True,True,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,29e3b54d712a223cc40f98977f472bb8933b58c94f3a4ffdd6855fcabafc1a9c,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,61079e1b32a60aaa0c5b6894a5c7a7c51c3216e6fb06171dffc7ada5ac94276b,Merge_failed,700e7c4d1c9cf8f7dee73a12bdfeacdbcd65473b153838ad96aaf286625d3543,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Merge_failed,b984a160fca105ecc56390c6b7a446ef7bf3ac37b11e058a278e8c5626555249,0.11645388603210449,0.11516046524047852,0.12140059471130371,0.12118697166442871,0.1390094757080078,0.12848901748657227,0.14404916763305664,0.25577735900878906,0.11853981018066406,0.22770142555236816,0.22743749618530273,0.23910236358642578,1.195561170578003,0.33452534675598145 diff --git a/results/combined/merges_timed/threerings/getdown.csv b/results/combined/merges_timed/threerings/getdown.csv index 224d722ea4..7b7c8e10aa 100644 --- a/results/combined/merges_timed/threerings/getdown.csv +++ b/results/combined/merges_timed/threerings/getdown.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -94,refs/remotes/origin/pull/213,4120f253744b1f47df06c1b5b92d0edc41bd49d1,095d59ceea407e5c8c04f67fa224892f2b00fe88,76a6401d82c1bcf87492ade2d26e685172de8f0b,,True,True,530ab90e332d56829d168b6fa0ea91572280b96bb682313256027cf1c1ecb074,Tests_passed,e208343337674743ff1ae4811bb7cb3cb430c4772486fa7f0c74380b20f0b4e2,Tests_passed,True,True,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,3e904ddef5290f08a3df84c7b92c7c54f10ce5a139ff89c63074bac2977080a3,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,0.061486005783081055,0.05655550956726074,0.05259966850280762,0.047286033630371094,0.05902838706970215,0.052060842514038086,0.06271147727966309,0.21150875091552734,0.056420087814331055,0.17722845077514648,0.1753864288330078,0.12158417701721191,1.5057730674743652,0.2504105567932129 +94,refs/remotes/origin/pull/213,4120f253744b1f47df06c1b5b92d0edc41bd49d1,095d59ceea407e5c8c04f67fa224892f2b00fe88,76a6401d82c1bcf87492ade2d26e685172de8f0b,,True,True,530ab90e332d56829d168b6fa0ea91572280b96bb682313256027cf1c1ecb074,Tests_passed,e208343337674743ff1ae4811bb7cb3cb430c4772486fa7f0c74380b20f0b4e2,Tests_passed,True,True,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,3e904ddef5290f08a3df84c7b92c7c54f10ce5a139ff89c63074bac2977080a3,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,0.061486005783081055,0.05655550956726074,0.05259966850280762,0.047286033630371094,0.05902838706970215,0.052060842514038086,0.06271147727966309,0.21150875091552734,0.056420087814331055,0.17277073860168457,0.17538881301879883,0.12158417701721191,1.5057730674743652,0.2504105567932129 diff --git a/results/combined/merges_timed/threeten/threeten-extra.csv b/results/combined/merges_timed/threeten/threeten-extra.csv index 91eec40baf..a679903416 100644 --- a/results/combined/merges_timed/threeten/threeten-extra.csv +++ b/results/combined/merges_timed/threeten/threeten-extra.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/main,f0bf686f1738f1d253e907670e43dcb57789a592,28f100b913b407c72fdcb509ff02eb6de4d68bb3,01f5e014d8e158e32353355b1c09956794c6d8a8,,True,True,9414c830421dc01c4c1fab23dc6a1e2bb71e5db052b083acdedcfaf63e634cf6,Tests_passed,2798aab0ee424cc0d2efb1c737ea81b5d4b883790ec8dc6d5e6ee42e88e9abba,Tests_passed,True,True,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,0.05016446113586426,0.05155754089355469,0.06448936462402344,0.017853260040283203,0.04949069023132324,0.015114068984985352,0.018814802169799805,0.16316008567810059,0.014976739883422852,0.16643881797790527,0.20301413536071777,0.11509156227111816,0.06695747375488281,0.20674848556518555 +2,refs/heads/main,f0bf686f1738f1d253e907670e43dcb57789a592,28f100b913b407c72fdcb509ff02eb6de4d68bb3,01f5e014d8e158e32353355b1c09956794c6d8a8,,True,True,9414c830421dc01c4c1fab23dc6a1e2bb71e5db052b083acdedcfaf63e634cf6,Tests_passed,2798aab0ee424cc0d2efb1c737ea81b5d4b883790ec8dc6d5e6ee42e88e9abba,Tests_passed,True,True,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,0.05016446113586426,0.05155754089355469,0.06448936462402344,0.017853260040283203,0.04949069023132324,0.015114068984985352,0.018814802169799805,0.16316008567810059,0.014976739883422852,0.19844508171081543,0.16471481323242188,0.11509156227111816,0.06695747375488281,0.20674848556518555 diff --git a/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv b/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv index 077594f87a..8ecd9a70c5 100644 --- a/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv +++ b/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/3.0-master,158fb6406b10311f114054c66f6206dc7e915917,9210b250b1667cd62f21b06849ca55d4fef2764b,2e149543aa353adaf99eaa544f2c78ad5d091bbd,,aeb3adf5ff75668d4a1a0c0f0534aabf158afcd762f278d5a30038c51711ea23,Tests_passed,49691c320824661f6155e51f0219bcf10423dd997edd806f0e05c1d2e6429aa0,Tests_passed,True,True,True,True,Merge_failed,b83c2e12a0f26532d06bf5464fbc4c694fb0d3d3a0e9ca8b92d118048cc668db,Merge_failed,a02fe27031e71a08c2cb846c4f89a84df419fcb24a3e7c3e451f0b7c54545a24,Merge_failed,b83c2e12a0f26532d06bf5464fbc4c694fb0d3d3a0e9ca8b92d118048cc668db,Merge_failed,8440d1a976004a9dbaae48b3a088a621a2000c3146f946ff28866e1d5bc16771,Merge_failed,2890460f523d208beb6b913d80ee66e3e72ca0e4a63be1cbf9d224bbbfb544ce,Merge_failed,2890460f523d208beb6b913d80ee66e3e72ca0e4a63be1cbf9d224bbbfb544ce,Merge_failed,2890460f523d208beb6b913d80ee66e3e72ca0e4a63be1cbf9d224bbbfb544ce,Merge_failed,b0e753a112cf26ec3941643fb98d3c80361dbc8fd99833325e5a97910b9d646c,Merge_failed,b83c2e12a0f26532d06bf5464fbc4c694fb0d3d3a0e9ca8b92d118048cc668db,Merge_failed,5c7c58294df0f54ee3c81ea3a2031864d2b44dae02e05fcd88f22e3d750074a5,Merge_failed,5c7c58294df0f54ee3c81ea3a2031864d2b44dae02e05fcd88f22e3d750074a5,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,687a3ae1da9fdc2f4293d61eb23a5e46421372b37b9c937eafcbf2310b76df20,0.015668153762817383,0.015673160552978516,0.016704559326171875,0.016475915908813477,0.01669788360595703,0.01659369468688965,0.016273975372314453,0.1132814884185791,0.024813175201416016,0.5945940017700195,0.5907759666442871,0.4038982391357422,3.0706772804260254,0.1744678020477295 +2,refs/heads/3.0-master,158fb6406b10311f114054c66f6206dc7e915917,9210b250b1667cd62f21b06849ca55d4fef2764b,2e149543aa353adaf99eaa544f2c78ad5d091bbd,,aeb3adf5ff75668d4a1a0c0f0534aabf158afcd762f278d5a30038c51711ea23,Tests_passed,49691c320824661f6155e51f0219bcf10423dd997edd806f0e05c1d2e6429aa0,Tests_passed,True,True,True,True,Merge_failed,b83c2e12a0f26532d06bf5464fbc4c694fb0d3d3a0e9ca8b92d118048cc668db,Merge_failed,a02fe27031e71a08c2cb846c4f89a84df419fcb24a3e7c3e451f0b7c54545a24,Merge_failed,b83c2e12a0f26532d06bf5464fbc4c694fb0d3d3a0e9ca8b92d118048cc668db,Merge_failed,8440d1a976004a9dbaae48b3a088a621a2000c3146f946ff28866e1d5bc16771,Merge_failed,2890460f523d208beb6b913d80ee66e3e72ca0e4a63be1cbf9d224bbbfb544ce,Merge_failed,2890460f523d208beb6b913d80ee66e3e72ca0e4a63be1cbf9d224bbbfb544ce,Merge_failed,2890460f523d208beb6b913d80ee66e3e72ca0e4a63be1cbf9d224bbbfb544ce,Merge_failed,b0e753a112cf26ec3941643fb98d3c80361dbc8fd99833325e5a97910b9d646c,Merge_failed,b83c2e12a0f26532d06bf5464fbc4c694fb0d3d3a0e9ca8b92d118048cc668db,Merge_failed,5c7c58294df0f54ee3c81ea3a2031864d2b44dae02e05fcd88f22e3d750074a5,Merge_failed,5c7c58294df0f54ee3c81ea3a2031864d2b44dae02e05fcd88f22e3d750074a5,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,687a3ae1da9fdc2f4293d61eb23a5e46421372b37b9c937eafcbf2310b76df20,0.015668153762817383,0.015673160552978516,0.016704559326171875,0.016475915908813477,0.01669788360595703,0.01659369468688965,0.016273975372314453,0.1132814884185791,0.024813175201416016,0.5894372463226318,0.5896034240722656,0.4038982391357422,3.0706772804260254,0.1744678020477295 diff --git a/results/combined/merges_timed/timroes/axmlrpc.csv b/results/combined/merges_timed/timroes/axmlrpc.csv index 4425a1e196..f4b3379ac0 100644 --- a/results/combined/merges_timed/timroes/axmlrpc.csv +++ b/results/combined/merges_timed/timroes/axmlrpc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -28,refs/heads/master,be8156e8c76bb2cfede311ce136ead1916be2fc4,860c8ff40e85fa27d30c0c37fa6ebfe6688197d0,abab2528a322425135d44257e6efe3e7e361b6d8,,True,True,3c502d00da89828d147caa07a3825a1d61ec315548c61a269234de0073303b98,Tests_passed,aec16f12a61218c227c51387c6fd8227e3d851d404262e9a122500dc548cf5a0,Tests_passed,True,True,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,0.010595083236694336,0.010419130325317383,0.010778188705444336,0.011620044708251953,0.010905265808105469,0.010598421096801758,0.011379718780517578,0.047914743423461914,0.010645866394042969,0.3072633743286133,0.30751752853393555,0.1178581714630127,1.3165383338928223,0.16565489768981934 +28,refs/heads/master,be8156e8c76bb2cfede311ce136ead1916be2fc4,860c8ff40e85fa27d30c0c37fa6ebfe6688197d0,abab2528a322425135d44257e6efe3e7e361b6d8,,True,True,3c502d00da89828d147caa07a3825a1d61ec315548c61a269234de0073303b98,Tests_passed,aec16f12a61218c227c51387c6fd8227e3d851d404262e9a122500dc548cf5a0,Tests_passed,True,True,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,0.010595083236694336,0.010419130325317383,0.010778188705444336,0.011620044708251953,0.010905265808105469,0.010598421096801758,0.011379718780517578,0.047914743423461914,0.010645866394042969,0.30529093742370605,0.30348706245422363,0.1178581714630127,1.3165383338928223,0.16565489768981934 diff --git a/results/combined/merges_timed/tipsy/javalin.csv b/results/combined/merges_timed/tipsy/javalin.csv index 0c36cfb0c1..fd7d0ce826 100644 --- a/results/combined/merges_timed/tipsy/javalin.csv +++ b/results/combined/merges_timed/tipsy/javalin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -101,refs/remotes/origin/pull/2020,60530d20dd09c78de5831f0e9dace00d67c65df9,cedc91760eb796e72d5e45146e47633fecbfbae2,1fd96f8402b32ae8a80cb7e9e94c3245424cdca5,,e7a74f7077564b0463257b4dfdc8640567c00724b05d672dfdc5a5bd692519b1,Tests_passed,159e39dfe631d3dd32e3162fb2ae916ff95e2750ce5cb37da62f92f9ab9f0e13,Tests_passed,True,True,True,True,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,c841eceb977856ad00896a9e2d957f120c22ce2950d4b81b9fb60a62d786c1d5,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Merge_failed,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,a209323091224cf3a2a22f308de3a41958dfa3ffb03aa564b94143acce7d6bb6,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,0.05678844451904297,0.04638075828552246,0.06685876846313477,0.042023658752441406,0.03247499465942383,0.06253623962402344,0.05232119560241699,0.3135712146759033,0.07790422439575195,0.1806166172027588,0.16504549980163574,0.2360239028930664,0.6348621845245361,0.25212597846984863 +101,refs/remotes/origin/pull/2020,60530d20dd09c78de5831f0e9dace00d67c65df9,cedc91760eb796e72d5e45146e47633fecbfbae2,1fd96f8402b32ae8a80cb7e9e94c3245424cdca5,,e7a74f7077564b0463257b4dfdc8640567c00724b05d672dfdc5a5bd692519b1,Tests_passed,159e39dfe631d3dd32e3162fb2ae916ff95e2750ce5cb37da62f92f9ab9f0e13,Tests_passed,True,True,True,True,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,c841eceb977856ad00896a9e2d957f120c22ce2950d4b81b9fb60a62d786c1d5,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Merge_failed,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,a209323091224cf3a2a22f308de3a41958dfa3ffb03aa564b94143acce7d6bb6,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,0.05678844451904297,0.04638075828552246,0.06685876846313477,0.042023658752441406,0.03247499465942383,0.06253623962402344,0.05232119560241699,0.3135712146759033,0.07790422439575195,0.16883015632629395,0.1619410514831543,0.2360239028930664,0.6348621845245361,0.25212597846984863 diff --git a/results/combined/merges_timed/titokone/titokone.csv b/results/combined/merges_timed/titokone/titokone.csv index 9988014acf..cd56ae5b63 100644 --- a/results/combined/merges_timed/titokone/titokone.csv +++ b/results/combined/merges_timed/titokone/titokone.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,b4ac484b6a1a0484bc131e305cb531835efe9aa0,db2a1a74458f65887c532c52c60ab73d99eb6021,642f4a961a4c51b8baf679211a7e4de1bcc17b00,,74cf1e3ed7e57adc6162b7432c67b363b79e4df1909f3524c2142fa3b2172d88,Tests_passed,a23397a2d22680845537fca02f46c85344b1b7f5dd9abdeaefb9491263eed114,Tests_passed,True,True,True,True,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,fa74015ac5456c003783c46e1596ba767c958e7c5c7e8ea21bfeb3c015057780,Tests_passed,fa74015ac5456c003783c46e1596ba767c958e7c5c7e8ea21bfeb3c015057780,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,0.05215144157409668,0.029134750366210938,0.062140703201293945,0.049237966537475586,0.04490971565246582,0.039763450622558594,0.05616950988769531,0.17666912078857422,0.025327205657958984,0.19379281997680664,0.19977974891662598,0.13451004028320312,0.04860234260559082,0.252408504486084 +1,refs/heads/master,b4ac484b6a1a0484bc131e305cb531835efe9aa0,db2a1a74458f65887c532c52c60ab73d99eb6021,642f4a961a4c51b8baf679211a7e4de1bcc17b00,,74cf1e3ed7e57adc6162b7432c67b363b79e4df1909f3524c2142fa3b2172d88,Tests_passed,a23397a2d22680845537fca02f46c85344b1b7f5dd9abdeaefb9491263eed114,Tests_passed,True,True,True,True,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,fa74015ac5456c003783c46e1596ba767c958e7c5c7e8ea21bfeb3c015057780,Tests_passed,fa74015ac5456c003783c46e1596ba767c958e7c5c7e8ea21bfeb3c015057780,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,0.05215144157409668,0.029134750366210938,0.062140703201293945,0.049237966537475586,0.04490971565246582,0.039763450622558594,0.05616950988769531,0.17666912078857422,0.025327205657958984,0.19291281700134277,0.19059371948242188,0.13451004028320312,0.04860234260559082,0.252408504486084 diff --git a/results/combined/merges_timed/tkelley-eg/collectd-fast-jmx.csv b/results/combined/merges_timed/tkelley-eg/collectd-fast-jmx.csv index 135cae7314..157e8d90d9 100644 --- a/results/combined/merges_timed/tkelley-eg/collectd-fast-jmx.csv +++ b/results/combined/merges_timed/tkelley-eg/collectd-fast-jmx.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,Tests_passed,True,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,0.044940948486328125,0.047214508056640625,0.043787479400634766,0.04687929153442383,0.045101165771484375,0.04206228256225586,0.045850515365600586,0.1631019115447998,0.044165611267089844,0.16817831993103027,0.15855884552001953,0.10330986976623535,1.031886100769043,0.19390249252319336 +7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,Tests_passed,True,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,0.044940948486328125,0.047214508056640625,0.043787479400634766,0.04687929153442383,0.045101165771484375,0.04206228256225586,0.045850515365600586,0.1631019115447998,0.044165611267089844,0.15835833549499512,0.15684747695922852,0.10330986976623535,1.031886100769043,0.19390249252319336 diff --git a/results/combined/merges_timed/tntim96/jscover.csv b/results/combined/merges_timed/tntim96/jscover.csv index 3dce7478e0..e1dc79b49f 100644 --- a/results/combined/merges_timed/tntim96/jscover.csv +++ b/results/combined/merges_timed/tntim96/jscover.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,0.015267610549926758,0.016220808029174805,0.016614675521850586,0.0168306827545166,0.0170745849609375,0.01710343360900879,0.017294883728027344,0.0468745231628418,0.01626133918762207,0.17326903343200684,0.2215721607208252,0.07390689849853516,0.7279741764068604,0.24933552742004395 +19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,0.015267610549926758,0.016220808029174805,0.016614675521850586,0.0168306827545166,0.0170745849609375,0.01710343360900879,0.017294883728027344,0.0468745231628418,0.01626133918762207,0.21572136878967285,0.21328949928283691,0.07390689849853516,0.7279741764068604,0.24933552742004395 diff --git a/results/combined/merges_timed/tomitribe/crest.csv b/results/combined/merges_timed/tomitribe/crest.csv index 32b51c0a15..9be357085d 100644 --- a/results/combined/merges_timed/tomitribe/crest.csv +++ b/results/combined/merges_timed/tomitribe/crest.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/heads/master,d23c256ef0e1c28707583fd2f1738b932dd0e832,7b4318ffe350c221991bd51e6d59053743f284aa,81d39d8b802bb3a45408b0f4c0fca973010199ba,,True,True,dcaabc6052244ddc997dfdd2a00da997799d6866b2fc621cda352ce59f8d11ad,Tests_passed,05848175f35a6b36a10f9b8f5de68e9b60fc17ce94d52e1ad85eb2955d745de6,Tests_passed,True,True,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_failed,0f614bd55042174106a892ac7188a90e94deab91ae450d313f2b0793e4337279,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,0.056478023529052734,0.05665254592895508,0.05809903144836426,0.0520174503326416,0.048818349838256836,0.04215812683105469,0.0450441837310791,0.18069243431091309,0.0518643856048584,0.17409515380859375,0.18546414375305176,0.0968177318572998,1.6507484912872314,0.23547601699829102 +27,refs/heads/master,d23c256ef0e1c28707583fd2f1738b932dd0e832,7b4318ffe350c221991bd51e6d59053743f284aa,81d39d8b802bb3a45408b0f4c0fca973010199ba,,True,True,dcaabc6052244ddc997dfdd2a00da997799d6866b2fc621cda352ce59f8d11ad,Tests_passed,05848175f35a6b36a10f9b8f5de68e9b60fc17ce94d52e1ad85eb2955d745de6,Tests_passed,True,True,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,Tests_failed,0f614bd55042174106a892ac7188a90e94deab91ae450d313f2b0793e4337279,Tests_passed,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,0.056478023529052734,0.05665254592895508,0.05809903144836426,0.0520174503326416,0.048818349838256836,0.04215812683105469,0.0450441837310791,0.18069243431091309,0.0518643856048584,0.17272138595581055,0.17187237739562988,0.0968177318572998,1.6507484912872314,0.23547601699829102 diff --git a/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv b/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv index dc800e9a5e..b014bfe672 100644 --- a/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv +++ b/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -28,refs/heads/master,1571b55f4b470341a6ff1ef05e5ef3410cbc0418,2c944d6a12023c5ed33046fcc8ae99ce6ef6d146,3d550d56429568679fae47c9d1d640e2e3477cc8,,True,True,fb5fe927362e284a846fce49ddc75a818be3bd204c48efda9267b523a1b8c7bf,Tests_passed,38490cf7d91b2434f63c5614a2d9495896940e09efd5847e0a3fc6c7d3bb6e62,Tests_passed,True,True,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,0.056017160415649414,0.03256058692932129,0.057526588439941406,0.04972243309020996,0.05842900276184082,0.05703425407409668,0.051679134368896484,0.19242477416992188,0.061255693435668945,0.15822148323059082,0.1578054428100586,0.11243128776550293,0.8196380138397217,0.22788643836975098 +28,refs/heads/master,1571b55f4b470341a6ff1ef05e5ef3410cbc0418,2c944d6a12023c5ed33046fcc8ae99ce6ef6d146,3d550d56429568679fae47c9d1d640e2e3477cc8,,True,True,fb5fe927362e284a846fce49ddc75a818be3bd204c48efda9267b523a1b8c7bf,Tests_passed,38490cf7d91b2434f63c5614a2d9495896940e09efd5847e0a3fc6c7d3bb6e62,Tests_passed,True,True,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,0.056017160415649414,0.03256058692932129,0.057526588439941406,0.04972243309020996,0.05842900276184082,0.05703425407409668,0.051679134368896484,0.19242477416992188,0.061255693435668945,0.16012310981750488,0.15654516220092773,0.11243128776550293,0.8196380138397217,0.22788643836975098 diff --git a/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv b/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv index 6edbc4d131..395bfedef1 100644 --- a/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv +++ b/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,Tests_passed,True,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.016152620315551758,0.016547441482543945,0.02034473419189453,0.020302534103393555,0.01977062225341797,0.020272016525268555,0.020308732986450195,0.04810905456542969,0.015832185745239258,0.1908552646636963,0.17953872680664062,0.07109308242797852,1.2589967250823975,0.19282150268554688 +24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,Tests_passed,True,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.016152620315551758,0.016547441482543945,0.02034473419189453,0.020302534103393555,0.01977062225341797,0.020272016525268555,0.020308732986450195,0.04810905456542969,0.015832185745239258,0.18900370597839355,0.18996167182922363,0.07109308242797852,1.2589967250823975,0.19282150268554688 diff --git a/results/combined/merges_timed/tpietzsch/spimviewer.csv b/results/combined/merges_timed/tpietzsch/spimviewer.csv index c7e0fe761f..89628e4dd3 100644 --- a/results/combined/merges_timed/tpietzsch/spimviewer.csv +++ b/results/combined/merges_timed/tpietzsch/spimviewer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,Tests_passed,True,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.01582169532775879,0.016814470291137695,0.019854307174682617,0.019657611846923828,0.01968860626220703,0.020383596420288086,0.019805431365966797,0.048204898834228516,0.015931367874145508,0.19207119941711426,0.19284534454345703,0.0720665454864502,1.2331314086914062,0.1976914405822754 +24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,Tests_passed,True,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.01582169532775879,0.016814470291137695,0.019854307174682617,0.019657611846923828,0.01968860626220703,0.020383596420288086,0.019805431365966797,0.048204898834228516,0.015931367874145508,0.18938446044921875,0.19479584693908691,0.0720665454864502,1.2331314086914062,0.1976914405822754 diff --git a/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv b/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv index 8cdf7187a8..86688dfae2 100644 --- a/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv +++ b/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,c77d67ab1de02ab8fca05ea264d59a50ef71cbcf,9c75486c84fc0a219d63db87d46e782f6a771030,4ec7118d75ff23876d0d08e8eb65884bf64fc7d2,,True,True,bbbc792e3b4dd1035526207693bf33adb93d8a35482fc4dd0bc2f37b692addd7,Tests_passed,dcd0ad0bfc7a8d47966134a33190681ec1670d6807f6d68ba179a7e9feb0551e,Tests_passed,True,True,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,061555bba71c9d2fb85c81532305af14f354af7a41ad0abc15ed987b132ccd39,Tests_failed,061555bba71c9d2fb85c81532305af14f354af7a41ad0abc15ed987b132ccd39,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,0.009611368179321289,0.009708881378173828,0.009871244430541992,0.009593725204467773,0.009908437728881836,0.009857654571533203,0.009978055953979492,0.03478264808654785,0.009532690048217773,0.15522456169128418,0.1551058292388916,0.06551051139831543,0.7030458450317383,0.1495511531829834 +2,refs/heads/master,c77d67ab1de02ab8fca05ea264d59a50ef71cbcf,9c75486c84fc0a219d63db87d46e782f6a771030,4ec7118d75ff23876d0d08e8eb65884bf64fc7d2,,True,True,bbbc792e3b4dd1035526207693bf33adb93d8a35482fc4dd0bc2f37b692addd7,Tests_passed,dcd0ad0bfc7a8d47966134a33190681ec1670d6807f6d68ba179a7e9feb0551e,Tests_passed,True,True,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,061555bba71c9d2fb85c81532305af14f354af7a41ad0abc15ed987b132ccd39,Tests_failed,061555bba71c9d2fb85c81532305af14f354af7a41ad0abc15ed987b132ccd39,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,0.009611368179321289,0.009708881378173828,0.009871244430541992,0.009593725204467773,0.009908437728881836,0.009857654571533203,0.009978055953979492,0.03478264808654785,0.009532690048217773,0.15322208404541016,0.15244364738464355,0.06551051139831543,0.7030458450317383,0.1495511531829834 diff --git a/results/combined/merges_timed/tracee/tracee.csv b/results/combined/merges_timed/tracee/tracee.csv index c20e073554..070fb562e3 100644 --- a/results/combined/merges_timed/tracee/tracee.csv +++ b/results/combined/merges_timed/tracee/tracee.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -94,refs/heads/master,f75ef3990515f567880ae6045fed482ce05cc02a,62baa332cdbfcdd7955a7c72e827929e58254b04,d787ab20924a98d77c44dc8fe5ce5c27046d9b5f,,True,True,f4d6d2d762ce4d53448fe934fe38e8e2da67dc9b345ae5814b95fb39cd6e7020,Tests_passed,de969bd4b3c296052b56f85266ed185ab7c16b3cb53566781c5b510d78bd29b6,Tests_passed,True,True,Merge_failed,f208d16af3b94ca58f37c895bd7b654dfa6a4ccbd33d7a74fc6fdc3be6797d7a,Merge_failed,e924f42587eb34bfe6f83b6c76d5607670252206c38a40ea223ce18945fd10e4,Merge_failed,f208d16af3b94ca58f37c895bd7b654dfa6a4ccbd33d7a74fc6fdc3be6797d7a,Merge_failed,57eb16913fbcd8538f85ec9c261528fb0b767f2a6751b527194c1d2c60334a0d,Merge_failed,cba4108929026acd7db2b6d8c82535c6a56522152598eba5296344ebd3575f8d,Merge_failed,cba4108929026acd7db2b6d8c82535c6a56522152598eba5296344ebd3575f8d,Merge_failed,c6fd3714684596cf3f1094e1a4b0919cb8d25f3f37bb16e1132a9507a0611137,Merge_failed,d42f6b4e15a84f128a2dd3ab8de226c5731d7700ebc47aec6545b12c382314d1,Merge_failed,f208d16af3b94ca58f37c895bd7b654dfa6a4ccbd33d7a74fc6fdc3be6797d7a,Merge_failed,eaa72b07081a26ef8757b7d7737a01ce71683b542aedd0e66a85e55ceb2e265a,Merge_failed,e88e0c5153ba6dffceffa456f946eb4a7c8ea3bfa011b58d48a1f4889e190c5c,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,0.0675191879272461,0.07007503509521484,0.048508405685424805,0.06962704658508301,0.0733804702758789,0.04801583290100098,0.06391096115112305,2.10709285736084,0.47397494316101074,2.363476514816284,2.369145154953003,1.990940809249878,0.045385122299194336,0.3192017078399658 +94,refs/heads/master,f75ef3990515f567880ae6045fed482ce05cc02a,62baa332cdbfcdd7955a7c72e827929e58254b04,d787ab20924a98d77c44dc8fe5ce5c27046d9b5f,,True,True,f4d6d2d762ce4d53448fe934fe38e8e2da67dc9b345ae5814b95fb39cd6e7020,Tests_passed,de969bd4b3c296052b56f85266ed185ab7c16b3cb53566781c5b510d78bd29b6,Tests_passed,True,True,Merge_failed,f208d16af3b94ca58f37c895bd7b654dfa6a4ccbd33d7a74fc6fdc3be6797d7a,Merge_failed,e924f42587eb34bfe6f83b6c76d5607670252206c38a40ea223ce18945fd10e4,Merge_failed,f208d16af3b94ca58f37c895bd7b654dfa6a4ccbd33d7a74fc6fdc3be6797d7a,Merge_failed,57eb16913fbcd8538f85ec9c261528fb0b767f2a6751b527194c1d2c60334a0d,Merge_failed,cba4108929026acd7db2b6d8c82535c6a56522152598eba5296344ebd3575f8d,Merge_failed,cba4108929026acd7db2b6d8c82535c6a56522152598eba5296344ebd3575f8d,Merge_failed,c6fd3714684596cf3f1094e1a4b0919cb8d25f3f37bb16e1132a9507a0611137,Merge_failed,d42f6b4e15a84f128a2dd3ab8de226c5731d7700ebc47aec6545b12c382314d1,Merge_failed,f208d16af3b94ca58f37c895bd7b654dfa6a4ccbd33d7a74fc6fdc3be6797d7a,Merge_failed,eaa72b07081a26ef8757b7d7737a01ce71683b542aedd0e66a85e55ceb2e265a,Merge_failed,e88e0c5153ba6dffceffa456f946eb4a7c8ea3bfa011b58d48a1f4889e190c5c,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,0.0675191879272461,0.07007503509521484,0.048508405685424805,0.06962704658508301,0.0733804702758789,0.04801583290100098,0.06391096115112305,2.10709285736084,0.47397494316101074,2.3750786781311035,2.3857083320617676,1.990940809249878,0.045385122299194336,0.3192017078399658 diff --git a/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv b/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv index 7437c51ffe..35597d4dfc 100644 --- a/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv +++ b/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/remotes/origin/pull/31,5f3e6016a840a88e18f554d79d9d94de21a070e9,fc5039fe2138132a59acadd539481f1bb0e43aab,d56218d04ed9200e1eff7e35f3498f604aca4d86,,f96a464abd63f497c626ffe37ea864f36d70d8e417529dbcbe274d34cdfe4ea0,Tests_passed,97d0ffe23c8acf9e3c4c101a2086e6cd3e238be91e42c10ecf6e6c64e600e30d,Tests_passed,True,True,True,True,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,f7e2e1b266c61ee79cb15fae5f6eb06275823e9516db3349d7e2759456a56cc8,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,f7e2e1b266c61ee79cb15fae5f6eb06275823e9516db3349d7e2759456a56cc8,Merge_failed,b712a81d6e3b30cdd4352d837dc7376f058b94b3151eb8e28c18a58297444816,Merge_failed,b712a81d6e3b30cdd4352d837dc7376f058b94b3151eb8e28c18a58297444816,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,e09b0ab04807b464784dbf0f67a2904eeba7b0df3384262f95ec124432ed1709,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,e23a870a4502a4fda8ee4d3819c73a0b14fab95f0df4670d388e0fe76bc3920f,Merge_failed,e23a870a4502a4fda8ee4d3819c73a0b14fab95f0df4670d388e0fe76bc3920f,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Merge_failed,cbb5beab97d9e0ec74e24d6646fa9913546b1f9d54ed8e05487ceadce8fec8dd,0.03911447525024414,0.04003572463989258,0.037322998046875,0.037390947341918945,0.037674665451049805,0.03882622718811035,0.038288116455078125,0.21964478492736816,0.06398415565490723,0.267958402633667,0.2687530517578125,0.18127679824829102,1.1765682697296143,0.1779947280883789 +9,refs/remotes/origin/pull/31,5f3e6016a840a88e18f554d79d9d94de21a070e9,fc5039fe2138132a59acadd539481f1bb0e43aab,d56218d04ed9200e1eff7e35f3498f604aca4d86,,f96a464abd63f497c626ffe37ea864f36d70d8e417529dbcbe274d34cdfe4ea0,Tests_passed,97d0ffe23c8acf9e3c4c101a2086e6cd3e238be91e42c10ecf6e6c64e600e30d,Tests_passed,True,True,True,True,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,f7e2e1b266c61ee79cb15fae5f6eb06275823e9516db3349d7e2759456a56cc8,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,f7e2e1b266c61ee79cb15fae5f6eb06275823e9516db3349d7e2759456a56cc8,Merge_failed,b712a81d6e3b30cdd4352d837dc7376f058b94b3151eb8e28c18a58297444816,Merge_failed,b712a81d6e3b30cdd4352d837dc7376f058b94b3151eb8e28c18a58297444816,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,e09b0ab04807b464784dbf0f67a2904eeba7b0df3384262f95ec124432ed1709,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,e23a870a4502a4fda8ee4d3819c73a0b14fab95f0df4670d388e0fe76bc3920f,Merge_failed,e23a870a4502a4fda8ee4d3819c73a0b14fab95f0df4670d388e0fe76bc3920f,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Merge_failed,cbb5beab97d9e0ec74e24d6646fa9913546b1f9d54ed8e05487ceadce8fec8dd,0.03911447525024414,0.04003572463989258,0.037322998046875,0.037390947341918945,0.037674665451049805,0.03882622718811035,0.038288116455078125,0.21964478492736816,0.06398415565490723,0.2654883861541748,0.26670169830322266,0.18127679824829102,1.1765682697296143,0.1779947280883789 diff --git a/results/combined/merges_timed/tridentsdk/tridentsdk.csv b/results/combined/merges_timed/tridentsdk/tridentsdk.csv index f9c17eaaaa..24cb0ad267 100644 --- a/results/combined/merges_timed/tridentsdk/tridentsdk.csv +++ b/results/combined/merges_timed/tridentsdk/tridentsdk.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,Tests_passed,True,True,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,cc061f9e29c6ae65aa4b9d4de56cf3a418992c3332db1513f346948c32ee8a5d,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,c982c747a949bdb646e414e79e2cd24fb3671360158ae7575fe194c53f97abb2,Merge_failed,c982c747a949bdb646e414e79e2cd24fb3671360158ae7575fe194c53f97abb2,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,0.015267372131347656,0.01525259017944336,0.016328096389770508,0.021394968032836914,0.018965959548950195,0.015974044799804688,0.03414487838745117,0.1474616527557373,0.036360979080200195,0.27083873748779297,0.27152371406555176,0.2797842025756836,1.624173879623413,0.22646021842956543 +4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,Tests_passed,True,True,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,cc061f9e29c6ae65aa4b9d4de56cf3a418992c3332db1513f346948c32ee8a5d,Merge_failed,2fd695b18fe0f9354ed74f83137988f045735294e5359535050827ee9b67e9c1,Merge_failed,c982c747a949bdb646e414e79e2cd24fb3671360158ae7575fe194c53f97abb2,Merge_failed,c982c747a949bdb646e414e79e2cd24fb3671360158ae7575fe194c53f97abb2,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,0.015267372131347656,0.01525259017944336,0.016328096389770508,0.021394968032836914,0.018965959548950195,0.015974044799804688,0.03414487838745117,0.1474616527557373,0.036360979080200195,0.2697563171386719,0.2665572166442871,0.2797842025756836,1.624173879623413,0.22646021842956543 diff --git a/results/combined/merges_timed/trung/inmemoryjavacompiler.csv b/results/combined/merges_timed/trung/inmemoryjavacompiler.csv index d96781e4a1..71b0a1ee95 100644 --- a/results/combined/merges_timed/trung/inmemoryjavacompiler.csv +++ b/results/combined/merges_timed/trung/inmemoryjavacompiler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,6460eed46a2343e156dcb3a6f13b286a75f81667,da1628c7396149475825220594931c207eb15862,96b17fef2e11ceccd9692d47656462c019bbf72e,,True,True,859d798bf3f7727b6e254cd7787aab1bf9d5c15dfd8823498c954250295b78cb,Tests_passed,97230600688253da51b6eee31a61603fc85734989eef81ea6fa8f7fba9bd0a94,Tests_passed,True,True,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,0412aebef45f173e7cabaa7cdb28aa40e9e502b30955fca48da2de65c4354c45,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,50de32c8a89deef4ad71d0273d3a7dfe1d9af6cbb5f03f08550ab78e57dbe5b2,Merge_failed,50de32c8a89deef4ad71d0273d3a7dfe1d9af6cbb5f03f08550ab78e57dbe5b2,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Merge_failed,5f2aac754f68731b822189a0d739205635b5471eb776963240379b1294c99ff0,0.03392291069030762,0.031009912490844727,0.03581714630126953,0.03729104995727539,0.03768277168273926,0.036516427993774414,0.0324857234954834,0.15687203407287598,0.061783552169799805,0.10296964645385742,0.11028671264648438,0.11629796028137207,0.642298698425293,0.19061779975891113 +4,refs/heads/master,6460eed46a2343e156dcb3a6f13b286a75f81667,da1628c7396149475825220594931c207eb15862,96b17fef2e11ceccd9692d47656462c019bbf72e,,True,True,859d798bf3f7727b6e254cd7787aab1bf9d5c15dfd8823498c954250295b78cb,Tests_passed,97230600688253da51b6eee31a61603fc85734989eef81ea6fa8f7fba9bd0a94,Tests_passed,True,True,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,0412aebef45f173e7cabaa7cdb28aa40e9e502b30955fca48da2de65c4354c45,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,50de32c8a89deef4ad71d0273d3a7dfe1d9af6cbb5f03f08550ab78e57dbe5b2,Merge_failed,50de32c8a89deef4ad71d0273d3a7dfe1d9af6cbb5f03f08550ab78e57dbe5b2,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Merge_failed,5f2aac754f68731b822189a0d739205635b5471eb776963240379b1294c99ff0,0.03392291069030762,0.031009912490844727,0.03581714630126953,0.03729104995727539,0.03768277168273926,0.036516427993774414,0.0324857234954834,0.15687203407287598,0.061783552169799805,0.11296296119689941,0.11174798011779785,0.11629796028137207,0.642298698425293,0.19061779975891113 diff --git a/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv b/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv index 9e19ad1e9e..afa02d24b9 100644 --- a/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv +++ b/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/remotes/origin/pull/22,0c9d74cdf98412aeadda94cf3267e82549b0a391,3536c9e59f9eca285fa7df740b2bd3175fd8b36c,8fbcc8f2e694e9a9b112219606d4039a529e5876,,True,True,c871a2a1dd1d1ed7d57d77dd426daa961fac9a317abf6e6ba566a66279e3657e,Tests_passed,ca69d46e29de6a208e5542bfa77e620c95b8c471501999ffd71b5c77f364da92,Tests_passed,True,True,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,8c1b13bdf5924604714bf1bf9a1f9c6fd97f3190cffcdabdae6afa200e6adf78,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,3ce0451b1ef00fe988d42af91091b3b9416da46153e3fb19a21c4b3bd459e7c1,Merge_failed,3ce0451b1ef00fe988d42af91091b3b9416da46153e3fb19a21c4b3bd459e7c1,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Merge_failed,21dc8298d72b1fed2fb835c9c706eb42e73b6e8588625e4411b36db0881845a9,0.014379739761352539,0.014288187026977539,0.015680789947509766,0.01551508903503418,0.015498638153076172,0.01593494415283203,0.0158994197845459,0.04353690147399902,0.019919633865356445,0.15192627906799316,0.1524958610534668,0.0703427791595459,0.6736428737640381,0.16756725311279297 +6,refs/remotes/origin/pull/22,0c9d74cdf98412aeadda94cf3267e82549b0a391,3536c9e59f9eca285fa7df740b2bd3175fd8b36c,8fbcc8f2e694e9a9b112219606d4039a529e5876,,True,True,c871a2a1dd1d1ed7d57d77dd426daa961fac9a317abf6e6ba566a66279e3657e,Tests_passed,ca69d46e29de6a208e5542bfa77e620c95b8c471501999ffd71b5c77f364da92,Tests_passed,True,True,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,8c1b13bdf5924604714bf1bf9a1f9c6fd97f3190cffcdabdae6afa200e6adf78,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,3ce0451b1ef00fe988d42af91091b3b9416da46153e3fb19a21c4b3bd459e7c1,Merge_failed,3ce0451b1ef00fe988d42af91091b3b9416da46153e3fb19a21c4b3bd459e7c1,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Merge_failed,21dc8298d72b1fed2fb835c9c706eb42e73b6e8588625e4411b36db0881845a9,0.014379739761352539,0.014288187026977539,0.015680789947509766,0.01551508903503418,0.015498638153076172,0.01593494415283203,0.0158994197845459,0.04353690147399902,0.019919633865356445,0.14988350868225098,0.15224742889404297,0.0703427791595459,0.6736428737640381,0.16756725311279297 diff --git a/results/combined/merges_timed/tuck182/harmony-java-client.csv b/results/combined/merges_timed/tuck182/harmony-java-client.csv index be0ea18e8b..fa3f48a663 100644 --- a/results/combined/merges_timed/tuck182/harmony-java-client.csv +++ b/results/combined/merges_timed/tuck182/harmony-java-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/remotes/origin/pull/18,fb735c719e4cfcc69791ce5365a58de81b892eab,c2b95a0ce01f03de824c68ffa44a724186d543af,208518395654bdbe14e712d57f61edeb25e5fc10,,True,True,061bc76cd8427cadaad08e053d52ba98ccbc23919e9a6700a523abe9fe264f66,Tests_passed,9b4ab486b57fedd69bd48c6d57310345381941388b59153ff6722441b8354998,Tests_passed,True,True,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,a92e9fb9567ea8f001cb0c7e6f641e36c2e0bdda67460c3eb2097593350c9517,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,def4f2ebcdfb852bb71e9796796dd3617a6f2b75c33cc0b600c0dcccf8a108a0,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,7511d3103ba2cb08e6823858ff23362d50cd56fad1a306478ecc182dbc371b10,Merge_failed,fcabc9fd2b518fe33ac6f6c2c1736b5f07845e8f5097460177948476925ea86d,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,d3e6a40238e04e9afc29024c3e82a221e43c492d4ca4ae724319f95e7279fda2,Merge_failed,82f50f9bf3555de1b91759967c534cac8ae2ffcd948c2f4e2a1c260ec74cec70,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,c034c11ab26f4ff3a13678fcf9b63e1a283dbec3878e2e49cca67c13d514636f,Merge_failed,e17224a247560c7038a0fd5e36eaf56c05a1bba5c3bf79419072a4e9d76b6005,0.010153770446777344,0.010296344757080078,0.010285377502441406,0.010156631469726562,0.010285615921020508,0.01027989387512207,0.010286569595336914,0.09299969673156738,0.025754690170288086,0.2707974910736084,0.27054786682128906,0.3565390110015869,2.205512523651123,0.18461012840270996 +12,refs/remotes/origin/pull/18,fb735c719e4cfcc69791ce5365a58de81b892eab,c2b95a0ce01f03de824c68ffa44a724186d543af,208518395654bdbe14e712d57f61edeb25e5fc10,,True,True,061bc76cd8427cadaad08e053d52ba98ccbc23919e9a6700a523abe9fe264f66,Tests_passed,9b4ab486b57fedd69bd48c6d57310345381941388b59153ff6722441b8354998,Tests_passed,True,True,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,a92e9fb9567ea8f001cb0c7e6f641e36c2e0bdda67460c3eb2097593350c9517,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,def4f2ebcdfb852bb71e9796796dd3617a6f2b75c33cc0b600c0dcccf8a108a0,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,7511d3103ba2cb08e6823858ff23362d50cd56fad1a306478ecc182dbc371b10,Merge_failed,fcabc9fd2b518fe33ac6f6c2c1736b5f07845e8f5097460177948476925ea86d,Merge_failed,5c96273a4f9250a95d22f2e6282a1ed29e3d5832998046de95b1512d49ad1107,Merge_failed,d3e6a40238e04e9afc29024c3e82a221e43c492d4ca4ae724319f95e7279fda2,Merge_failed,82f50f9bf3555de1b91759967c534cac8ae2ffcd948c2f4e2a1c260ec74cec70,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,c034c11ab26f4ff3a13678fcf9b63e1a283dbec3878e2e49cca67c13d514636f,Merge_failed,e17224a247560c7038a0fd5e36eaf56c05a1bba5c3bf79419072a4e9d76b6005,0.010153770446777344,0.010296344757080078,0.010285377502441406,0.010156631469726562,0.010285615921020508,0.01027989387512207,0.010286569595336914,0.09299969673156738,0.025754690170288086,0.271761417388916,0.2716562747955322,0.3565390110015869,2.205512523651123,0.18461012840270996 diff --git a/results/combined/merges_timed/tumblr/jumblr.csv b/results/combined/merges_timed/tumblr/jumblr.csv index ebdb9c7c61..5e330477c9 100644 --- a/results/combined/merges_timed/tumblr/jumblr.csv +++ b/results/combined/merges_timed/tumblr/jumblr.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -39,refs/remotes/origin/pull/18,7bd1a3a093ace02c2ebc38d3be82b32648347cc8,b6eceef13010039abfa0207b9414596c36b44232,560d193ec4b29a3a279a595dfe820c28c2d79572,,9b4ca1edb7927cd6698f011538d47fd7e0d69ae74ffd94c58138fe6d452fd1d1,Tests_passed,dc26af4cb9ee9d74196fdf731bdcf20316a7e1cdee7034ec39d377f605393cec,Tests_passed,True,True,True,True,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,95a5ab0d1833a090557630f29ab64bd3a39145b459fd5d57d77fcca7c9985207,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,0.041060447692871094,0.04610133171081543,0.03771257400512695,0.04943680763244629,0.05413031578063965,0.05374455451965332,0.04127383232116699,0.050099849700927734,0.04831957817077637,0.16166234016418457,0.16021180152893066,0.15685343742370605,0.8798577785491943,0.19398236274719238 +39,refs/remotes/origin/pull/18,7bd1a3a093ace02c2ebc38d3be82b32648347cc8,b6eceef13010039abfa0207b9414596c36b44232,560d193ec4b29a3a279a595dfe820c28c2d79572,,9b4ca1edb7927cd6698f011538d47fd7e0d69ae74ffd94c58138fe6d452fd1d1,Tests_passed,dc26af4cb9ee9d74196fdf731bdcf20316a7e1cdee7034ec39d377f605393cec,Tests_passed,True,True,True,True,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,95a5ab0d1833a090557630f29ab64bd3a39145b459fd5d57d77fcca7c9985207,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,0.041060447692871094,0.04610133171081543,0.03771257400512695,0.04943680763244629,0.05413031578063965,0.05374455451965332,0.04127383232116699,0.050099849700927734,0.04831957817077637,0.16017484664916992,0.15641403198242188,0.15685343742370605,0.8798577785491943,0.19398236274719238 diff --git a/results/combined/merges_timed/tupilabs/tap4j.csv b/results/combined/merges_timed/tupilabs/tap4j.csv index 20658b9261..d984800d8c 100644 --- a/results/combined/merges_timed/tupilabs/tap4j.csv +++ b/results/combined/merges_timed/tupilabs/tap4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,99628e2c44b0d5f5c4d7bad5e525a56566d16080,2620ea5c57e3da066aa1af75070a704a80854c2b,2fe814a4e5272af1d0976c2b24cf5b67160f810e,,fafa762c385d191ebc2ccf86b45b1862bbd6644256b853ad21a0859ef06bd6a8,Tests_passed,948c1d31ca76688fc9ef8dbb95e608922e207e7487192d18c168a57937ad9bef,Tests_passed,True,True,True,True,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f8acfabf612315db36afd4d8e4da28643f171df75c58d1c800744444132ea309,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f5e2f666323b7ce58014406d6c777ceb1c72ab59be24eae81bb4ad47e2914dd3,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,0.03746318817138672,0.04988908767700195,0.03250265121459961,0.048722267150878906,0.046083688735961914,0.04366564750671387,0.030047178268432617,0.17029142379760742,0.036271095275878906,0.18793606758117676,0.17745113372802734,0.0755617618560791,0.8004753589630127,0.21002769470214844 +6,refs/heads/master,99628e2c44b0d5f5c4d7bad5e525a56566d16080,2620ea5c57e3da066aa1af75070a704a80854c2b,2fe814a4e5272af1d0976c2b24cf5b67160f810e,,fafa762c385d191ebc2ccf86b45b1862bbd6644256b853ad21a0859ef06bd6a8,Tests_passed,948c1d31ca76688fc9ef8dbb95e608922e207e7487192d18c168a57937ad9bef,Tests_passed,True,True,True,True,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f8acfabf612315db36afd4d8e4da28643f171df75c58d1c800744444132ea309,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f5e2f666323b7ce58014406d6c777ceb1c72ab59be24eae81bb4ad47e2914dd3,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,0.03746318817138672,0.04988908767700195,0.03250265121459961,0.048722267150878906,0.046083688735961914,0.04366564750671387,0.030047178268432617,0.17029142379760742,0.036271095275878906,0.17295169830322266,0.17256498336791992,0.0755617618560791,0.8004753589630127,0.21002769470214844 diff --git a/results/combined/merges_timed/turbospaces/turbospaces.csv b/results/combined/merges_timed/turbospaces/turbospaces.csv index b3401fa68b..f192283577 100644 --- a/results/combined/merges_timed/turbospaces/turbospaces.csv +++ b/results/combined/merges_timed/turbospaces/turbospaces.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,8ae57f28d98ec897164b09822d86603b02833a83,0fd7d6b196273b3582b1ecf415ee6e853ac37bf2,5ff57c384e86fcead8f20be720e12a30b992b22b,,a17078563d25fe2d807d3342993548764250989e81abc3e63441278ef670ccba,Tests_passed,e94f1dc1fe358a84c77af71e0d6009644a002e7143af12afa909faac31733a40,Tests_passed,True,True,True,True,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,0.015007257461547852,0.01499795913696289,0.017852067947387695,0.017876148223876953,0.01806926727294922,0.01778435707092285,0.017854928970336914,0.044738054275512695,0.015003204345703125,0.17335820198059082,0.17658114433288574,0.07070255279541016,0.7909126281738281,0.2020273208618164 +2,refs/heads/master,8ae57f28d98ec897164b09822d86603b02833a83,0fd7d6b196273b3582b1ecf415ee6e853ac37bf2,5ff57c384e86fcead8f20be720e12a30b992b22b,,a17078563d25fe2d807d3342993548764250989e81abc3e63441278ef670ccba,Tests_passed,e94f1dc1fe358a84c77af71e0d6009644a002e7143af12afa909faac31733a40,Tests_passed,True,True,True,True,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,0.015007257461547852,0.01499795913696289,0.017852067947387695,0.017876148223876953,0.01806926727294922,0.01778435707092285,0.017854928970336914,0.044738054275512695,0.015003204345703125,0.16693520545959473,0.16757988929748535,0.07070255279541016,0.7909126281738281,0.2020273208618164 diff --git a/results/combined/merges_timed/turini/vraptor-authz.csv b/results/combined/merges_timed/turini/vraptor-authz.csv index 05617da598..9a74f025f9 100644 --- a/results/combined/merges_timed/turini/vraptor-authz.csv +++ b/results/combined/merges_timed/turini/vraptor-authz.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,ff9a0b0405f0d759760b73d8963d788c837bc9d0,603809922d1ebfc28b76ced0a454f82ef3b822a8,c8106473de8fc96beef50f5f9f9c778455d23a08,,342bbf7d6a11eb6cf5775789e02d3f32b3458ed218a58b408f08bd8bcac41351,Tests_passed,c874ace2b4c4d01a77fed200bcfd28dacf648237071cb058e02cbdd98fc371bd,Tests_passed,True,True,True,True,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,3d6916e17e02abf3abb15388d5066c31180d0098e0e0d0b86e278292b0abac16,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,d777f521f416c7ef2f024cccfe3d37d1eb03805345a2342132af6ed15095a2d3,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,7fde7c7df0d1cfc08c7f0ef26c654c0c76693f32a621c4f7bcb19d407419b559,Merge_failed,7fde7c7df0d1cfc08c7f0ef26c654c0c76693f32a621c4f7bcb19d407419b559,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,60ab4b9ee6f3db69cb2cf7dc11d6f0ed562685d8f39a4ac0aee3fefec34c45ff,0.03749251365661621,0.03683066368103027,0.034343719482421875,0.03172922134399414,0.035796165466308594,0.03577136993408203,0.027764081954956055,0.16187000274658203,0.06183362007141113,0.06408023834228516,0.06412792205810547,0.11249327659606934,0.5201516151428223,0.17873406410217285 +6,refs/heads/master,ff9a0b0405f0d759760b73d8963d788c837bc9d0,603809922d1ebfc28b76ced0a454f82ef3b822a8,c8106473de8fc96beef50f5f9f9c778455d23a08,,342bbf7d6a11eb6cf5775789e02d3f32b3458ed218a58b408f08bd8bcac41351,Tests_passed,c874ace2b4c4d01a77fed200bcfd28dacf648237071cb058e02cbdd98fc371bd,Tests_passed,True,True,True,True,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,3d6916e17e02abf3abb15388d5066c31180d0098e0e0d0b86e278292b0abac16,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,d777f521f416c7ef2f024cccfe3d37d1eb03805345a2342132af6ed15095a2d3,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,7fde7c7df0d1cfc08c7f0ef26c654c0c76693f32a621c4f7bcb19d407419b559,Merge_failed,7fde7c7df0d1cfc08c7f0ef26c654c0c76693f32a621c4f7bcb19d407419b559,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,60ab4b9ee6f3db69cb2cf7dc11d6f0ed562685d8f39a4ac0aee3fefec34c45ff,0.03749251365661621,0.03683066368103027,0.034343719482421875,0.03172922134399414,0.035796165466308594,0.03577136993408203,0.027764081954956055,0.16187000274658203,0.06183362007141113,0.06439924240112305,0.06405353546142578,0.11249327659606934,0.5201516151428223,0.17873406410217285 diff --git a/results/combined/merges_timed/twilio/starter-java.csv b/results/combined/merges_timed/twilio/starter-java.csv index 5939ff4fea..fae0580d2d 100644 --- a/results/combined/merges_timed/twilio/starter-java.csv +++ b/results/combined/merges_timed/twilio/starter-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,01cc9db061b3d98083e4e49d56aaa052434a1f2a,c5eaf35629aa4f1ada2a42df3a6c0957ba65b1d0,c9dba43c85333197b7592dd083fdf6e3dfdb7294,,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,4f6d043d71d56d02ccc2f94323e736bccffdea3ed7fc33702df7b11607f727a2,Tests_passed,True,True,True,True,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,8d6c4218cbf798d14b74e0bbed5bc7dcf0d08233197b7f7489344a69f001202e,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,22c5f6daedccb07bb9befd8427a592ccd8bebb1b906e20e01f910e965a01a0f7,Merge_failed,22c5f6daedccb07bb9befd8427a592ccd8bebb1b906e20e01f910e965a01a0f7,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,cc3db33559ad68eae3b56591a6358a9ca97ac0df9389e2ee4e59f42b27cc64fb,0.03761744499206543,0.0364992618560791,0.03437495231628418,0.03635430335998535,0.03448152542114258,0.0345911979675293,0.037702322006225586,0.15799951553344727,0.05998635292053223,0.06151247024536133,0.0609738826751709,0.11231684684753418,0.43064379692077637,0.1870865821838379 +2,refs/heads/master,01cc9db061b3d98083e4e49d56aaa052434a1f2a,c5eaf35629aa4f1ada2a42df3a6c0957ba65b1d0,c9dba43c85333197b7592dd083fdf6e3dfdb7294,,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,4f6d043d71d56d02ccc2f94323e736bccffdea3ed7fc33702df7b11607f727a2,Tests_passed,True,True,True,True,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,8d6c4218cbf798d14b74e0bbed5bc7dcf0d08233197b7f7489344a69f001202e,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,22c5f6daedccb07bb9befd8427a592ccd8bebb1b906e20e01f910e965a01a0f7,Merge_failed,22c5f6daedccb07bb9befd8427a592ccd8bebb1b906e20e01f910e965a01a0f7,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,cc3db33559ad68eae3b56591a6358a9ca97ac0df9389e2ee4e59f42b27cc64fb,0.03761744499206543,0.0364992618560791,0.03437495231628418,0.03635430335998535,0.03448152542114258,0.0345911979675293,0.037702322006225586,0.15799951553344727,0.05998635292053223,0.06044173240661621,0.061315298080444336,0.11231684684753418,0.43064379692077637,0.1870865821838379 diff --git a/results/combined/merges_timed/twilio/twilio-java.csv b/results/combined/merges_timed/twilio/twilio-java.csv index b3514a4a8e..32866c9431 100644 --- a/results/combined/merges_timed/twilio/twilio-java.csv +++ b/results/combined/merges_timed/twilio/twilio-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -147,refs/heads/main,da7bfa5df647e4ebf4b074892143028abee0bdb6,b21b03e6e1ab2a1ce8bd61e84c56626b2069547a,3d0e236505f0ac0e1b7d1ff7f2da8daae17de785,,True,True,62e835ab0e19498a73df01df0cec6aa334d047471f18e9f0e3efcaaa21f64b98,Tests_passed,06491f98033557195a2bbc6e35ef5e62092762b734c343a62ccbacfea758d7bd,Tests_passed,True,True,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,0.010402202606201172,0.010457038879394531,0.011280536651611328,0.011085033416748047,0.01136016845703125,0.011229991912841797,0.011070728302001953,0.03582119941711426,0.01055598258972168,0.14635729789733887,0.14554166793823242,0.06473612785339355,0.518751859664917,0.23289012908935547 +147,refs/heads/main,da7bfa5df647e4ebf4b074892143028abee0bdb6,b21b03e6e1ab2a1ce8bd61e84c56626b2069547a,3d0e236505f0ac0e1b7d1ff7f2da8daae17de785,,True,True,62e835ab0e19498a73df01df0cec6aa334d047471f18e9f0e3efcaaa21f64b98,Tests_passed,06491f98033557195a2bbc6e35ef5e62092762b734c343a62ccbacfea758d7bd,Tests_passed,True,True,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,0.010402202606201172,0.010457038879394531,0.011280536651611328,0.011085033416748047,0.01136016845703125,0.011229991912841797,0.011070728302001953,0.03582119941711426,0.01055598258972168,0.1438295841217041,0.1434948444366455,0.06473612785339355,0.518751859664917,0.23289012908935547 diff --git a/results/combined/merges_timed/tyagihas/java_nats.csv b/results/combined/merges_timed/tyagihas/java_nats.csv index 31ea9ce033..a8efba0412 100644 --- a/results/combined/merges_timed/tyagihas/java_nats.csv +++ b/results/combined/merges_timed/tyagihas/java_nats.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/8,2d1935a3170dcf60976924026ff17aa76a431ede,65f9995df7708f4b6024bc1e9d6128203b1255cb,e4f2f8ec702eb75455c011207ee9d2dc85d5fc6b,,True,True,6ce70efb79ce9699b31aeadbd817d9332e5fa61ff930f5cc6b33a44c3cb68904,Tests_passed,c66d9976b329a83e46b297b76052df81de0509566661e4a8a52712da94d41f2a,Tests_passed,True,True,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,0.04514312744140625,0.04834270477294922,0.0399322509765625,0.04945802688598633,0.03916525840759277,0.04670238494873047,0.04463648796081543,0.16697168350219727,0.03970217704772949,0.18242549896240234,0.17449021339416504,0.11380171775817871,1.5317983627319336,0.18634915351867676 +4,refs/remotes/origin/pull/8,2d1935a3170dcf60976924026ff17aa76a431ede,65f9995df7708f4b6024bc1e9d6128203b1255cb,e4f2f8ec702eb75455c011207ee9d2dc85d5fc6b,,True,True,6ce70efb79ce9699b31aeadbd817d9332e5fa61ff930f5cc6b33a44c3cb68904,Tests_passed,c66d9976b329a83e46b297b76052df81de0509566661e4a8a52712da94d41f2a,Tests_passed,True,True,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,0.04514312744140625,0.04834270477294922,0.0399322509765625,0.04945802688598633,0.03916525840759277,0.04670238494873047,0.04463648796081543,0.16697168350219727,0.03970217704772949,0.17084717750549316,0.17118215560913086,0.11380171775817871,1.5317983627319336,0.18634915351867676 diff --git a/results/combined/merges_timed/tynamo/tapestry-security.csv b/results/combined/merges_timed/tynamo/tapestry-security.csv index d42cf7a273..5e9331e9e9 100644 --- a/results/combined/merges_timed/tynamo/tapestry-security.csv +++ b/results/combined/merges_timed/tynamo/tapestry-security.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,568cab9871a77bfa6a90c2b463facf1b01df42bc,f5562e2b7a8700bbaf146edac5b015dc88d21aa1,c4ff9efea18c287783bcde4cfcf94b91d3372ac6,,True,True,8ad7c7efae6dde5c39e3110d28ffec139463bfa76e230538e432308d40a83dce,Tests_passed,5d0c7c533bf3144dec45f5891a79ef9008fe18aff62c5aba55c96c99942f5d5d,Tests_passed,True,True,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,0.011854410171508789,0.011873245239257812,0.013995647430419922,0.014057397842407227,0.013672590255737305,0.013475894927978516,0.013625860214233398,0.03948712348937988,0.012324333190917969,0.16542768478393555,0.16593337059020996,0.0679171085357666,1.1693241596221924,0.17993998527526855 +4,refs/heads/master,568cab9871a77bfa6a90c2b463facf1b01df42bc,f5562e2b7a8700bbaf146edac5b015dc88d21aa1,c4ff9efea18c287783bcde4cfcf94b91d3372ac6,,True,True,8ad7c7efae6dde5c39e3110d28ffec139463bfa76e230538e432308d40a83dce,Tests_passed,5d0c7c533bf3144dec45f5891a79ef9008fe18aff62c5aba55c96c99942f5d5d,Tests_passed,True,True,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,0.011854410171508789,0.011873245239257812,0.013995647430419922,0.014057397842407227,0.013672590255737305,0.013475894927978516,0.013625860214233398,0.03948712348937988,0.012324333190917969,0.16248226165771484,0.16251587867736816,0.0679171085357666,1.1693241596221924,0.17993998527526855 diff --git a/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv b/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv index c2d0a8d6fb..223c1a6f66 100644 --- a/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv +++ b/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,261184e89701acd7169b001d0dc58293ec680512,3e590fef47b5eb9b167659841295e40f298e23c4,e8b07ad4428dde2308166ef5e48e0c1f98ceed44,,d78ea6fa704344eae1441581abe96566e8bfa96418123e8b7bbee7cd0b3845d1,Tests_passed,c3a6bf77979d06d0c5d5001209afdf15283038697cfaac6c97e119a6dcb50a45,Tests_passed,True,True,True,True,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,81cc1a3606d60bec7525648bee539e11188ce56108b4a6c76eca784a96a005dd,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,03117b9c7d5ae116165cee15b8f342a2cd5f1a8898740eaf78542699615fae1b,Merge_failed,03117b9c7d5ae116165cee15b8f342a2cd5f1a8898740eaf78542699615fae1b,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Merge_failed,4c7fbde67bf2cb3388ecdce1b203d7095f09a7d76b58b55bc7ef4e2e39baeb20,0.04102826118469238,0.04026341438293457,0.03988504409790039,0.03873920440673828,0.04004693031311035,0.03931927680969238,0.0372006893157959,0.22145986557006836,0.06496191024780273,0.08557868003845215,0.08476686477661133,0.17002439498901367,1.059084415435791,0.18334364891052246 +2,refs/heads/master,261184e89701acd7169b001d0dc58293ec680512,3e590fef47b5eb9b167659841295e40f298e23c4,e8b07ad4428dde2308166ef5e48e0c1f98ceed44,,d78ea6fa704344eae1441581abe96566e8bfa96418123e8b7bbee7cd0b3845d1,Tests_passed,c3a6bf77979d06d0c5d5001209afdf15283038697cfaac6c97e119a6dcb50a45,Tests_passed,True,True,True,True,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,81cc1a3606d60bec7525648bee539e11188ce56108b4a6c76eca784a96a005dd,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,03117b9c7d5ae116165cee15b8f342a2cd5f1a8898740eaf78542699615fae1b,Merge_failed,03117b9c7d5ae116165cee15b8f342a2cd5f1a8898740eaf78542699615fae1b,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Merge_failed,4c7fbde67bf2cb3388ecdce1b203d7095f09a7d76b58b55bc7ef4e2e39baeb20,0.04102826118469238,0.04026341438293457,0.03988504409790039,0.03873920440673828,0.04004693031311035,0.03931927680969238,0.0372006893157959,0.22145986557006836,0.06496191024780273,0.08437728881835938,0.08479762077331543,0.17002439498901367,1.059084415435791,0.18334364891052246 diff --git a/results/combined/merges_timed/uklimaschewski/evalex.csv b/results/combined/merges_timed/uklimaschewski/evalex.csv index ca4b5e02e3..4908622c51 100644 --- a/results/combined/merges_timed/uklimaschewski/evalex.csv +++ b/results/combined/merges_timed/uklimaschewski/evalex.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/main,c152bc8eb6d302460f56f989e91c2967cc3a0894,5d9db79516070c1cfb1395891de45d9757fe188a,b9cb3eaadf28e6de3dfd222689e25d3195667421,,True,True,b69601d494c5ebb798cea0713432b207347ef3c775ef3f89e5d941ddc6eb502f,Tests_passed,50c67c674c272dd26b4e936e2c710d3d80bdfd873f0363ca295436a3c81e4718,Tests_passed,True,True,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,0.04999065399169922,0.04826998710632324,0.04838919639587402,0.048920392990112305,0.04271340370178223,0.049001455307006836,0.03878426551818848,0.1768479347229004,0.038421630859375,0.19362950325012207,0.19425535202026367,0.11624455451965332,2.362563371658325,0.19411587715148926 +16,refs/heads/main,c152bc8eb6d302460f56f989e91c2967cc3a0894,5d9db79516070c1cfb1395891de45d9757fe188a,b9cb3eaadf28e6de3dfd222689e25d3195667421,,True,True,b69601d494c5ebb798cea0713432b207347ef3c775ef3f89e5d941ddc6eb502f,Tests_passed,50c67c674c272dd26b4e936e2c710d3d80bdfd873f0363ca295436a3c81e4718,Tests_passed,True,True,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,0.04999065399169922,0.04826998710632324,0.04838919639587402,0.048920392990112305,0.04271340370178223,0.049001455307006836,0.03878426551818848,0.1768479347229004,0.038421630859375,0.19182419776916504,0.1941227912902832,0.11624455451965332,2.362563371658325,0.19411587715148926 diff --git a/results/combined/merges_timed/umut/spring-social-salesforce.csv b/results/combined/merges_timed/umut/spring-social-salesforce.csv index ff05e0b166..926a5db322 100644 --- a/results/combined/merges_timed/umut/spring-social-salesforce.csv +++ b/results/combined/merges_timed/umut/spring-social-salesforce.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,c0ba949826659e6d82e8cd4b958530add191586a,d2f14b90370242638f71cecc14ba6c2b880fa5a7,641d0c91b8ddddfca7f1c71fef1b195a5ccbb804,,True,True,a3f13e088e4c881b71e471946d45563600eb277e27d598a38675636434920b65,Tests_passed,5001d457983015612622eaf150d0cf15dbdfaa1f516a18fe18feb7f4ef093169,Tests_passed,True,True,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,0.04053139686584473,0.045568227767944336,0.050142765045166016,0.04441070556640625,0.0413050651550293,0.03874015808105469,0.03651309013366699,0.18294525146484375,0.04542064666748047,0.15253496170043945,0.15278387069702148,0.11135029792785645,0.6087915897369385,0.22499990463256836 +7,refs/heads/master,c0ba949826659e6d82e8cd4b958530add191586a,d2f14b90370242638f71cecc14ba6c2b880fa5a7,641d0c91b8ddddfca7f1c71fef1b195a5ccbb804,,True,True,a3f13e088e4c881b71e471946d45563600eb277e27d598a38675636434920b65,Tests_passed,5001d457983015612622eaf150d0cf15dbdfaa1f516a18fe18feb7f4ef093169,Tests_passed,True,True,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,0.04053139686584473,0.045568227767944336,0.050142765045166016,0.04441070556640625,0.0413050651550293,0.03874015808105469,0.03651309013366699,0.18294525146484375,0.04542064666748047,0.15027070045471191,0.14991021156311035,0.11135029792785645,0.6087915897369385,0.22499990463256836 diff --git a/results/combined/merges_timed/unitsofmeasurement/unit-api.csv b/results/combined/merges_timed/unitsofmeasurement/unit-api.csv index c34185dcd1..d47b426f10 100644 --- a/results/combined/merges_timed/unitsofmeasurement/unit-api.csv +++ b/results/combined/merges_timed/unitsofmeasurement/unit-api.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -56,refs/heads/master,af3a3abfab663d442a692e5d1c503dab05665afe,83afd3ef45cb4af71be258e7f5863b6384b7db5a,049ade04d1087a5fe8f4357c19db95b3fe167916,,True,True,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,Tests_passed,6fce6f2b06d9bea3199a032dde14a83689ef0ca2d55f44103c5b3c819cdd5fdf,Tests_passed,True,True,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,68738da39c2368ce43648c545ca7e0867735414361f1033002864fdec44f354c,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,02a80495312b6003f1768b6f87473fcfbebd9fb3282233abb478c40fa09058c1,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,93b1ae41aeefdd220be1269c741d0994a0fd643b934e3ffa8e3d1224fd687dae,Tests_passed,93b1ae41aeefdd220be1269c741d0994a0fd643b934e3ffa8e3d1224fd687dae,Merge_failed,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,d5ac7cd88cd4ee89ff64bd00afb58eef5ae42081b32f32dae64971e02112c8f7,Merge_failed,d5ac7cd88cd4ee89ff64bd00afb58eef5ae42081b32f32dae64971e02112c8f7,0.04342174530029297,0.06737899780273438,0.03961753845214844,0.05180978775024414,0.046526193618774414,0.061394691467285156,0.05493927001953125,0.2726869583129883,0.08217096328735352,0.3216066360473633,0.32195091247558594,0.18018674850463867,0.052156925201416016,0.28333210945129395 +56,refs/heads/master,af3a3abfab663d442a692e5d1c503dab05665afe,83afd3ef45cb4af71be258e7f5863b6384b7db5a,049ade04d1087a5fe8f4357c19db95b3fe167916,,True,True,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,Tests_passed,6fce6f2b06d9bea3199a032dde14a83689ef0ca2d55f44103c5b3c819cdd5fdf,Tests_passed,True,True,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,68738da39c2368ce43648c545ca7e0867735414361f1033002864fdec44f354c,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,02a80495312b6003f1768b6f87473fcfbebd9fb3282233abb478c40fa09058c1,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,93b1ae41aeefdd220be1269c741d0994a0fd643b934e3ffa8e3d1224fd687dae,Tests_passed,93b1ae41aeefdd220be1269c741d0994a0fd643b934e3ffa8e3d1224fd687dae,Merge_failed,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,d5ac7cd88cd4ee89ff64bd00afb58eef5ae42081b32f32dae64971e02112c8f7,Merge_failed,d5ac7cd88cd4ee89ff64bd00afb58eef5ae42081b32f32dae64971e02112c8f7,0.04342174530029297,0.06737899780273438,0.03961753845214844,0.05180978775024414,0.046526193618774414,0.061394691467285156,0.05493927001953125,0.2726869583129883,0.08217096328735352,0.31741929054260254,0.31950950622558594,0.18018674850463867,0.052156925201416016,0.28333210945129395 diff --git a/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv b/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv index c96bfef412..bcb5996d69 100644 --- a/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv +++ b/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,Tests_passed,True,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,0.04952669143676758,0.05021309852600098,0.0483546257019043,0.01691126823425293,0.06855463981628418,0.029349088668823242,0.01993417739868164,0.2368924617767334,0.049143314361572266,0.36822032928466797,0.36222004890441895,0.16765117645263672,0.053243398666381836,0.23171544075012207 +9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,Tests_passed,True,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,0.04952669143676758,0.05021309852600098,0.0483546257019043,0.01691126823425293,0.06855463981628418,0.029349088668823242,0.01993417739868164,0.2368924617767334,0.049143314361572266,0.3585028648376465,0.36905503273010254,0.16765117645263672,0.053243398666381836,0.23171544075012207 diff --git a/results/combined/merges_timed/unitsofmeasurement/uom-se.csv b/results/combined/merges_timed/unitsofmeasurement/uom-se.csv index a0402fe6bf..181d6950ab 100644 --- a/results/combined/merges_timed/unitsofmeasurement/uom-se.csv +++ b/results/combined/merges_timed/unitsofmeasurement/uom-se.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,Tests_passed,True,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,0.040654897689819336,0.04229855537414551,0.035779714584350586,0.04290294647216797,0.03989887237548828,0.03497886657714844,0.05681133270263672,0.24170851707458496,0.022077560424804688,0.3560667037963867,0.35711240768432617,0.15783262252807617,0.05457353591918945,0.2198946475982666 +9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,Tests_passed,True,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,0.040654897689819336,0.04229855537414551,0.035779714584350586,0.04290294647216797,0.03989887237548828,0.03497886657714844,0.05681133270263672,0.24170851707458496,0.022077560424804688,0.35846781730651855,0.3580143451690674,0.15783262252807617,0.05457353591918945,0.2198946475982666 diff --git a/results/combined/merges_timed/univocity/univocity-parsers.csv b/results/combined/merges_timed/univocity/univocity-parsers.csv index 5bb9c754f1..2418b8fcb3 100644 --- a/results/combined/merges_timed/univocity/univocity-parsers.csv +++ b/results/combined/merges_timed/univocity/univocity-parsers.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -22,refs/heads/master,9426fbefd3b6e57649e45d79bc7d4fdf674e9377,04cf38831b7fba1fa265e84c1deac9f0274046c8,8a463847eca82abb885b4203d1ac17e5f4384d90,,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,060f8700b83b0afa92d6348c12c5fb1d0be6298dc82b019c2ceb1027cdc4bf72,Tests_passed,True,True,True,True,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,0.032270193099975586,0.0350189208984375,0.022449493408203125,0.034584999084472656,0.019934415817260742,0.015309572219848633,0.01880955696105957,0.11253190040588379,0.022279739379882812,0.20936036109924316,0.2217400074005127,0.09871745109558105,1.8368995189666748,0.27829718589782715 +22,refs/heads/master,9426fbefd3b6e57649e45d79bc7d4fdf674e9377,04cf38831b7fba1fa265e84c1deac9f0274046c8,8a463847eca82abb885b4203d1ac17e5f4384d90,,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,060f8700b83b0afa92d6348c12c5fb1d0be6298dc82b019c2ceb1027cdc4bf72,Tests_passed,True,True,True,True,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,0.032270193099975586,0.0350189208984375,0.022449493408203125,0.034584999084472656,0.019934415817260742,0.015309572219848633,0.01880955696105957,0.11253190040588379,0.022279739379882812,0.21314477920532227,0.21894550323486328,0.09871745109558105,1.8368995189666748,0.27829718589782715 diff --git a/results/combined/merges_timed/unruly/junit-rules.csv b/results/combined/merges_timed/unruly/junit-rules.csv index 1495bf0b90..af4f82c615 100644 --- a/results/combined/merges_timed/unruly/junit-rules.csv +++ b/results/combined/merges_timed/unruly/junit-rules.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,9f9e68b409b45bc46b8210c50964508e185dea8f,7b70c0ebce2dadfa3c20c95a258562889b923e2e,492670cc827654754a93d59b562cfe27fad84c57,,19aac3cb0894586e9cd50dad5781d0189f52adc3994e50d3432f48822ef6f374,Tests_passed,1c066bad00671b7bef3b5dc2ee06e82d0097162cde2f44de67d11d9f6addd734,Tests_passed,True,True,True,True,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,39f248323614e5214f5fa5244ae93802ea1b256af032cc7c208bbfed1efb9c1f,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Tests_passed,20c44cc44f712ce169c0fea65b18ecac2c2e03237a0226a32315bd1b2c9d51b8,Tests_passed,20c44cc44f712ce169c0fea65b18ecac2c2e03237a0226a32315bd1b2c9d51b8,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,fd014bd2375d4630eb6ef13e69652fda2d5c4fb131267f77a11375164da8b3ff,0.03817868232727051,0.03901481628417969,0.03864479064941406,0.03680014610290527,0.03712654113769531,0.038132667541503906,0.03747248649597168,0.2868845462799072,0.0571589469909668,0.29085683822631836,0.29094696044921875,0.22166776657104492,1.1187233924865723,0.19757986068725586 +2,refs/heads/master,9f9e68b409b45bc46b8210c50964508e185dea8f,7b70c0ebce2dadfa3c20c95a258562889b923e2e,492670cc827654754a93d59b562cfe27fad84c57,,19aac3cb0894586e9cd50dad5781d0189f52adc3994e50d3432f48822ef6f374,Tests_passed,1c066bad00671b7bef3b5dc2ee06e82d0097162cde2f44de67d11d9f6addd734,Tests_passed,True,True,True,True,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Merge_failed,39f248323614e5214f5fa5244ae93802ea1b256af032cc7c208bbfed1efb9c1f,Merge_failed,9620ed5bee2b1f1e45c29bd2dbb62ae338f4f8b109271136483f766c8a3c4855,Tests_passed,20c44cc44f712ce169c0fea65b18ecac2c2e03237a0226a32315bd1b2c9d51b8,Tests_passed,20c44cc44f712ce169c0fea65b18ecac2c2e03237a0226a32315bd1b2c9d51b8,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,fd014bd2375d4630eb6ef13e69652fda2d5c4fb131267f77a11375164da8b3ff,0.03817868232727051,0.03901481628417969,0.03864479064941406,0.03680014610290527,0.03712654113769531,0.038132667541503906,0.03747248649597168,0.2868845462799072,0.0571589469909668,0.2932255268096924,0.29224491119384766,0.22166776657104492,1.1187233924865723,0.19757986068725586 diff --git a/results/combined/merges_timed/urbanairship/datacube.csv b/results/combined/merges_timed/urbanairship/datacube.csv index 178d049a60..0865ea4490 100644 --- a/results/combined/merges_timed/urbanairship/datacube.csv +++ b/results/combined/merges_timed/urbanairship/datacube.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -46,refs/heads/master,e98794fe0b952cfbec98456698cd0e1c8226173c,c176fe3f098b025057d82bb50e327d227f3cd154,b4f7933ed957d5b8841ae731e7156a70beaa2c37,,True,True,3965a63425c8f76c65ff240d62a0697307679c0fc9ca6f389840bb9d48bcaa87,Tests_passed,298dbae6f5a26224c6fd0864e294572e10f950671ad2895d866fc426f68c39f4,Tests_passed,True,True,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,7d83bfef3f2e4d6795c05f3ac9d34bc7fb48039e6a0cab8c5019728f17540020,Tests_passed,7d83bfef3f2e4d6795c05f3ac9d34bc7fb48039e6a0cab8c5019728f17540020,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,0.11950564384460449,0.12035369873046875,0.010845184326171875,0.17383670806884766,0.010720968246459961,0.17339849472045898,0.011289119720458984,0.2553989887237549,0.009832620620727539,0.2733438014984131,0.27167534828186035,0.17539095878601074,1.0702314376831055,0.27283143997192383 +46,refs/heads/master,e98794fe0b952cfbec98456698cd0e1c8226173c,c176fe3f098b025057d82bb50e327d227f3cd154,b4f7933ed957d5b8841ae731e7156a70beaa2c37,,True,True,3965a63425c8f76c65ff240d62a0697307679c0fc9ca6f389840bb9d48bcaa87,Tests_passed,298dbae6f5a26224c6fd0864e294572e10f950671ad2895d866fc426f68c39f4,Tests_passed,True,True,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,7d83bfef3f2e4d6795c05f3ac9d34bc7fb48039e6a0cab8c5019728f17540020,Tests_passed,7d83bfef3f2e4d6795c05f3ac9d34bc7fb48039e6a0cab8c5019728f17540020,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,0.11950564384460449,0.12035369873046875,0.010845184326171875,0.17383670806884766,0.010720968246459961,0.17339849472045898,0.011289119720458984,0.2553989887237549,0.009832620620727539,0.27074670791625977,0.2691214084625244,0.17539095878601074,1.0702314376831055,0.27283143997192383 diff --git a/results/combined/merges_timed/urbanairship/java-library.csv b/results/combined/merges_timed/urbanairship/java-library.csv index e059a23e19..8aa340cccb 100644 --- a/results/combined/merges_timed/urbanairship/java-library.csv +++ b/results/combined/merges_timed/urbanairship/java-library.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -85,refs/heads/master,4be3d18ac5d8d4f21dd63731ba9cf92aeadc16e5,dd350b3bd64c7ecec5926bf19c999ea77893f5b8,9f8273317362999795cfad1aa6f5fb82d38271b0,,True,True,d8712d36339ffd9c2bb7b2006dce6bda868a989651256d2727cff7d549e9c8ad,Tests_passed,704f38aa289e58cc08ca0da8dc47c5017bab946462644f5b309ed12f5ce4345d,Tests_passed,True,True,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,929531a547dd74ae1723adb7a5c040a5711cf722a8be8fab375dc525f2a7252d,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,8780f8d23de51d5d15b68ec1dee2d74a2ba1f64c46ce36e9f05f2a306b257177,Merge_failed,8780f8d23de51d5d15b68ec1dee2d74a2ba1f64c46ce36e9f05f2a306b257177,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,656b483fc5eaf7402260cbf2042707288d319725888f2801cb391c5f0d6e5574,0.05812692642211914,0.046090126037597656,0.04871654510498047,0.05058479309082031,0.056825876235961914,0.050248146057128906,0.056765079498291016,0.21186137199401855,0.07260990142822266,0.08414483070373535,0.08345341682434082,0.14960193634033203,3.098188638687134,0.24207258224487305 +85,refs/heads/master,4be3d18ac5d8d4f21dd63731ba9cf92aeadc16e5,dd350b3bd64c7ecec5926bf19c999ea77893f5b8,9f8273317362999795cfad1aa6f5fb82d38271b0,,True,True,d8712d36339ffd9c2bb7b2006dce6bda868a989651256d2727cff7d549e9c8ad,Tests_passed,704f38aa289e58cc08ca0da8dc47c5017bab946462644f5b309ed12f5ce4345d,Tests_passed,True,True,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,929531a547dd74ae1723adb7a5c040a5711cf722a8be8fab375dc525f2a7252d,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,8780f8d23de51d5d15b68ec1dee2d74a2ba1f64c46ce36e9f05f2a306b257177,Merge_failed,8780f8d23de51d5d15b68ec1dee2d74a2ba1f64c46ce36e9f05f2a306b257177,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,656b483fc5eaf7402260cbf2042707288d319725888f2801cb391c5f0d6e5574,0.05812692642211914,0.046090126037597656,0.04871654510498047,0.05058479309082031,0.056825876235961914,0.050248146057128906,0.056765079498291016,0.21186137199401855,0.07260990142822266,0.08307266235351562,0.08420276641845703,0.14960193634033203,3.098188638687134,0.24207258224487305 diff --git a/results/combined/merges_timed/urbancode/terraform.csv b/results/combined/merges_timed/urbancode/terraform.csv index 57681377ca..a8c754ba45 100644 --- a/results/combined/merges_timed/urbancode/terraform.csv +++ b/results/combined/merges_timed/urbancode/terraform.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,23cda111d2be54f22e8222a29f71f29bb61f3188,95b28fa95c875e4c1e7c85d1e0164f5f2783cbd9,7da71a46727f3db5c199f4ffa765cc95c16997cb,,True,True,79d4a2f1c49febe7730103f9e960f015f5cf3e76dd3ca2df46144e260e5e1437,Tests_passed,b0b544f09b12a5d7cd396660e3f709ecab62e1ad918da0f9f83023e57ac9897d,Tests_passed,True,True,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,ca6d61dcd21a17f86b12a4453d5d7340847f0e59739d1f2e16ed09c017a0061f,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,ed971b6fd73c6d5f50765edb66a6e78bde72243c9b95bb76bb3bf7af1292ebbd,Merge_failed,ed971b6fd73c6d5f50765edb66a6e78bde72243c9b95bb76bb3bf7af1292ebbd,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e0eeb42530b3e98720ea65d7ab0af1cfa8c8940127638a134b774d5198e25606,0.013887405395507812,0.013849020004272461,0.015292644500732422,0.014734506607055664,0.01487421989440918,0.01495051383972168,0.014254093170166016,0.04125404357910156,0.01826786994934082,0.07313847541809082,0.07349133491516113,0.07480216026306152,0.6047706604003906,0.17134594917297363 +3,refs/heads/master,23cda111d2be54f22e8222a29f71f29bb61f3188,95b28fa95c875e4c1e7c85d1e0164f5f2783cbd9,7da71a46727f3db5c199f4ffa765cc95c16997cb,,True,True,79d4a2f1c49febe7730103f9e960f015f5cf3e76dd3ca2df46144e260e5e1437,Tests_passed,b0b544f09b12a5d7cd396660e3f709ecab62e1ad918da0f9f83023e57ac9897d,Tests_passed,True,True,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,ca6d61dcd21a17f86b12a4453d5d7340847f0e59739d1f2e16ed09c017a0061f,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,ed971b6fd73c6d5f50765edb66a6e78bde72243c9b95bb76bb3bf7af1292ebbd,Merge_failed,ed971b6fd73c6d5f50765edb66a6e78bde72243c9b95bb76bb3bf7af1292ebbd,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e0eeb42530b3e98720ea65d7ab0af1cfa8c8940127638a134b774d5198e25606,0.013887405395507812,0.013849020004272461,0.015292644500732422,0.014734506607055664,0.01487421989440918,0.01495051383972168,0.014254093170166016,0.04125404357910156,0.01826786994934082,0.07311058044433594,0.07249736785888672,0.07480216026306152,0.6047706604003906,0.17134594917297363 diff --git a/results/combined/merges_timed/urish/gwt-titanium.csv b/results/combined/merges_timed/urish/gwt-titanium.csv index 2b19d23c33..99847e425a 100644 --- a/results/combined/merges_timed/urish/gwt-titanium.csv +++ b/results/combined/merges_timed/urish/gwt-titanium.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/remotes/origin/emul,8283194660a0d362eab3f08a61e31d400d9a56a9,a22853e43bd0683d9a09f4e409ac0ed431bb99ed,18650ec3760d6293ad56fa70c3eabddcb24ccf02,,20c475afa38390c216f3a9a0f9deda4e64dfba181ea1d2a213561fbf541d7f4e,Tests_passed,070e30656769757e7cb688bc5a2d3d9fea500e09bb5aa28da515f8dcd5029901,Tests_passed,True,True,True,True,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,f3d8ba7b26749216bc3de5c4bd583f73e5d23d329aed370dfc50e5ba33ba2880,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,ee88f0d03a5aa4055903ea54c945683786364c3648bdabd9cb760f58f5316aef,Merge_failed,ee88f0d03a5aa4055903ea54c945683786364c3648bdabd9cb760f58f5316aef,Merge_failed,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Merge_failed,2bc5aed0f8f42e17b7fe92144b25bf8eafb8eb229c514481fd8b71a052d43977,0.041434526443481445,0.030248641967773438,0.05463361740112305,0.047739267349243164,0.04567098617553711,0.03812694549560547,0.049129486083984375,1.3313608169555664,0.28460073471069336,4.739159822463989,4.750526428222656,2.0178568363189697,15.254916429519653,0.331371545791626 +2,refs/remotes/origin/emul,8283194660a0d362eab3f08a61e31d400d9a56a9,a22853e43bd0683d9a09f4e409ac0ed431bb99ed,18650ec3760d6293ad56fa70c3eabddcb24ccf02,,20c475afa38390c216f3a9a0f9deda4e64dfba181ea1d2a213561fbf541d7f4e,Tests_passed,070e30656769757e7cb688bc5a2d3d9fea500e09bb5aa28da515f8dcd5029901,Tests_passed,True,True,True,True,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,f3d8ba7b26749216bc3de5c4bd583f73e5d23d329aed370dfc50e5ba33ba2880,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,ee88f0d03a5aa4055903ea54c945683786364c3648bdabd9cb760f58f5316aef,Merge_failed,ee88f0d03a5aa4055903ea54c945683786364c3648bdabd9cb760f58f5316aef,Merge_failed,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Merge_failed,2bc5aed0f8f42e17b7fe92144b25bf8eafb8eb229c514481fd8b71a052d43977,0.041434526443481445,0.030248641967773438,0.05463361740112305,0.047739267349243164,0.04567098617553711,0.03812694549560547,0.049129486083984375,1.3313608169555664,0.28460073471069336,4.693552494049072,4.697249889373779,2.0178568363189697,15.254916429519653,0.331371545791626 diff --git a/results/combined/merges_timed/uwolfer/gerrit-rest-java-client.csv b/results/combined/merges_timed/uwolfer/gerrit-rest-java-client.csv index a513d88293..86d2064235 100644 --- a/results/combined/merges_timed/uwolfer/gerrit-rest-java-client.csv +++ b/results/combined/merges_timed/uwolfer/gerrit-rest-java-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -114,refs/remotes/origin/httpclient-android,63c4c0de93ac1545662f946e7b8b821c6c85da68,db86712fee757b5b1808098856d6ac77837c2801,6b9cfe0eaef6462b8405ca2362a4b8a54b062fa4,,6abd3aac8693c66ef661bfaccfd62caf6b63bc2f347ae65add0a4058db77eda2,Tests_passed,8eb92b00d86730c2de3dd37ec19a9f8a15567df3237dd74fdd6a3e4152539178,Tests_passed,True,True,True,True,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,4f003efaf94b98bd4d4da6e1ebcd7cdb009c96892e3b9f2e82d2c253c37a9698,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,Merge_failed,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,dff161dcd17e4fb34650addf26e521ff5eb124cd505b3b3dd1d316a98165a417,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,0.0634758472442627,0.05135655403137207,0.057817935943603516,0.06045699119567871,0.06470417976379395,0.06846928596496582,0.06708574295043945,0.32297730445861816,0.1168508529663086,0.18109941482543945,0.18285489082336426,0.25173425674438477,1.2036387920379639,0.36637401580810547 +114,refs/remotes/origin/httpclient-android,63c4c0de93ac1545662f946e7b8b821c6c85da68,db86712fee757b5b1808098856d6ac77837c2801,6b9cfe0eaef6462b8405ca2362a4b8a54b062fa4,,6abd3aac8693c66ef661bfaccfd62caf6b63bc2f347ae65add0a4058db77eda2,Tests_passed,8eb92b00d86730c2de3dd37ec19a9f8a15567df3237dd74fdd6a3e4152539178,Tests_passed,True,True,True,True,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,4f003efaf94b98bd4d4da6e1ebcd7cdb009c96892e3b9f2e82d2c253c37a9698,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,Merge_failed,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,dff161dcd17e4fb34650addf26e521ff5eb124cd505b3b3dd1d316a98165a417,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,0.0634758472442627,0.05135655403137207,0.057817935943603516,0.06045699119567871,0.06470417976379395,0.06846928596496582,0.06708574295043945,0.32297730445861816,0.1168508529663086,0.18014907836914062,0.17965245246887207,0.25173425674438477,1.2036387920379639,0.36637401580810547 diff --git a/results/combined/merges_timed/valotrading/silvertip.csv b/results/combined/merges_timed/valotrading/silvertip.csv index 6cad0c01d3..ac6ab02003 100644 --- a/results/combined/merges_timed/valotrading/silvertip.csv +++ b/results/combined/merges_timed/valotrading/silvertip.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/heads/master,9d31f8111075f508c9ecfbe3680b12d13a48f927,47b363321c14cd5e46ef5d2eb91463007b8916c5,7be1073b258791c55ebb6a8d499f0b8ad76e6cc0,,True,True,80df0a65c04ce8cc250a78293d6a24c463f1564052101bcaffc8a04e27f74d05,Tests_passed,984964b6a6d87f1e8c8d38fda84d3053daadcd389a6a6376443b81db4dec6603,Tests_passed,True,True,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,0.012937068939208984,0.04482126235961914,0.042548179626464844,0.0413970947265625,0.0429685115814209,0.04750633239746094,0.034178972244262695,0.3603978157043457,0.042936086654663086,0.5822463035583496,0.580573558807373,0.27751755714416504,2.645644187927246,0.20053935050964355 +27,refs/heads/master,9d31f8111075f508c9ecfbe3680b12d13a48f927,47b363321c14cd5e46ef5d2eb91463007b8916c5,7be1073b258791c55ebb6a8d499f0b8ad76e6cc0,,True,True,80df0a65c04ce8cc250a78293d6a24c463f1564052101bcaffc8a04e27f74d05,Tests_passed,984964b6a6d87f1e8c8d38fda84d3053daadcd389a6a6376443b81db4dec6603,Tests_passed,True,True,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,0.012937068939208984,0.04482126235961914,0.042548179626464844,0.0413970947265625,0.0429685115814209,0.04750633239746094,0.034178972244262695,0.3603978157043457,0.042936086654663086,0.5754055976867676,0.5755100250244141,0.27751755714416504,2.645644187927246,0.20053935050964355 diff --git a/results/combined/merges_timed/vandurme/jerboa.csv b/results/combined/merges_timed/vandurme/jerboa.csv index c65b427437..4103d9e458 100644 --- a/results/combined/merges_timed/vandurme/jerboa.csv +++ b/results/combined/merges_timed/vandurme/jerboa.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/remotes/origin/pull/4,3ce0e6dedb14acd3be38b052f4158734778b4973,d4b49e2bfb050626774cc3f3fb654993a3fcf099,6f00c6fe70e86fcb6f6e78ee7f1f590108cecba2,,True,True,9e7b018019fc6c5fbca750e359a122d184930595e31bd19f4e6830848ab2522e,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Tests_passed,True,True,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,2ddc0b1a6a4c96d97009f9b701988102e8509d838287fc20bbc487b828967815,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Merge_failed,e2bafc6fb4f6748040ff3ea7650319d10eead5a9a229c9f8f021a55d0d749cf3,0.013466358184814453,0.013352394104003906,0.014047384262084961,0.013964176177978516,0.013547420501708984,0.013590097427368164,0.01409912109375,0.03936266899108887,0.01846146583557129,0.17078757286071777,0.17103004455566406,0.07443594932556152,0.7072696685791016,0.20868778228759766 +14,refs/remotes/origin/pull/4,3ce0e6dedb14acd3be38b052f4158734778b4973,d4b49e2bfb050626774cc3f3fb654993a3fcf099,6f00c6fe70e86fcb6f6e78ee7f1f590108cecba2,,True,True,9e7b018019fc6c5fbca750e359a122d184930595e31bd19f4e6830848ab2522e,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Tests_passed,True,True,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,2ddc0b1a6a4c96d97009f9b701988102e8509d838287fc20bbc487b828967815,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Merge_failed,e2bafc6fb4f6748040ff3ea7650319d10eead5a9a229c9f8f021a55d0d749cf3,0.013466358184814453,0.013352394104003906,0.014047384262084961,0.013964176177978516,0.013547420501708984,0.013590097427368164,0.01409912109375,0.03936266899108887,0.01846146583557129,0.1701490879058838,0.16872453689575195,0.07443594932556152,0.7072696685791016,0.20868778228759766 diff --git a/results/combined/merges_timed/vanduynslagerp/enml4j.csv b/results/combined/merges_timed/vanduynslagerp/enml4j.csv index 9954bdc2d3..e886ae85cc 100644 --- a/results/combined/merges_timed/vanduynslagerp/enml4j.csv +++ b/results/combined/merges_timed/vanduynslagerp/enml4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,61e72c5c3568a9dc49d49cc19ef79a19972ccd26,83c3de81ff9b7fb8a047be4abb0a9b3b82256cbc,0e08aa59830a000eced31b31a2d556531d15283a,,21b135e72d860adb5d727b37f264cfec4eaa2832ca87e463f67daad48912d812,Tests_passed,8cbf4b26ee339dbf2eb63874a67d64436fd103bd089d1ef397a7ba0d02448ea2,Tests_passed,True,True,True,True,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,d3c673a974574947296fa7f4b66b0bf130cfa1985b63fe062e8bcfc81761b111,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,6b2c9517935f96bdbd1d38b4b1ec7b5abf62268d63b6e6d75bfd412723721c53,Merge_failed,6b2c9517935f96bdbd1d38b4b1ec7b5abf62268d63b6e6d75bfd412723721c53,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Merge_failed,e1045b56331b7ab7f6c8b3605b3e65828778aa6eaa5cef7476decf315c15ca0a,0.01658010482788086,0.01620030403137207,0.018276214599609375,0.018630266189575195,0.009918451309204102,0.01844024658203125,0.0188751220703125,0.04689216613769531,0.021441936492919922,0.07224607467651367,0.07187819480895996,0.06923103332519531,0.5234501361846924,0.1988203525543213 +2,refs/heads/master,61e72c5c3568a9dc49d49cc19ef79a19972ccd26,83c3de81ff9b7fb8a047be4abb0a9b3b82256cbc,0e08aa59830a000eced31b31a2d556531d15283a,,21b135e72d860adb5d727b37f264cfec4eaa2832ca87e463f67daad48912d812,Tests_passed,8cbf4b26ee339dbf2eb63874a67d64436fd103bd089d1ef397a7ba0d02448ea2,Tests_passed,True,True,True,True,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,d3c673a974574947296fa7f4b66b0bf130cfa1985b63fe062e8bcfc81761b111,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,6b2c9517935f96bdbd1d38b4b1ec7b5abf62268d63b6e6d75bfd412723721c53,Merge_failed,6b2c9517935f96bdbd1d38b4b1ec7b5abf62268d63b6e6d75bfd412723721c53,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Merge_failed,e1045b56331b7ab7f6c8b3605b3e65828778aa6eaa5cef7476decf315c15ca0a,0.01658010482788086,0.01620030403137207,0.018276214599609375,0.018630266189575195,0.009918451309204102,0.01844024658203125,0.0188751220703125,0.04689216613769531,0.021441936492919922,0.0715324878692627,0.07135128974914551,0.06923103332519531,0.5234501361846924,0.1988203525543213 diff --git a/results/combined/merges_timed/vbehar/rundeck-api-java-client.csv b/results/combined/merges_timed/vbehar/rundeck-api-java-client.csv index a8e60dbeea..f757f75e74 100644 --- a/results/combined/merges_timed/vbehar/rundeck-api-java-client.csv +++ b/results/combined/merges_timed/vbehar/rundeck-api-java-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/remotes/origin/new-style,ca48a23f4bc9ba6e23057d3615272938e61eb670,564a3ce90f61dcb10c46c4553e68e6221f516248,2206d677247431280a262ccbdfc9d3f4b2e4065a,,467a2fbf1959be604c388e7cebadbad43fdc77005247cc7d2be077c506c5a757,Tests_passed,c43917a5a447a89393e014c98848fe09f50a3bd0bc22f2103a0977dd936a4872,Tests_passed,True,True,True,True,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,0.051877737045288086,0.05070304870605469,0.050154685974121094,0.05548286437988281,0.0465235710144043,0.057256221771240234,0.061745405197143555,0.2005906105041504,0.04954648017883301,0.22960209846496582,0.22881746292114258,0.11813163757324219,1.837486982345581,0.2199077606201172 +3,refs/remotes/origin/new-style,ca48a23f4bc9ba6e23057d3615272938e61eb670,564a3ce90f61dcb10c46c4553e68e6221f516248,2206d677247431280a262ccbdfc9d3f4b2e4065a,,467a2fbf1959be604c388e7cebadbad43fdc77005247cc7d2be077c506c5a757,Tests_passed,c43917a5a447a89393e014c98848fe09f50a3bd0bc22f2103a0977dd936a4872,Tests_passed,True,True,True,True,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,0.051877737045288086,0.05070304870605469,0.050154685974121094,0.05548286437988281,0.0465235710144043,0.057256221771240234,0.061745405197143555,0.2005906105041504,0.04954648017883301,0.22426486015319824,0.22498273849487305,0.11813163757324219,1.837486982345581,0.2199077606201172 diff --git a/results/combined/merges_timed/vdenotaris/spring-boot-security-saml-sample.csv b/results/combined/merges_timed/vdenotaris/spring-boot-security-saml-sample.csv index 7ba8aec4ca..85ffaeda17 100644 --- a/results/combined/merges_timed/vdenotaris/spring-boot-security-saml-sample.csv +++ b/results/combined/merges_timed/vdenotaris/spring-boot-security-saml-sample.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,88d2426c11714615322d84934cc2e1ac72fd08e7,1874da0eac0466062024733152861fd994f2d863,ec64add49e8afbc99404f1fcfe15285457553b68,,True,True,6c082e8c67aad2fff9df716176724babd11e8c014ae326571b9f2963ae2a035d,Tests_passed,eaf097aa2d90637a13cbff55442df88b305635dbfbbb27ffbe78fcf92905646e,Tests_passed,True,True,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,65e2c707537d3826be17d3d7c61bf18548d03f64f17c238e9097a16b835b07e2,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Merge_failed,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Merge_failed,d7e397e14227615b9f160e0f40388b0353de35aec20fee0ecb9839fac604c5d3,0.01454615592956543,0.03885698318481445,0.020694494247436523,0.045261383056640625,0.04478120803833008,0.04912161827087402,0.03902077674865723,0.04634284973144531,0.06212472915649414,0.17175030708312988,0.17227840423583984,0.10519623756408691,0.9757688045501709,0.20532846450805664 +5,refs/heads/master,88d2426c11714615322d84934cc2e1ac72fd08e7,1874da0eac0466062024733152861fd994f2d863,ec64add49e8afbc99404f1fcfe15285457553b68,,True,True,6c082e8c67aad2fff9df716176724babd11e8c014ae326571b9f2963ae2a035d,Tests_passed,eaf097aa2d90637a13cbff55442df88b305635dbfbbb27ffbe78fcf92905646e,Tests_passed,True,True,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,65e2c707537d3826be17d3d7c61bf18548d03f64f17c238e9097a16b835b07e2,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Merge_failed,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Merge_failed,d7e397e14227615b9f160e0f40388b0353de35aec20fee0ecb9839fac604c5d3,0.01454615592956543,0.03885698318481445,0.020694494247436523,0.045261383056640625,0.04478120803833008,0.04912161827087402,0.03902077674865723,0.04634284973144531,0.06212472915649414,0.17125821113586426,0.17199230194091797,0.10519623756408691,0.9757688045501709,0.20532846450805664 diff --git a/results/combined/merges_timed/vdurmont/emoji-java.csv b/results/combined/merges_timed/vdurmont/emoji-java.csv index f5fe4f2973..111dbc2152 100644 --- a/results/combined/merges_timed/vdurmont/emoji-java.csv +++ b/results/combined/merges_timed/vdurmont/emoji-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/remotes/origin/pull/120,d8952758be36cca3d760dc922f17b9a135edaa64,15bf60c80feff7bb26a864994f6fbd388070efa3,1f265481de513c1ee1cc744c4d9c18627014cee1,,True,True,78c6cae5752349d535258efafca720a21ae37ef2f932a31304951d24812ce1bb,Tests_passed,f72a2e1e109897ef270ea21c143791aad14d1128d73b8769deadf0117c649750,Tests_passed,True,True,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,51ebf42a2f8d9d37091a6725527b15bf7c8a78aff4b2706afc1e5806a503a638,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,ca833d6a6a8637cab6a18807b82fc6c98b50242c5260f23f6451b3b53fb2f3f4,Merge_failed,ca833d6a6a8637cab6a18807b82fc6c98b50242c5260f23f6451b3b53fb2f3f4,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Merge_failed,8858bcb81a5e757fe4738d3d64d53a9dbd8ec84ef666101aacb751ed57eea75a,0.05758333206176758,0.054793357849121094,0.0549626350402832,0.05405545234680176,0.04608583450317383,0.04279947280883789,0.03378176689147949,0.24564146995544434,0.07859492301940918,0.08221793174743652,0.08101963996887207,0.18066668510437012,0.6428718566894531,0.19476556777954102 +10,refs/remotes/origin/pull/120,d8952758be36cca3d760dc922f17b9a135edaa64,15bf60c80feff7bb26a864994f6fbd388070efa3,1f265481de513c1ee1cc744c4d9c18627014cee1,,True,True,78c6cae5752349d535258efafca720a21ae37ef2f932a31304951d24812ce1bb,Tests_passed,f72a2e1e109897ef270ea21c143791aad14d1128d73b8769deadf0117c649750,Tests_passed,True,True,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,51ebf42a2f8d9d37091a6725527b15bf7c8a78aff4b2706afc1e5806a503a638,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,ca833d6a6a8637cab6a18807b82fc6c98b50242c5260f23f6451b3b53fb2f3f4,Merge_failed,ca833d6a6a8637cab6a18807b82fc6c98b50242c5260f23f6451b3b53fb2f3f4,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Merge_failed,8858bcb81a5e757fe4738d3d64d53a9dbd8ec84ef666101aacb751ed57eea75a,0.05758333206176758,0.054793357849121094,0.0549626350402832,0.05405545234680176,0.04608583450317383,0.04279947280883789,0.03378176689147949,0.24564146995544434,0.07859492301940918,0.08157730102539062,0.08267760276794434,0.18066668510437012,0.6428718566894531,0.19476556777954102 diff --git a/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv b/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv index 55d84ca067..43f4d57f5a 100644 --- a/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv +++ b/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,59fbccd1d6d4eaef4343585610ec225ed81553e0,8d5949499c77ff1a053375bbd66811ddadc8a93f,0003de4e181872c704994faacdd48c32eda9f183,,True,True,315b55d9ba6f864b27687a6c39065a2b2127b82b49372cffe13bfe22a1f49567,Tests_passed,36a3d5e39aad10a29421fbe238c632eeaa3ee69dfe6ac9d6926f3efa2c385dc5,Tests_passed,True,True,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,0.04606914520263672,0.044884681701660156,0.044451236724853516,0.0402071475982666,0.04472708702087402,0.04655933380126953,0.04401350021362305,0.28654050827026367,0.04399824142456055,0.44864630699157715,0.4500422477722168,0.21962833404541016,2.4249777793884277,0.18673181533813477 +13,refs/heads/master,59fbccd1d6d4eaef4343585610ec225ed81553e0,8d5949499c77ff1a053375bbd66811ddadc8a93f,0003de4e181872c704994faacdd48c32eda9f183,,True,True,315b55d9ba6f864b27687a6c39065a2b2127b82b49372cffe13bfe22a1f49567,Tests_passed,36a3d5e39aad10a29421fbe238c632eeaa3ee69dfe6ac9d6926f3efa2c385dc5,Tests_passed,True,True,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,0.04606914520263672,0.044884681701660156,0.044451236724853516,0.0402071475982666,0.04472708702087402,0.04655933380126953,0.04401350021362305,0.28654050827026367,0.04399824142456055,0.44330716133117676,0.444995641708374,0.21962833404541016,2.4249777793884277,0.18673181533813477 diff --git a/results/combined/merges_timed/verhas/djcproxy.csv b/results/combined/merges_timed/verhas/djcproxy.csv index 6122178039..c360204829 100644 --- a/results/combined/merges_timed/verhas/djcproxy.csv +++ b/results/combined/merges_timed/verhas/djcproxy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,db3b9bf7957d4a0e56fda33ca5d5e9340d9625ca,9db5e5b7908a16e773116d2483bad160803e90d9,a32513a5d9a409c995562fbcfede61c982301c1c,,009f8e66c25a54003cef9139b7e8e98abc066415a86c566d47a9d44ddf037dc9,Tests_passed,60f6295160ce31bda21ceda8a75c29c9972f48f79b234c93ebb7e034b6d2b832,Tests_passed,True,True,True,True,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,0.04162335395812988,0.043466806411743164,0.04169106483459473,0.04076671600341797,0.040949344635009766,0.03909754753112793,0.04338645935058594,0.16414308547973633,0.04009652137756348,0.1556999683380127,0.15394186973571777,0.10923171043395996,0.8765342235565186,0.19445085525512695 +1,refs/heads/master,db3b9bf7957d4a0e56fda33ca5d5e9340d9625ca,9db5e5b7908a16e773116d2483bad160803e90d9,a32513a5d9a409c995562fbcfede61c982301c1c,,009f8e66c25a54003cef9139b7e8e98abc066415a86c566d47a9d44ddf037dc9,Tests_passed,60f6295160ce31bda21ceda8a75c29c9972f48f79b234c93ebb7e034b6d2b832,Tests_passed,True,True,True,True,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,0.04162335395812988,0.043466806411743164,0.04169106483459473,0.04076671600341797,0.040949344635009766,0.03909754753112793,0.04338645935058594,0.16414308547973633,0.04009652137756348,0.15376663208007812,0.15418744087219238,0.10923171043395996,0.8765342235565186,0.19445085525512695 diff --git a/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv b/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv index d75ee23e82..c9d56aff93 100644 --- a/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv +++ b/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -32,refs/heads/master,a890d82eb3698c4a20b2035eb3fd1e871bf52aa6,fbe5f5fd02487b865ec5b1b63891b56c8ddf642e,73fa448ea55736bb6281bb34d6bb5efb4e618fd3,,True,True,34047f9faf00864135bf7eccf1f5de85c653b53251c2a6b385f63f5e53f2dd55,Tests_passed,82f3effcb60635228fe2447d9a023afcc33b523a47b7bd9dd27a313efc33658b,Tests_passed,True,True,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,0.04193258285522461,0.042113542556762695,0.05091404914855957,0.04629063606262207,0.05039048194885254,0.04601478576660156,0.05202293395996094,0.15494632720947266,0.04008769989013672,0.15968656539916992,0.15904951095581055,0.11756205558776855,0.6794338226318359,0.17827296257019043 +32,refs/heads/master,a890d82eb3698c4a20b2035eb3fd1e871bf52aa6,fbe5f5fd02487b865ec5b1b63891b56c8ddf642e,73fa448ea55736bb6281bb34d6bb5efb4e618fd3,,True,True,34047f9faf00864135bf7eccf1f5de85c653b53251c2a6b385f63f5e53f2dd55,Tests_passed,82f3effcb60635228fe2447d9a023afcc33b523a47b7bd9dd27a313efc33658b,Tests_passed,True,True,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,0.04193258285522461,0.042113542556762695,0.05091404914855957,0.04629063606262207,0.05039048194885254,0.04601478576660156,0.05202293395996094,0.15494632720947266,0.04008769989013672,0.15782856941223145,0.15744829177856445,0.11756205558776855,0.6794338226318359,0.17827296257019043 diff --git a/results/combined/merges_timed/vert-x3/docgen.csv b/results/combined/merges_timed/vert-x3/docgen.csv index b596f1f193..b8eb83dea6 100644 --- a/results/combined/merges_timed/vert-x3/docgen.csv +++ b/results/combined/merges_timed/vert-x3/docgen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,Tests_passed,True,True,True,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,0.039632558822631836,0.033168792724609375,0.040204763412475586,0.04746437072753906,0.049410104751586914,0.051752328872680664,0.04147982597351074,0.22783756256103516,0.03868675231933594,0.3120310306549072,0.3106729984283447,0.18182826042175293,2.2788164615631104,0.19392132759094238 +5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,Tests_passed,True,True,True,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,0.039632558822631836,0.033168792724609375,0.040204763412475586,0.04746437072753906,0.049410104751586914,0.051752328872680664,0.04147982597351074,0.22783756256103516,0.03868675231933594,0.3147749900817871,0.3143045902252197,0.18182826042175293,2.2788164615631104,0.19392132759094238 diff --git a/results/combined/merges_timed/vert-x3/vertx-docgen.csv b/results/combined/merges_timed/vert-x3/vertx-docgen.csv index b3f2d2ed9a..c4d0c94741 100644 --- a/results/combined/merges_timed/vert-x3/vertx-docgen.csv +++ b/results/combined/merges_timed/vert-x3/vertx-docgen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,Tests_passed,True,True,True,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,0.0450742244720459,0.04598569869995117,0.04983186721801758,0.04212641716003418,0.04552650451660156,0.05417299270629883,0.0391542911529541,0.22362971305847168,0.04596972465515137,0.31329989433288574,0.3110466003417969,0.1682429313659668,2.273361921310425,0.2035670280456543 +5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,Tests_passed,True,True,True,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,0.0450742244720459,0.04598569869995117,0.04983186721801758,0.04212641716003418,0.04552650451660156,0.05417299270629883,0.0391542911529541,0.22362971305847168,0.04596972465515137,0.31178855895996094,0.3117940425872803,0.1682429313659668,2.273361921310425,0.2035670280456543 diff --git a/results/combined/merges_timed/vidstige/jadb.csv b/results/combined/merges_timed/vidstige/jadb.csv index a4ffd5c680..d32de270e3 100644 --- a/results/combined/merges_timed/vidstige/jadb.csv +++ b/results/combined/merges_timed/vidstige/jadb.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,6c84fe654222121475fb066fd217db3143fb901a,d3bd5c5ba684549f03086c46c0223f2e968af32b,3db1b31a0c4f5e74503cf43bbdcf1d1dc51b8ab5,,824287fc2c4692fa431c4bcfee647a51b871eb82fd3feaf20a2544de1ddfd0cc,Tests_passed,c473f07bf2bcff4853b65549831a6b7ee9ee89f9fa3a44eb65b9e9ce7af4d29b,Tests_passed,True,True,True,True,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,0.05410313606262207,0.03744101524353027,0.06272554397583008,0.05194854736328125,0.057993412017822266,0.06374335289001465,0.03536367416381836,0.2735469341278076,0.05196428298950195,0.3021972179412842,0.30173420906066895,0.16875863075256348,0.04860877990722656,0.21105122566223145 +15,refs/heads/master,6c84fe654222121475fb066fd217db3143fb901a,d3bd5c5ba684549f03086c46c0223f2e968af32b,3db1b31a0c4f5e74503cf43bbdcf1d1dc51b8ab5,,824287fc2c4692fa431c4bcfee647a51b871eb82fd3feaf20a2544de1ddfd0cc,Tests_passed,c473f07bf2bcff4853b65549831a6b7ee9ee89f9fa3a44eb65b9e9ce7af4d29b,Tests_passed,True,True,True,True,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,0.05410313606262207,0.03744101524353027,0.06272554397583008,0.05194854736328125,0.057993412017822266,0.06374335289001465,0.03536367416381836,0.2735469341278076,0.05196428298950195,0.2981686592102051,0.2985258102416992,0.16875863075256348,0.04860877990722656,0.21105122566223145 diff --git a/results/combined/merges_timed/vietj/modsh.csv b/results/combined/merges_timed/vietj/modsh.csv index aaab79870b..32c00c9299 100644 --- a/results/combined/merges_timed/vietj/modsh.csv +++ b/results/combined/merges_timed/vietj/modsh.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,a687b0bb0261d502f8bb8c7ab2d1daaf394359b3,2be2e828f9f02487973c32a989c4b25126c0b36a,bbfec44c17e0b010e4ca16b5b3f6f1dfc33e006a,,5e123d71ea36a8d1f214010c65d0ad3c8223c6551a602799d31110a3de91abbf,Tests_passed,d08fd6ce32c9ae5c48d1a382bb1429b8c74985f63143809d16acb411af076d23,Tests_passed,True,True,True,True,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,0.019367218017578125,0.019985675811767578,0.0249330997467041,0.024822473526000977,0.02405095100402832,0.024149656295776367,0.026101350784301758,0.05353283882141113,0.018903732299804688,0.1609973907470703,0.16102218627929688,0.07450437545776367,0.6215226650238037,0.20987439155578613 +5,refs/heads/master,a687b0bb0261d502f8bb8c7ab2d1daaf394359b3,2be2e828f9f02487973c32a989c4b25126c0b36a,bbfec44c17e0b010e4ca16b5b3f6f1dfc33e006a,,5e123d71ea36a8d1f214010c65d0ad3c8223c6551a602799d31110a3de91abbf,Tests_passed,d08fd6ce32c9ae5c48d1a382bb1429b8c74985f63143809d16acb411af076d23,Tests_passed,True,True,True,True,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,0.019367218017578125,0.019985675811767578,0.0249330997467041,0.024822473526000977,0.02405095100402832,0.024149656295776367,0.026101350784301758,0.05353283882141113,0.018903732299804688,0.16222643852233887,0.16327333450317383,0.07450437545776367,0.6215226650238037,0.20987439155578613 diff --git a/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv b/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv index 1492917ec8..cc16231fd7 100644 --- a/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv +++ b/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,38cdbeced79a3299317c1d44123c7e5c60e42a83,c7587b8c301132433d6f7663c31018f9ec44b503,981bd79f59b939b49f342d12b1c00c3805b632a1,,True,True,23aeb5e858e4a85fd9e1f890f98b3be9facc42b5791ec1ba9deec9ef8cf35726,Tests_passed,584006bd6823b8480436f8d3d00324548d86af8d085cbf82f2cb42c5fe2547a0,Tests_passed,True,True,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,0.008170604705810547,0.008087873458862305,0.008167028427124023,0.008293628692626953,0.008495092391967773,0.008467435836791992,0.008624792098999023,0.05395793914794922,0.008023500442504883,0.4385228157043457,0.43406057357788086,0.16842985153198242,1.6654281616210938,0.1710798740386963 +1,refs/heads/master,38cdbeced79a3299317c1d44123c7e5c60e42a83,c7587b8c301132433d6f7663c31018f9ec44b503,981bd79f59b939b49f342d12b1c00c3805b632a1,,True,True,23aeb5e858e4a85fd9e1f890f98b3be9facc42b5791ec1ba9deec9ef8cf35726,Tests_passed,584006bd6823b8480436f8d3d00324548d86af8d085cbf82f2cb42c5fe2547a0,Tests_passed,True,True,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,0.008170604705810547,0.008087873458862305,0.008167028427124023,0.008293628692626953,0.008495092391967773,0.008467435836791992,0.008624792098999023,0.05395793914794922,0.008023500442504883,0.41709113121032715,0.41643261909484863,0.16842985153198242,1.6654281616210938,0.1710798740386963 diff --git a/results/combined/merges_timed/vipshop/saturn.csv b/results/combined/merges_timed/vipshop/saturn.csv index 426f486f3c..3c68043f59 100644 --- a/results/combined/merges_timed/vipshop/saturn.csv +++ b/results/combined/merges_timed/vipshop/saturn.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/develop,95c49b595d04b1ee4ab283c7343848df7e9addc9,5cbade739601574332622484945fc1a5f9848465,bf6445a36b7ff34335f42a961d1dd7a97c159711,,True,True,5890adc72858c4b82dcdd741de4233355be12185dea28cecaf9a1452792a60ec,Tests_passed,ca62ca1379b3f2fb4720a42bb109753516ec2c001b060668ffed375ac026a120,Tests_passed,True,True,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,0.07315945625305176,0.06657218933105469,0.07694482803344727,0.06779861450195312,0.05364632606506348,0.048409223556518555,0.07526493072509766,0.19193506240844727,0.04662895202636719,0.17983102798461914,0.1768970489501953,0.11674165725708008,1.4250233173370361,0.3868832588195801 +17,refs/heads/develop,95c49b595d04b1ee4ab283c7343848df7e9addc9,5cbade739601574332622484945fc1a5f9848465,bf6445a36b7ff34335f42a961d1dd7a97c159711,,True,True,5890adc72858c4b82dcdd741de4233355be12185dea28cecaf9a1452792a60ec,Tests_passed,ca62ca1379b3f2fb4720a42bb109753516ec2c001b060668ffed375ac026a120,Tests_passed,True,True,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,0.07315945625305176,0.06657218933105469,0.07694482803344727,0.06779861450195312,0.05364632606506348,0.048409223556518555,0.07526493072509766,0.19193506240844727,0.04662895202636719,0.17653131484985352,0.17246222496032715,0.11674165725708008,1.4250233173370361,0.3868832588195801 diff --git a/results/combined/merges_timed/vkostyukov/la4j.csv b/results/combined/merges_timed/vkostyukov/la4j.csv index 689a947941..9224d25633 100644 --- a/results/combined/merges_timed/vkostyukov/la4j.csv +++ b/results/combined/merges_timed/vkostyukov/la4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,965ce08afb0f6e85991ea707d72c97a293b2010f,1229fcf1bec83b678ae8655fac893dc14b8e70ec,4d368a0cb4622b1b99298a3f1d9890e44bd38dcb,,df72f84ce360854d6c2155728c1ec9accc5c607c68778a1bb3ecb5ef5e03d718,Tests_passed,8da09d8986e8ff637f6d693f78be703219038d12af19ba43e5214def4f1c4952,Tests_passed,True,True,True,True,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,0.0442049503326416,0.015281915664672852,0.04570651054382324,0.049993276596069336,0.0417637825012207,0.03204703330993652,0.03085494041442871,0.1573173999786377,0.03977513313293457,0.17957687377929688,0.16859078407287598,0.08864712715148926,1.355109691619873,0.21988129615783691 +2,refs/heads/master,965ce08afb0f6e85991ea707d72c97a293b2010f,1229fcf1bec83b678ae8655fac893dc14b8e70ec,4d368a0cb4622b1b99298a3f1d9890e44bd38dcb,,df72f84ce360854d6c2155728c1ec9accc5c607c68778a1bb3ecb5ef5e03d718,Tests_passed,8da09d8986e8ff637f6d693f78be703219038d12af19ba43e5214def4f1c4952,Tests_passed,True,True,True,True,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,0.0442049503326416,0.015281915664672852,0.04570651054382324,0.049993276596069336,0.0417637825012207,0.03204703330993652,0.03085494041442871,0.1573173999786377,0.03977513313293457,0.1676945686340332,0.16891765594482422,0.08864712715148926,1.355109691619873,0.21988129615783691 diff --git a/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv b/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv index 6c4ce2f1d5..00139dc109 100644 --- a/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv +++ b/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -43,refs/heads/main,8b71d6eb351b292eb27460955cba6aca5939e3cc,c08bbaae91b9e4b7903b5435796a4956d2ebcff5,8de1ab469c2adbab43ed2c0dd503f2f9918902f0,,3a8f423667ee282dd740b01c9105d4369e7bde5522dcbac0fb0d84407679eec4,Tests_passed,16e909dbaa8a76a5445b0bbb1a5a9708bfb65de4d4a14ff795b310d1806ee8e0,Tests_passed,True,True,True,True,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,a828549caa15a1ffd7e4814baa2ba6c56d39dc3c9aa0f45a4031fc1292bcff11,Tests_passed,a828549caa15a1ffd7e4814baa2ba6c56d39dc3c9aa0f45a4031fc1292bcff11,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,0.0482325553894043,0.04230761528015137,0.055707454681396484,0.01957988739013672,0.05772089958190918,0.054230690002441406,0.0130767822265625,0.15918469429016113,0.032396554946899414,0.19367337226867676,0.1793668270111084,0.11407947540283203,0.04871940612792969,0.2436964511871338 +43,refs/heads/main,8b71d6eb351b292eb27460955cba6aca5939e3cc,c08bbaae91b9e4b7903b5435796a4956d2ebcff5,8de1ab469c2adbab43ed2c0dd503f2f9918902f0,,3a8f423667ee282dd740b01c9105d4369e7bde5522dcbac0fb0d84407679eec4,Tests_passed,16e909dbaa8a76a5445b0bbb1a5a9708bfb65de4d4a14ff795b310d1806ee8e0,Tests_passed,True,True,True,True,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,a828549caa15a1ffd7e4814baa2ba6c56d39dc3c9aa0f45a4031fc1292bcff11,Tests_passed,a828549caa15a1ffd7e4814baa2ba6c56d39dc3c9aa0f45a4031fc1292bcff11,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,0.0482325553894043,0.04230761528015137,0.055707454681396484,0.01957988739013672,0.05772089958190918,0.054230690002441406,0.0130767822265625,0.15918469429016113,0.032396554946899414,0.19456195831298828,0.1931767463684082,0.11407947540283203,0.04871940612792969,0.2436964511871338 diff --git a/results/combined/merges_timed/vt-middleware/cryptacular.csv b/results/combined/merges_timed/vt-middleware/cryptacular.csv index 9fd01bb507..9ab1412dca 100644 --- a/results/combined/merges_timed/vt-middleware/cryptacular.csv +++ b/results/combined/merges_timed/vt-middleware/cryptacular.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/remotes/origin/ISSUE-31+32,beff926fbd2c8940c25922973b25fa29f403375a,236c0a813a83cd2f0db82e3c713c484d0fbef9be,c105eb282f4fd13f11db26207b342e3580646abe,,True,True,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,Tests_passed,678b4849bac8b899bf8a78b88b9296570468df858afe01c8db38dd66ff5718bd,Tests_passed,True,True,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,0.03758358955383301,0.0458371639251709,0.052614450454711914,0.05257248878479004,0.05359387397766113,0.04848599433898926,0.02736949920654297,0.23956990242004395,0.04166746139526367,0.31230592727661133,0.317197322845459,0.14471793174743652,0.03748965263366699,0.3336930274963379 +21,refs/remotes/origin/ISSUE-31+32,beff926fbd2c8940c25922973b25fa29f403375a,236c0a813a83cd2f0db82e3c713c484d0fbef9be,c105eb282f4fd13f11db26207b342e3580646abe,,True,True,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,Tests_passed,678b4849bac8b899bf8a78b88b9296570468df858afe01c8db38dd66ff5718bd,Tests_passed,True,True,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,0.03758358955383301,0.0458371639251709,0.052614450454711914,0.05257248878479004,0.05359387397766113,0.04848599433898926,0.02736949920654297,0.23956990242004395,0.04166746139526367,0.3113572597503662,0.31331658363342285,0.14471793174743652,0.03748965263366699,0.3336930274963379 diff --git a/results/combined/merges_timed/w3c/ldp-testsuite.csv b/results/combined/merges_timed/w3c/ldp-testsuite.csv index 330730d9ad..4e0bcef213 100644 --- a/results/combined/merges_timed/w3c/ldp-testsuite.csv +++ b/results/combined/merges_timed/w3c/ldp-testsuite.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -49,refs/heads/master,a7515238ae8139c8d6b2ee7e042183294ca3869f,9f71b5fb60327dce3a35fe585722902387facd37,0a602bc5ba8375d431ae17943031105efccee35e,,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,ab96cdde264ef12327ac54084e02cae4da522374bb1825c9ba952a511ea20d7a,Tests_passed,True,True,True,True,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,0.0219271183013916,0.052010536193847656,0.03831362724304199,0.040357112884521484,0.03878211975097656,0.03774404525756836,0.03984546661376953,0.10372352600097656,0.048674583435058594,0.010628461837768555,0.010753393173217773,0.03979754447937012,0.03509664535522461,0.1986525058746338 +49,refs/heads/master,a7515238ae8139c8d6b2ee7e042183294ca3869f,9f71b5fb60327dce3a35fe585722902387facd37,0a602bc5ba8375d431ae17943031105efccee35e,,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,ab96cdde264ef12327ac54084e02cae4da522374bb1825c9ba952a511ea20d7a,Tests_passed,True,True,True,True,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,0.0219271183013916,0.052010536193847656,0.03831362724304199,0.040357112884521484,0.03878211975097656,0.03774404525756836,0.03984546661376953,0.10372352600097656,0.048674583435058594,0.010280370712280273,0.01023411750793457,0.03979754447937012,0.03509664535522461,0.1986525058746338 diff --git a/results/combined/merges_timed/wakaleo/game-of-life.csv b/results/combined/merges_timed/wakaleo/game-of-life.csv index 4da9e4e241..0934e1e9a8 100644 --- a/results/combined/merges_timed/wakaleo/game-of-life.csv +++ b/results/combined/merges_timed/wakaleo/game-of-life.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,True,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,Tests_passed,True,True,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,0.058582305908203125,0.050942182540893555,0.05884504318237305,0.06287312507629395,0.04906654357910156,0.06416487693786621,0.0633401870727539,0.18934416770935059,0.05824422836303711,0.15970420837402344,0.159987211227417,0.13115763664245605,0.6045498847961426,0.3135826587677002 +146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,True,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,Tests_passed,True,True,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,0.058582305908203125,0.050942182540893555,0.05884504318237305,0.06287312507629395,0.04906654357910156,0.06416487693786621,0.0633401870727539,0.18934416770935059,0.05824422836303711,0.15863704681396484,0.1580982208251953,0.13115763664245605,0.6045498847961426,0.3135826587677002 diff --git a/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv b/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv index 2b628ed013..724cb14c35 100644 --- a/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv +++ b/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,b0dfdbd7a4774d227a6a5948d44506345ad9d08b,e6325978b1bee1bad13457c5f480228a3de74a85,b5df2be37584aea6c16fea9ec19f522dc98cd596,,a2bcccd161130e7c75904de293529ef636d286e6086001004175f0107eaff51a,Tests_passed,719c603b43304f7de93e239e6485ffbba739ec166552f47083ee3a38f9871a3b,Tests_passed,True,True,True,True,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,0.04195451736450195,0.0433809757232666,0.03959465026855469,0.04398083686828613,0.04206418991088867,0.04266238212585449,0.0403292179107666,0.1580033302307129,0.04028201103210449,0.14458942413330078,0.1443943977355957,0.11315464973449707,0.4482738971710205,0.19341039657592773 +4,refs/heads/master,b0dfdbd7a4774d227a6a5948d44506345ad9d08b,e6325978b1bee1bad13457c5f480228a3de74a85,b5df2be37584aea6c16fea9ec19f522dc98cd596,,a2bcccd161130e7c75904de293529ef636d286e6086001004175f0107eaff51a,Tests_passed,719c603b43304f7de93e239e6485ffbba739ec166552f47083ee3a38f9871a3b,Tests_passed,True,True,True,True,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,0.04195451736450195,0.0433809757232666,0.03959465026855469,0.04398083686828613,0.04206418991088867,0.04266238212585449,0.0403292179107666,0.1580033302307129,0.04028201103210449,0.14210939407348633,0.14260292053222656,0.11315464973449707,0.4482738971710205,0.19341039657592773 diff --git a/results/combined/merges_timed/wasdev/ci.ant.csv b/results/combined/merges_timed/wasdev/ci.ant.csv index 87dc1c37bd..036a439d8e 100644 --- a/results/combined/merges_timed/wasdev/ci.ant.csv +++ b/results/combined/merges_timed/wasdev/ci.ant.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -74,refs/remotes/origin/pull/37,efb665d50069552d430474f751de1200b18c1ffd,f3495fe4c5c4787e38713e4a970b45f344363cb1,79a92e604d15aa4001563419b192ee44a1aa9bd4,,True,True,f0ae1ad6024d95e54631d8187f67961f3c6dc551c84d1cecc6623c0ae917b667,Tests_passed,b1783fc936ea374af8edce8d3f105bc8606aa4baa496c948a4161ccbf2f89fe0,Tests_passed,True,True,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,0.011378288269042969,0.011291980743408203,0.012219905853271484,0.012177467346191406,0.012295722961425781,0.012592554092407227,0.012549638748168945,0.05019116401672363,0.01146078109741211,0.15760421752929688,0.1591634750366211,0.1192014217376709,0.908545732498169,0.18237733840942383 +74,refs/remotes/origin/pull/37,efb665d50069552d430474f751de1200b18c1ffd,f3495fe4c5c4787e38713e4a970b45f344363cb1,79a92e604d15aa4001563419b192ee44a1aa9bd4,,True,True,f0ae1ad6024d95e54631d8187f67961f3c6dc551c84d1cecc6623c0ae917b667,Tests_passed,b1783fc936ea374af8edce8d3f105bc8606aa4baa496c948a4161ccbf2f89fe0,Tests_passed,True,True,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,0.011378288269042969,0.011291980743408203,0.012219905853271484,0.012177467346191406,0.012295722961425781,0.012592554092407227,0.012549638748168945,0.05019116401672363,0.01146078109741211,0.15580296516418457,0.15559649467468262,0.1192014217376709,0.908545732498169,0.18237733840942383 diff --git a/results/combined/merges_timed/wasdev/ci.maven.csv b/results/combined/merges_timed/wasdev/ci.maven.csv index 831778f95d..c61e596fcf 100644 --- a/results/combined/merges_timed/wasdev/ci.maven.csv +++ b/results/combined/merges_timed/wasdev/ci.maven.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -437,refs/heads/main,cb3e380ef1b5cba7e829084eaadeaa9fc222a5da,664f0befcf20efb7ee4a6e4ded74b0f77214daf6,58ec62cd460ef1d38c4c19da9d01a959fceacba8,,True,True,74d1926cedf2d68e55aea663a30540ad7a5a22e2daff12df4dcf8c92e1ccdebb,Tests_passed,42303a1c583040817bbb647e23d37e87da5f7e0246ed3f91af5499e2c0be91c2,Tests_passed,True,True,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,0.05859780311584473,0.052454233169555664,0.06406116485595703,0.05817079544067383,0.058736562728881836,0.047368764877319336,0.03728127479553223,0.18810319900512695,0.05606961250305176,0.18252062797546387,0.18655037879943848,0.12727832794189453,1.590374231338501,0.24671411514282227 +437,refs/heads/main,cb3e380ef1b5cba7e829084eaadeaa9fc222a5da,664f0befcf20efb7ee4a6e4ded74b0f77214daf6,58ec62cd460ef1d38c4c19da9d01a959fceacba8,,True,True,74d1926cedf2d68e55aea663a30540ad7a5a22e2daff12df4dcf8c92e1ccdebb,Tests_passed,42303a1c583040817bbb647e23d37e87da5f7e0246ed3f91af5499e2c0be91c2,Tests_passed,True,True,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,0.05859780311584473,0.052454233169555664,0.06406116485595703,0.05817079544067383,0.058736562728881836,0.047368764877319336,0.03728127479553223,0.18810319900512695,0.05606961250305176,0.18313312530517578,0.1815793514251709,0.12727832794189453,1.590374231338501,0.24671411514282227 diff --git a/results/combined/merges_timed/webbit/webbit.csv b/results/combined/merges_timed/webbit/webbit.csv index 1a37938bbd..48be5bf5fb 100644 --- a/results/combined/merges_timed/webbit/webbit.csv +++ b/results/combined/merges_timed/webbit/webbit.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -69,refs/heads/master,9d2ee1bdfa18f1df22260361a5005f52a5a6934a,474607b64bce97663f3ef42fb8298a4d2973c5fc,f5b8e55ad46b1e8a8f7f303f6deec1f629af98bc,,True,True,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,f4368f73732f333c3a9039a5c8a2499cd3042f744cb0d9d602487e9e32b9f840,Tests_passed,True,True,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,0.04013800621032715,0.009405136108398438,0.03176283836364746,0.03832888603210449,0.030933856964111328,0.03676414489746094,0.03541302680969238,0.10479474067687988,0.03949141502380371,0.03179740905761719,0.031701087951660156,0.04031085968017578,0.04983162879943848,0.23702144622802734 +69,refs/heads/master,9d2ee1bdfa18f1df22260361a5005f52a5a6934a,474607b64bce97663f3ef42fb8298a4d2973c5fc,f5b8e55ad46b1e8a8f7f303f6deec1f629af98bc,,True,True,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,f4368f73732f333c3a9039a5c8a2499cd3042f744cb0d9d602487e9e32b9f840,Tests_passed,True,True,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,0.04013800621032715,0.009405136108398438,0.03176283836364746,0.03832888603210449,0.030933856964111328,0.03676414489746094,0.03541302680969238,0.10479474067687988,0.03949141502380371,0.031569719314575195,0.03168654441833496,0.04031085968017578,0.04983162879943848,0.23702144622802734 diff --git a/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv b/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv index 439f6e2be4..3c2d9549d3 100644 --- a/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv +++ b/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,ac66071a804ee6c7946eabc804948c54cfca6bff,682b3f0dca03e0bc60c929bef9a3d0d29278f34a,905966ed4556fa95ca1df8566c0315bbe8e4120c,,ae6436802ce4f311a9102e90cc4296e3a1032213d0cca7251435b24196257806,Tests_passed,1cc4cc7d62b08ada071354d1e4663b68b83d5ce2a48b9b70e479c124113fe24b,Tests_passed,True,True,True,True,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,0.04529261589050293,0.046320199966430664,0.05116868019104004,0.04583263397216797,0.04642295837402344,0.037297964096069336,0.047931671142578125,0.1682109832763672,0.04835104942321777,0.15229535102844238,0.15521574020385742,0.12474727630615234,0.6643869876861572,0.21304893493652344 +3,refs/heads/master,ac66071a804ee6c7946eabc804948c54cfca6bff,682b3f0dca03e0bc60c929bef9a3d0d29278f34a,905966ed4556fa95ca1df8566c0315bbe8e4120c,,ae6436802ce4f311a9102e90cc4296e3a1032213d0cca7251435b24196257806,Tests_passed,1cc4cc7d62b08ada071354d1e4663b68b83d5ce2a48b9b70e479c124113fe24b,Tests_passed,True,True,True,True,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,0.04529261589050293,0.046320199966430664,0.05116868019104004,0.04583263397216797,0.04642295837402344,0.037297964096069336,0.047931671142578125,0.1682109832763672,0.04835104942321777,0.1516406536102295,0.15163874626159668,0.12474727630615234,0.6643869876861572,0.21304893493652344 diff --git a/results/combined/merges_timed/webjars/webjars-locator.csv b/results/combined/merges_timed/webjars/webjars-locator.csv index 85d12ff075..516d1145bd 100644 --- a/results/combined/merges_timed/webjars/webjars-locator.csv +++ b/results/combined/merges_timed/webjars/webjars-locator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -105,refs/heads/main,15dd8b3a1ab2c18d94d61298070d2cffc27ffe5b,be05d7649c5e2d84cf40e61c04eafceaa9af2939,4d6d1579624536495b3ff568f139e4a524b61659,,True,True,e842e670ce94390971e192f9f2f5b22e0b47bce88018a7d831f4e5d33968e418,Tests_passed,12fd811e54cb21e34645fdf29fd240cf2861297a084da0732765b5d3ee3f77f8,Tests_passed,True,True,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,46d2bf5e79e70a5a11c0f511f21e789d0e3de42ef3d82959865fe2cbaa5604c6,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,42dbc798cc3cd41e80f7b6244d2b73659da8192e81a437516df9ea7c157ce4aa,Merge_failed,42dbc798cc3cd41e80f7b6244d2b73659da8192e81a437516df9ea7c157ce4aa,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Merge_failed,a3067398271b2d25882055f5985c9344a91ab21dd9021232bd75dab26a453c1b,0.031907081604003906,0.046518564224243164,0.03914976119995117,0.04486799240112305,0.038720130920410156,0.038645267486572266,0.03802347183227539,0.22913098335266113,0.06114387512207031,0.23180365562438965,0.22746849060058594,0.17231273651123047,1.2847251892089844,0.20909762382507324 +105,refs/heads/main,15dd8b3a1ab2c18d94d61298070d2cffc27ffe5b,be05d7649c5e2d84cf40e61c04eafceaa9af2939,4d6d1579624536495b3ff568f139e4a524b61659,,True,True,e842e670ce94390971e192f9f2f5b22e0b47bce88018a7d831f4e5d33968e418,Tests_passed,12fd811e54cb21e34645fdf29fd240cf2861297a084da0732765b5d3ee3f77f8,Tests_passed,True,True,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,46d2bf5e79e70a5a11c0f511f21e789d0e3de42ef3d82959865fe2cbaa5604c6,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,42dbc798cc3cd41e80f7b6244d2b73659da8192e81a437516df9ea7c157ce4aa,Merge_failed,42dbc798cc3cd41e80f7b6244d2b73659da8192e81a437516df9ea7c157ce4aa,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Merge_failed,a3067398271b2d25882055f5985c9344a91ab21dd9021232bd75dab26a453c1b,0.031907081604003906,0.046518564224243164,0.03914976119995117,0.04486799240112305,0.038720130920410156,0.038645267486572266,0.03802347183227539,0.22913098335266113,0.06114387512207031,0.22657299041748047,0.2254774570465088,0.17231273651123047,1.2847251892089844,0.20909762382507324 diff --git a/results/combined/merges_timed/whizzosoftware/wzwave.csv b/results/combined/merges_timed/whizzosoftware/wzwave.csv index fcb9d74ec1..d862bf54b8 100644 --- a/results/combined/merges_timed/whizzosoftware/wzwave.csv +++ b/results/combined/merges_timed/whizzosoftware/wzwave.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/remotes/origin/issue-24,957ba2027da2ce9a5bf458ec36101136224e2711,f9a9c84695ac50bb8a33092b3cd49ad05dc3a31d,fa8e6835b13278aef2bfd1b0e521c1d0cf096061,,True,True,12d1cdeb5b6905d5e398a04d5362d6197fcd1c92494d4a4f493908da87f23de3,Tests_passed,c9c8250933a872e65495d71fc0cb00be4314f1a496f9738831d7d1a6e037160e,Tests_passed,True,True,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,d077ad401a64c84b6d4a5335b74e9cdd652b57f813fb415a2594520bab21bc45,Merge_failed,d077ad401a64c84b6d4a5335b74e9cdd652b57f813fb415a2594520bab21bc45,Merge_failed,d077ad401a64c84b6d4a5335b74e9cdd652b57f813fb415a2594520bab21bc45,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,47555060507939eb4a3400b359b238c218e7c28dccb094b529a93e306928478a,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,61962c3b7af73a93395a3e4380522f5e9ddd7dd4b481205d51fd884de5aa0f9e,Merge_failed,61962c3b7af73a93395a3e4380522f5e9ddd7dd4b481205d51fd884de5aa0f9e,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,449c1c093127c59e89c225b54eec21af13f6198a683df6eb1afcad6ecb070884,0.03492140769958496,0.046927690505981445,0.04199361801147461,0.04085993766784668,0.039571523666381836,0.042749881744384766,0.04192304611206055,0.21908855438232422,0.0816950798034668,0.12788820266723633,0.13576006889343262,0.16547894477844238,1.8683269023895264,0.2004528045654297 +26,refs/remotes/origin/issue-24,957ba2027da2ce9a5bf458ec36101136224e2711,f9a9c84695ac50bb8a33092b3cd49ad05dc3a31d,fa8e6835b13278aef2bfd1b0e521c1d0cf096061,,True,True,12d1cdeb5b6905d5e398a04d5362d6197fcd1c92494d4a4f493908da87f23de3,Tests_passed,c9c8250933a872e65495d71fc0cb00be4314f1a496f9738831d7d1a6e037160e,Tests_passed,True,True,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,d077ad401a64c84b6d4a5335b74e9cdd652b57f813fb415a2594520bab21bc45,Merge_failed,d077ad401a64c84b6d4a5335b74e9cdd652b57f813fb415a2594520bab21bc45,Merge_failed,d077ad401a64c84b6d4a5335b74e9cdd652b57f813fb415a2594520bab21bc45,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,47555060507939eb4a3400b359b238c218e7c28dccb094b529a93e306928478a,Merge_failed,11f5ae0f4172890481fa22a3d4058e3bbb2e1650e6cc217bb186859a5a0ff2c6,Merge_failed,61962c3b7af73a93395a3e4380522f5e9ddd7dd4b481205d51fd884de5aa0f9e,Merge_failed,61962c3b7af73a93395a3e4380522f5e9ddd7dd4b481205d51fd884de5aa0f9e,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,449c1c093127c59e89c225b54eec21af13f6198a683df6eb1afcad6ecb070884,0.03492140769958496,0.046927690505981445,0.04199361801147461,0.04085993766784668,0.039571523666381836,0.042749881744384766,0.04192304611206055,0.21908855438232422,0.0816950798034668,0.12758708000183105,0.12884879112243652,0.16547894477844238,1.8683269023895264,0.2004528045654297 diff --git a/results/combined/merges_timed/wikimedia/search-highlighter.csv b/results/combined/merges_timed/wikimedia/search-highlighter.csv index 2400eaf4ee..562b96827e 100644 --- a/results/combined/merges_timed/wikimedia/search-highlighter.csv +++ b/results/combined/merges_timed/wikimedia/search-highlighter.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,b871bfa5025d79dff5ab9324144558ac61319b47,96cf93e041a289e531e7b2fa54a603926442e700,4ca041a8710fe41d6e6bbba1eb22998c7d9b2537,,True,True,208ed4a9c1f937c1374a6206501fc7100cef30f602e4c7fa45af0e528294228b,Tests_passed,999e708a253838913fca82306cd404567920cb874aef1d685b0e028a269e61fb,Tests_passed,True,True,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,0.01609182357788086,0.01607346534729004,0.019089221954345703,0.019120216369628906,0.019291400909423828,0.01913905143737793,0.018915176391601562,0.061125755310058594,0.015551567077636719,0.32575559616088867,0.3213808536529541,0.12629008293151855,2.3730711936950684,0.1872541904449463 +6,refs/heads/master,b871bfa5025d79dff5ab9324144558ac61319b47,96cf93e041a289e531e7b2fa54a603926442e700,4ca041a8710fe41d6e6bbba1eb22998c7d9b2537,,True,True,208ed4a9c1f937c1374a6206501fc7100cef30f602e4c7fa45af0e528294228b,Tests_passed,999e708a253838913fca82306cd404567920cb874aef1d685b0e028a269e61fb,Tests_passed,True,True,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,0.01609182357788086,0.01607346534729004,0.019089221954345703,0.019120216369628906,0.019291400909423828,0.01913905143737793,0.018915176391601562,0.061125755310058594,0.015551567077636719,0.31861162185668945,0.32022547721862793,0.12629008293151855,2.3730711936950684,0.1872541904449463 diff --git a/results/combined/merges_timed/wildfirechat/server.csv b/results/combined/merges_timed/wildfirechat/server.csv index 8abe0175f4..071c91a145 100644 --- a/results/combined/merges_timed/wildfirechat/server.csv +++ b/results/combined/merges_timed/wildfirechat/server.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/wildfirechat,b4b736c0c4bb6cd344dd9a659364030aa7dc17fa,c4e8c5811c189be2d0c1eabaf6022aefd49e58bd,804b2fc610bb048c05097cf714f4577d64c83bf2,,c68c12abe918e65aead45ea1c7291c88fd1d757d0ea1bdc726e22faeb04b0b36,Tests_passed,a3cd98d9492cab858ab0bf8d310c4f05dea84e175fbe12c0c348622ac2cec037,Tests_passed,True,True,True,True,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_passed,1e47bacdbc503c75372453e519e46fee6fd3b60c19d6c9433a782b46daf66f7c,Tests_passed,1e47bacdbc503c75372453e519e46fee6fd3b60c19d6c9433a782b46daf66f7c,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,0.04774594306945801,0.05331110954284668,0.05517220497131348,0.042325496673583984,0.05661821365356445,0.0507044792175293,0.05615973472595215,0.13201403617858887,0.04528498649597168,0.2254490852355957,0.2295365333557129,0.11960005760192871,0.04873180389404297,0.24543046951293945 +14,refs/heads/wildfirechat,b4b736c0c4bb6cd344dd9a659364030aa7dc17fa,c4e8c5811c189be2d0c1eabaf6022aefd49e58bd,804b2fc610bb048c05097cf714f4577d64c83bf2,,c68c12abe918e65aead45ea1c7291c88fd1d757d0ea1bdc726e22faeb04b0b36,Tests_passed,a3cd98d9492cab858ab0bf8d310c4f05dea84e175fbe12c0c348622ac2cec037,Tests_passed,True,True,True,True,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_passed,1e47bacdbc503c75372453e519e46fee6fd3b60c19d6c9433a782b46daf66f7c,Tests_passed,1e47bacdbc503c75372453e519e46fee6fd3b60c19d6c9433a782b46daf66f7c,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,0.04774594306945801,0.05331110954284668,0.05517220497131348,0.042325496673583984,0.05661821365356445,0.0507044792175293,0.05615973472595215,0.13201403617858887,0.04528498649597168,0.21743059158325195,0.2136220932006836,0.11960005760192871,0.04873180389404297,0.24543046951293945 diff --git a/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv b/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv index a1d559acb6..d55fe79a11 100644 --- a/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv +++ b/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -24,refs/heads/master,15cf92691e506ecc0f08820c7745c4e922d9a6ea,328a4172c6252066abe263160dbb7d7ac3850e82,bd0d4a8a73f6b72cc8262ac7796c50fe1b7057cf,,True,True,ba67dbe65fabc8c0679f77914bb9bb0ba75efc0dd2c4990ad8a2c2fdc8bf4cc4,Tests_passed,e2b1bc8f2a07af67292efcc1945be51206063ed19b81f8da4b1d9c6e203d3a13,Tests_passed,True,True,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,0.007798433303833008,0.008360862731933594,0.008168935775756836,0.008222818374633789,0.008031845092773438,0.008181095123291016,0.008092880249023438,0.03044915199279785,0.008076190948486328,0.15925216674804688,0.15880060195922852,0.0618433952331543,0.6983485221862793,0.1561141014099121 +24,refs/heads/master,15cf92691e506ecc0f08820c7745c4e922d9a6ea,328a4172c6252066abe263160dbb7d7ac3850e82,bd0d4a8a73f6b72cc8262ac7796c50fe1b7057cf,,True,True,ba67dbe65fabc8c0679f77914bb9bb0ba75efc0dd2c4990ad8a2c2fdc8bf4cc4,Tests_passed,e2b1bc8f2a07af67292efcc1945be51206063ed19b81f8da4b1d9c6e203d3a13,Tests_passed,True,True,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,0.007798433303833008,0.008360862731933594,0.008168935775756836,0.008222818374633789,0.008031845092773438,0.008181095123291016,0.008092880249023438,0.03044915199279785,0.008076190948486328,0.15883135795593262,0.15929555892944336,0.0618433952331543,0.6983485221862793,0.1561141014099121 diff --git a/results/combined/merges_timed/winder/universal-g-code-sender.csv b/results/combined/merges_timed/winder/universal-g-code-sender.csv index 2fea4ed057..56c5a8e340 100644 --- a/results/combined/merges_timed/winder/universal-g-code-sender.csv +++ b/results/combined/merges_timed/winder/universal-g-code-sender.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -448,refs/remotes/origin/pull/2282,b35723447a7acc01274ecf342d6e6c23a506b25f,5672e02762786c40cc2ac2a794d296ddcb8636bc,e1764efb4d2d997bc9939fa72a3fb06561c40403,,True,True,c5745a129fddb0f2c287731913a096e4cc800b5e89c05bc1f2c289b37a9f9b3a,Tests_passed,04e3d8ac8e2ddade4ced7ae3b62dd3807b807e89448a3c4bf50d4c1616eb3158,Tests_passed,True,True,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,424a2e168a5aab07751e787f86d2f83db566539c5bec7f7b71b1896f3a55f8a3,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,5a2eabce285fc3f7ea6d2200f3dc763fd97e34518b3163152810f44968bd4a9c,Merge_failed,5a2eabce285fc3f7ea6d2200f3dc763fd97e34518b3163152810f44968bd4a9c,Merge_failed,94461f0347283d6dc6eb646439a59cc73251ce3c6e09fa8b32297259a14b26f3,Merge_failed,09f41f5f9c7e47b2a42e2f3b87aa4d7dae5fb8e84293a97b2d4d36e9adac750d,Merge_failed,225fa6edfd8ca706e91f11fe280ca001eae0f288c69cf77090f0e04870455be2,0.017594575881958008,0.017143964767456055,0.019128084182739258,0.019368410110473633,0.019375324249267578,0.01952219009399414,0.01936650276184082,0.13346433639526367,0.10008955001831055,0.0723412036895752,0.07265758514404297,0.10713791847229004,1.796215534210205,0.5779833793640137 +448,refs/remotes/origin/pull/2282,b35723447a7acc01274ecf342d6e6c23a506b25f,5672e02762786c40cc2ac2a794d296ddcb8636bc,e1764efb4d2d997bc9939fa72a3fb06561c40403,,True,True,c5745a129fddb0f2c287731913a096e4cc800b5e89c05bc1f2c289b37a9f9b3a,Tests_passed,04e3d8ac8e2ddade4ced7ae3b62dd3807b807e89448a3c4bf50d4c1616eb3158,Tests_passed,True,True,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,424a2e168a5aab07751e787f86d2f83db566539c5bec7f7b71b1896f3a55f8a3,Merge_failed,d6a16c3cd152bdebde59b839a433b80835c29df4fa01b1794a01b6390a734eaa,Merge_failed,5a2eabce285fc3f7ea6d2200f3dc763fd97e34518b3163152810f44968bd4a9c,Merge_failed,5a2eabce285fc3f7ea6d2200f3dc763fd97e34518b3163152810f44968bd4a9c,Merge_failed,94461f0347283d6dc6eb646439a59cc73251ce3c6e09fa8b32297259a14b26f3,Merge_failed,09f41f5f9c7e47b2a42e2f3b87aa4d7dae5fb8e84293a97b2d4d36e9adac750d,Merge_failed,225fa6edfd8ca706e91f11fe280ca001eae0f288c69cf77090f0e04870455be2,0.017594575881958008,0.017143964767456055,0.019128084182739258,0.019368410110473633,0.019375324249267578,0.01952219009399414,0.01936650276184082,0.13346433639526367,0.10008955001831055,0.07292556762695312,0.07261466979980469,0.10713791847229004,1.796215534210205,0.5779833793640137 diff --git a/results/combined/merges_timed/wizzercn/nutzwk.csv b/results/combined/merges_timed/wizzercn/nutzwk.csv index a488b5e008..78c1e7be65 100644 --- a/results/combined/merges_timed/wizzercn/nutzwk.csv +++ b/results/combined/merges_timed/wizzercn/nutzwk.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/v5.x-mini,b1b9adb2fd7d22f5e8146fce67dcaa2edf80e0fb,12c3b8678ed5b2ddb4d9deb8e280bcaa63ff8f62,d2d39ce76bd825d806a093bb8e3d020d17a840b4,,True,True,c0680e940eeaac43d62727eb2016dc35b49b8dda6a1092ee1d77c9e55e6a8d57,Tests_passed,9c40d78a349d5157b3929e4f7230d086c9b63bb044cf586cf062d1128397d2e3,Tests_passed,True,True,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,0.05518007278442383,0.05664253234863281,0.07776689529418945,0.04841732978820801,0.0557863712310791,0.07007169723510742,0.06670022010803223,0.21561098098754883,0.05218338966369629,0.15816497802734375,0.15806078910827637,0.12298583984375,0.5718934535980225,0.4128408432006836 +6,refs/heads/v5.x-mini,b1b9adb2fd7d22f5e8146fce67dcaa2edf80e0fb,12c3b8678ed5b2ddb4d9deb8e280bcaa63ff8f62,d2d39ce76bd825d806a093bb8e3d020d17a840b4,,True,True,c0680e940eeaac43d62727eb2016dc35b49b8dda6a1092ee1d77c9e55e6a8d57,Tests_passed,9c40d78a349d5157b3929e4f7230d086c9b63bb044cf586cf062d1128397d2e3,Tests_passed,True,True,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,0.05518007278442383,0.05664253234863281,0.07776689529418945,0.04841732978820801,0.0557863712310791,0.07007169723510742,0.06670022010803223,0.21561098098754883,0.05218338966369629,0.1554276943206787,0.15343689918518066,0.12298583984375,0.5718934535980225,0.4128408432006836 diff --git a/results/combined/merges_timed/wkennedy/swagger4spring-web.csv b/results/combined/merges_timed/wkennedy/swagger4spring-web.csv index d2b631315b..1e6b4683ea 100644 --- a/results/combined/merges_timed/wkennedy/swagger4spring-web.csv +++ b/results/combined/merges_timed/wkennedy/swagger4spring-web.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,7dd2733c22ee77c38df42d845c0d43f669528b3d,e47cd3336c793529d944af45d39864995b0a0d9b,705b69c4994795fd6223048f8b7ae501a4f039cd,,fdaff6f963d2206d94beb989be08e8f0e7132f5b8e9e99018e504f3dd09687fa,Tests_passed,3a81822f6b8512b92fd844968ace77ea03934aa29c191ea3fb9a582507e022e3,Tests_passed,True,True,True,True,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,0.00908041000366211,0.009594202041625977,0.008964776992797852,0.009395837783813477,0.009104490280151367,0.009166240692138672,0.009153127670288086,0.032154083251953125,0.008768320083618164,0.15138578414916992,0.15027189254760742,0.06394362449645996,0.7360045909881592,0.15546607971191406 +7,refs/heads/master,7dd2733c22ee77c38df42d845c0d43f669528b3d,e47cd3336c793529d944af45d39864995b0a0d9b,705b69c4994795fd6223048f8b7ae501a4f039cd,,fdaff6f963d2206d94beb989be08e8f0e7132f5b8e9e99018e504f3dd09687fa,Tests_passed,3a81822f6b8512b92fd844968ace77ea03934aa29c191ea3fb9a582507e022e3,Tests_passed,True,True,True,True,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,0.00908041000366211,0.009594202041625977,0.008964776992797852,0.009395837783813477,0.009104490280151367,0.009166240692138672,0.009153127670288086,0.032154083251953125,0.008768320083618164,0.14711713790893555,0.14802026748657227,0.06394362449645996,0.7360045909881592,0.15546607971191406 diff --git a/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv b/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv index f6ccadbdcc..7703e4541d 100644 --- a/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv +++ b/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/remotes/origin/pull/5,4251b394791f3e0fd46204502b6a6dccc43dc08d,2132dc226541c0ac0317a6a607688408074498a0,7dec3d9fe4cc308bb0654b315347877cafc10ee3,,40d3b11daa126236987ec8f60d93fc346ad89db239d3fc1505c62b84e685155a,Tests_passed,21cbf9e028e10988382431d337e3c54abe6f7d8774edde878b126ecc8b1c0a15,Tests_passed,True,True,True,True,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,81a8f18016ab66dbdbbf6556ac9c94f7694e19eeedb5b13f2210e9cd4d56a7ea,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,2b489caabc4ee067730656cfaa752455b4fc4454c0a5bc1d247fc4f7ce5c4a82,Merge_failed,2b489caabc4ee067730656cfaa752455b4fc4454c0a5bc1d247fc4f7ce5c4a82,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,83dba2724114e619895d6a4bcf126fd12f6a0ac5088bb989e2a7f669ca0455c7,0.008591175079345703,0.009990453720092773,0.008712530136108398,0.008523702621459961,0.008918523788452148,0.009684085845947266,0.010998249053955078,0.04060077667236328,0.018007278442382812,0.08338761329650879,0.08438324928283691,0.08302164077758789,1.4124438762664795,0.1675262451171875 +10,refs/remotes/origin/pull/5,4251b394791f3e0fd46204502b6a6dccc43dc08d,2132dc226541c0ac0317a6a607688408074498a0,7dec3d9fe4cc308bb0654b315347877cafc10ee3,,40d3b11daa126236987ec8f60d93fc346ad89db239d3fc1505c62b84e685155a,Tests_passed,21cbf9e028e10988382431d337e3c54abe6f7d8774edde878b126ecc8b1c0a15,Tests_passed,True,True,True,True,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,81a8f18016ab66dbdbbf6556ac9c94f7694e19eeedb5b13f2210e9cd4d56a7ea,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,2b489caabc4ee067730656cfaa752455b4fc4454c0a5bc1d247fc4f7ce5c4a82,Merge_failed,2b489caabc4ee067730656cfaa752455b4fc4454c0a5bc1d247fc4f7ce5c4a82,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,83dba2724114e619895d6a4bcf126fd12f6a0ac5088bb989e2a7f669ca0455c7,0.008591175079345703,0.009990453720092773,0.008712530136108398,0.008523702621459961,0.008918523788452148,0.009684085845947266,0.010998249053955078,0.04060077667236328,0.018007278442382812,0.08158588409423828,0.08163595199584961,0.08302164077758789,1.4124438762664795,0.1675262451171875 diff --git a/results/combined/merges_timed/wnbittle/dyn4j.csv b/results/combined/merges_timed/wnbittle/dyn4j.csv index 58586ad98c..0b578bcf37 100644 --- a/results/combined/merges_timed/wnbittle/dyn4j.csv +++ b/results/combined/merges_timed/wnbittle/dyn4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,b6c114ea1ff974840b5daa3092732877134ecda2,63f89ed0cd89ddf7076f252e57a585909f931326,0a67375f798efe71e1ec4c5e20348a35962ab0d5,,True,True,55cedd7301612cbd29284787291e7eb4978585d765b75e4c301cfb6a69771b3b,Tests_passed,45e9ddf50076845b8a4c5548a2078ace4239c3a51b4e25a3ec3921994e512552,Tests_passed,True,True,Merge_failed,4500ed42f6c3a426b1ab454c01d07aa2a7e51909b186ed4974368887ea25e14c,Merge_failed,9b8becf2b0a7de746cd37a10fee6a291132dcba06c4ba880d237472addead1ae,Merge_failed,0bbb084c59349e32718ffd429bec720ca83765a3c347ef40cc08b5a53070ab74,Merge_failed,d39bd49aaa839e265308bf8e12f2b2ddbce7ffe0a06ba01ee877e233c3d6c836,Merge_failed,a30f3155ba1788e84dd5ea1a420bf4eefd90a10512b842301171600a7a75e4d3,Merge_failed,a30f3155ba1788e84dd5ea1a420bf4eefd90a10512b842301171600a7a75e4d3,Merge_failed,0bbb084c59349e32718ffd429bec720ca83765a3c347ef40cc08b5a53070ab74,Merge_failed,2fdb272a605290ac072bc6e009df878ae7e58cad4baf6f1a80ff60cd75e39280,Merge_failed,4500ed42f6c3a426b1ab454c01d07aa2a7e51909b186ed4974368887ea25e14c,Merge_failed,ef62944f9224beaa030a4d904b8e04dcc0df397bc66ee25d3de7d6f368bc9197,Merge_failed,ef62944f9224beaa030a4d904b8e04dcc0df397bc66ee25d3de7d6f368bc9197,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,20c66693c31cd2a87805f310e9147b66449be149f1f7083bc5d62241ce65fc5c,Merge_failed,805ebfb3cd846b7986a754e06394b6875856b8e0b0a6a58ffccf46ee78955bc7,0.06372952461242676,0.0687704086303711,0.06677627563476562,0.06870627403259277,0.08351397514343262,0.07204246520996094,0.07474231719970703,2.592613458633423,0.27698755264282227,4.01225733757019,4.029745817184448,2.2393059730529785,32.43512988090515,0.6233901977539062 +5,refs/heads/master,b6c114ea1ff974840b5daa3092732877134ecda2,63f89ed0cd89ddf7076f252e57a585909f931326,0a67375f798efe71e1ec4c5e20348a35962ab0d5,,True,True,55cedd7301612cbd29284787291e7eb4978585d765b75e4c301cfb6a69771b3b,Tests_passed,45e9ddf50076845b8a4c5548a2078ace4239c3a51b4e25a3ec3921994e512552,Tests_passed,True,True,Merge_failed,4500ed42f6c3a426b1ab454c01d07aa2a7e51909b186ed4974368887ea25e14c,Merge_failed,9b8becf2b0a7de746cd37a10fee6a291132dcba06c4ba880d237472addead1ae,Merge_failed,0bbb084c59349e32718ffd429bec720ca83765a3c347ef40cc08b5a53070ab74,Merge_failed,d39bd49aaa839e265308bf8e12f2b2ddbce7ffe0a06ba01ee877e233c3d6c836,Merge_failed,a30f3155ba1788e84dd5ea1a420bf4eefd90a10512b842301171600a7a75e4d3,Merge_failed,a30f3155ba1788e84dd5ea1a420bf4eefd90a10512b842301171600a7a75e4d3,Merge_failed,0bbb084c59349e32718ffd429bec720ca83765a3c347ef40cc08b5a53070ab74,Merge_failed,2fdb272a605290ac072bc6e009df878ae7e58cad4baf6f1a80ff60cd75e39280,Merge_failed,4500ed42f6c3a426b1ab454c01d07aa2a7e51909b186ed4974368887ea25e14c,Merge_failed,ef62944f9224beaa030a4d904b8e04dcc0df397bc66ee25d3de7d6f368bc9197,Merge_failed,ef62944f9224beaa030a4d904b8e04dcc0df397bc66ee25d3de7d6f368bc9197,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,20c66693c31cd2a87805f310e9147b66449be149f1f7083bc5d62241ce65fc5c,Merge_failed,805ebfb3cd846b7986a754e06394b6875856b8e0b0a6a58ffccf46ee78955bc7,0.06372952461242676,0.0687704086303711,0.06677627563476562,0.06870627403259277,0.08351397514343262,0.07204246520996094,0.07474231719970703,2.592613458633423,0.27698755264282227,4.026129961013794,4.0209150314331055,2.2393059730529785,32.43512988090515,0.6233901977539062 diff --git a/results/combined/merges_timed/wocommunity/wonder.csv b/results/combined/merges_timed/wocommunity/wonder.csv index ad0795cb5e..d9b1455806 100644 --- a/results/combined/merges_timed/wocommunity/wonder.csv +++ b/results/combined/merges_timed/wocommunity/wonder.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,6829a78f8f8a42271eacb3c382d62a60c37c6c81,0cd2aa5aab7ab4a12b830da1a5d0e34136e3eb20,fbf8deff2330de216f21ec24cf390f2e5e189c00,,True,True,9e6ffa91ec04b31ad61bdcad765ec90de37bdd721bff2f35b83bb326fb87c0e5,Tests_passed,bc61d500a00a1717e7768d0c3cc864c2e9f4eec267c53e112ab2bd04c288381c,Tests_passed,True,True,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,0.08449554443359375,0.057265520095825195,0.106231689453125,0.1076669692993164,0.09912562370300293,0.0887749195098877,0.1087484359741211,0.17799019813537598,0.08615946769714355,0.23960399627685547,0.2415177822113037,0.1332697868347168,2.442981243133545,0.9958117008209229 +20,refs/heads/master,6829a78f8f8a42271eacb3c382d62a60c37c6c81,0cd2aa5aab7ab4a12b830da1a5d0e34136e3eb20,fbf8deff2330de216f21ec24cf390f2e5e189c00,,True,True,9e6ffa91ec04b31ad61bdcad765ec90de37bdd721bff2f35b83bb326fb87c0e5,Tests_passed,bc61d500a00a1717e7768d0c3cc864c2e9f4eec267c53e112ab2bd04c288381c,Tests_passed,True,True,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,0.08449554443359375,0.057265520095825195,0.106231689453125,0.1076669692993164,0.09912562370300293,0.0887749195098877,0.1087484359741211,0.17799019813537598,0.08615946769714355,0.23778057098388672,0.23831582069396973,0.1332697868347168,2.442981243133545,0.9958117008209229 diff --git a/results/combined/merges_timed/woder/torchbot.csv b/results/combined/merges_timed/woder/torchbot.csv index 90b733c9e1..3b0fe137ba 100644 --- a/results/combined/merges_timed/woder/torchbot.csv +++ b/results/combined/merges_timed/woder/torchbot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,975c6e38b77419ee259a8f006ef9d342280c90b4,f9b31353053bc3293bf227153a4dbf156c842d9a,edad798eae80caa51a1413172f0101ce03ec2967,,cff7260d3f4f22d068d2e081599c67ec136280e625053ef0ad8cc6bbd380254a,Tests_passed,fe9c192a65a8c9a8388aaac49041e5d08a4b74fc352668c73f3bd40501c46f97,Tests_passed,True,True,True,True,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,8e801544deec94f7faa3c907a1cb327e22175d3683d9d25392318013a8449fcf,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,23c6259106cb12acf7ac1108cb1ce193979cb7935d74520c413e84aac33dac0a,Merge_failed,23c6259106cb12acf7ac1108cb1ce193979cb7935d74520c413e84aac33dac0a,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,83acba2d5c8a89db82433d43a9617106ee045737c500892ff81d9b991fd1fa4f,Merge_failed,83acba2d5c8a89db82433d43a9617106ee045737c500892ff81d9b991fd1fa4f,0.029256820678710938,0.026271343231201172,0.061632633209228516,0.04420733451843262,0.04181480407714844,0.04488801956176758,0.01919245719909668,0.17643308639526367,0.07230353355407715,0.08625507354736328,0.08525609970092773,0.1066596508026123,0.03395223617553711,0.18835663795471191 +3,refs/heads/master,975c6e38b77419ee259a8f006ef9d342280c90b4,f9b31353053bc3293bf227153a4dbf156c842d9a,edad798eae80caa51a1413172f0101ce03ec2967,,cff7260d3f4f22d068d2e081599c67ec136280e625053ef0ad8cc6bbd380254a,Tests_passed,fe9c192a65a8c9a8388aaac49041e5d08a4b74fc352668c73f3bd40501c46f97,Tests_passed,True,True,True,True,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,8e801544deec94f7faa3c907a1cb327e22175d3683d9d25392318013a8449fcf,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,23c6259106cb12acf7ac1108cb1ce193979cb7935d74520c413e84aac33dac0a,Merge_failed,23c6259106cb12acf7ac1108cb1ce193979cb7935d74520c413e84aac33dac0a,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,83acba2d5c8a89db82433d43a9617106ee045737c500892ff81d9b991fd1fa4f,Merge_failed,83acba2d5c8a89db82433d43a9617106ee045737c500892ff81d9b991fd1fa4f,0.029256820678710938,0.026271343231201172,0.061632633209228516,0.04420733451843262,0.04181480407714844,0.04488801956176758,0.01919245719909668,0.17643308639526367,0.07230353355407715,0.0850229263305664,0.0852813720703125,0.1066596508026123,0.03395223617553711,0.18835663795471191 diff --git a/results/combined/merges_timed/wokier/teh.csv b/results/combined/merges_timed/wokier/teh.csv index 4002fbc020..c26b4daa2a 100644 --- a/results/combined/merges_timed/wokier/teh.csv +++ b/results/combined/merges_timed/wokier/teh.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,4291bbd98f8d30d9c9df931de88a54163764af15,8f90b419fa41ac2c4d00f280faaa163fb2316269,5d71673e219de860eef417580d6f93dbe7219ef0,,True,True,0ed4fbb524c7a334573205ea7b3066f81cc588f11619052bca4aa1579120091e,Tests_passed,31995b7b6d111cd611f080a7993277384279037be6c34b011d1e4f6e24199f7b,Tests_passed,True,True,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,0.044860124588012695,0.04207134246826172,0.009540319442749023,0.04321908950805664,0.025434494018554688,0.03693413734436035,0.04274296760559082,0.16337895393371582,0.04356193542480469,0.15877223014831543,0.15008258819580078,0.11221647262573242,0.5293869972229004,0.17474818229675293 +1,refs/heads/master,4291bbd98f8d30d9c9df931de88a54163764af15,8f90b419fa41ac2c4d00f280faaa163fb2316269,5d71673e219de860eef417580d6f93dbe7219ef0,,True,True,0ed4fbb524c7a334573205ea7b3066f81cc588f11619052bca4aa1579120091e,Tests_passed,31995b7b6d111cd611f080a7993277384279037be6c34b011d1e4f6e24199f7b,Tests_passed,True,True,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,0.044860124588012695,0.04207134246826172,0.009540319442749023,0.04321908950805664,0.025434494018554688,0.03693413734436035,0.04274296760559082,0.16337895393371582,0.04356193542480469,0.1435260772705078,0.1505117416381836,0.11221647262573242,0.5293869972229004,0.17474818229675293 diff --git a/results/combined/merges_timed/wordnik/swagger-codegen.csv b/results/combined/merges_timed/wordnik/swagger-codegen.csv index 8530acbfcf..f13aa79eb0 100644 --- a/results/combined/merges_timed/wordnik/swagger-codegen.csv +++ b/results/combined/merges_timed/wordnik/swagger-codegen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4005,refs/remotes/origin/pull/2059,71c496e2102ef301d1febb77fd6986e5cb70e0b6,9e50dfe4db8c08b714b26286d7ffb1afd7533fdb,248be5e75aac40c8b412b222bbb546021e1c2ab3,,c86093eedc0a66d040746fabeb3eaba3a86faa959707e5fb744596748b101d32,Tests_passed,0014cd8c033f647ca436b045e6b9d49538cc89489ab3f5046cf5453951aeb976,Tests_passed,True,True,True,True,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,c6b96e1329785ad6c4429713aa11c6c8abeae05ce1ab4fc0ccd627a5214792e8,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,c6b96e1329785ad6c4429713aa11c6c8abeae05ce1ab4fc0ccd627a5214792e8,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,644dd871c3bfc8ac29aa97f65bb240e4ab4c95b1d72f386647a9c0df87e30108,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,443e523d4ee3b65ded7d88df8c8e40604202fa8cee373b2fc5a7787237f61bf2,Merge_failed,443e523d4ee3b65ded7d88df8c8e40604202fa8cee373b2fc5a7787237f61bf2,Merge_failed,5e3063dc6983c06353ea4d83ef8b52d72378a213325d49d2c78dc424f55c9d02,Merge_failed,09518d85fd78fc02201c498acb28574b34eb691c72de2f176e669cb6af401263,Merge_failed,c86b1c44344f4414ad81d9f6fde1afffd5909361a1084fa3b483630670eb36e2,0.06907415390014648,0.06562185287475586,0.0764780044555664,0.06424069404602051,0.07636642456054688,0.06364774703979492,0.07616043090820312,1.171959638595581,0.24034667015075684,0.6141023635864258,0.6167988777160645,0.8724992275238037,4.947203874588013,0.6041433811187744 +4005,refs/remotes/origin/pull/2059,71c496e2102ef301d1febb77fd6986e5cb70e0b6,9e50dfe4db8c08b714b26286d7ffb1afd7533fdb,248be5e75aac40c8b412b222bbb546021e1c2ab3,,c86093eedc0a66d040746fabeb3eaba3a86faa959707e5fb744596748b101d32,Tests_passed,0014cd8c033f647ca436b045e6b9d49538cc89489ab3f5046cf5453951aeb976,Tests_passed,True,True,True,True,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,c6b96e1329785ad6c4429713aa11c6c8abeae05ce1ab4fc0ccd627a5214792e8,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,c6b96e1329785ad6c4429713aa11c6c8abeae05ce1ab4fc0ccd627a5214792e8,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,644dd871c3bfc8ac29aa97f65bb240e4ab4c95b1d72f386647a9c0df87e30108,Merge_failed,69874cfbdf1cd0f13a028cb79bedc41baf9cd0265ea6e8951661aa69f5f3a13f,Merge_failed,443e523d4ee3b65ded7d88df8c8e40604202fa8cee373b2fc5a7787237f61bf2,Merge_failed,443e523d4ee3b65ded7d88df8c8e40604202fa8cee373b2fc5a7787237f61bf2,Merge_failed,5e3063dc6983c06353ea4d83ef8b52d72378a213325d49d2c78dc424f55c9d02,Merge_failed,09518d85fd78fc02201c498acb28574b34eb691c72de2f176e669cb6af401263,Merge_failed,c86b1c44344f4414ad81d9f6fde1afffd5909361a1084fa3b483630670eb36e2,0.06907415390014648,0.06562185287475586,0.0764780044555664,0.06424069404602051,0.07636642456054688,0.06364774703979492,0.07616043090820312,1.171959638595581,0.24034667015075684,0.6265792846679688,0.6209061145782471,0.8724992275238037,4.947203874588013,0.6041433811187744 diff --git a/results/combined/merges_timed/wsky/top-push.csv b/results/combined/merges_timed/wsky/top-push.csv index 4d0dfeac85..7ac9a19bff 100644 --- a/results/combined/merges_timed/wsky/top-push.csv +++ b/results/combined/merges_timed/wsky/top-push.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,9867decdcc897cc8538400054ffa3c2fde517cc0,37da8398d50cf30b90d81a0245f989d85fe1a534,f0fad16e227c00a986cebb5919b2ef9cd2b5e114,,fac2c1b6ea7d391b3bc039ddf354e6dbbe37fbed34d89c34c5a610821cf897e2,Tests_passed,f6109671b473744080bca0224a8175e4d4063cb85dbabea311a709d1e04fbb5a,Tests_passed,True,True,True,True,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,97327f0437154f64909b44ad5ceffa8bff0a1c4af95cf36461975589354b15f7,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,2dec0925ff9c41c798b1a78a7cab40946a730eb0a6065a1918d5809c27e2ac48,Merge_failed,2dec0925ff9c41c798b1a78a7cab40946a730eb0a6065a1918d5809c27e2ac48,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Merge_failed,1f78487a2cef8a945b85c702c0a24e3512523e3daaf6ee1faa9f16d6bdab5e53,0.011473655700683594,0.01157999038696289,0.012828588485717773,0.012625694274902344,0.012850761413574219,0.012777328491210938,0.012888908386230469,0.05435991287231445,0.019487619400024414,0.20228004455566406,0.20411133766174316,0.12476992607116699,1.0732040405273438,0.17221617698669434 +2,refs/heads/master,9867decdcc897cc8538400054ffa3c2fde517cc0,37da8398d50cf30b90d81a0245f989d85fe1a534,f0fad16e227c00a986cebb5919b2ef9cd2b5e114,,fac2c1b6ea7d391b3bc039ddf354e6dbbe37fbed34d89c34c5a610821cf897e2,Tests_passed,f6109671b473744080bca0224a8175e4d4063cb85dbabea311a709d1e04fbb5a,Tests_passed,True,True,True,True,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,97327f0437154f64909b44ad5ceffa8bff0a1c4af95cf36461975589354b15f7,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,2dec0925ff9c41c798b1a78a7cab40946a730eb0a6065a1918d5809c27e2ac48,Merge_failed,2dec0925ff9c41c798b1a78a7cab40946a730eb0a6065a1918d5809c27e2ac48,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Merge_failed,1f78487a2cef8a945b85c702c0a24e3512523e3daaf6ee1faa9f16d6bdab5e53,0.011473655700683594,0.01157999038696289,0.012828588485717773,0.012625694274902344,0.012850761413574219,0.012777328491210938,0.012888908386230469,0.05435991287231445,0.019487619400024414,0.20125961303710938,0.20165371894836426,0.12476992607116699,1.0732040405273438,0.17221617698669434 diff --git a/results/combined/merges_timed/wstrange/googleauth.csv b/results/combined/merges_timed/wstrange/googleauth.csv index 60f17fd4d8..99ebf8b678 100644 --- a/results/combined/merges_timed/wstrange/googleauth.csv +++ b/results/combined/merges_timed/wstrange/googleauth.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -41,refs/heads/master,bb6e4a0c6f4c595a93bcd3b06c05d0c55df8e365,ba8ef98003e0d88ad03b458469c00820482cf3a9,faf4deeade71408fa33bc8030ace85bf7b791f16,,True,True,a178687b0494ce929058cea330860811825bc49d857294e4a2980421ec6f42a2,Tests_passed,7110f678829647334a2739db4aadf76582173dd04d5730a18d9ad874958e307f,Tests_passed,True,True,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,46e5360d5e0b97e8ab490a0e058a30f201ae3c7416a3bcc35588a3d877bdc366,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,8df8b356bfcb8f3692d81c3e8efceeba32892027d03c9386f54dd3f25ce07fb0,Merge_failed,8df8b356bfcb8f3692d81c3e8efceeba32892027d03c9386f54dd3f25ce07fb0,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,b7b09533a02d3bd79e8b8d118e8969bf2c90a14c6ba064c4ef727a1da4a19874,Merge_failed,23fd23fd6da1a2008375ab3d36ffc27a36fb41dba4d3b348659010777416a5e6,0.04676532745361328,0.04135274887084961,0.04450058937072754,0.04259228706359863,0.04786276817321777,0.029761791229248047,0.04519939422607422,0.3025088310241699,0.08245348930358887,0.28049325942993164,0.2806270122528076,0.24462652206420898,1.4528205394744873,0.19692182540893555 +41,refs/heads/master,bb6e4a0c6f4c595a93bcd3b06c05d0c55df8e365,ba8ef98003e0d88ad03b458469c00820482cf3a9,faf4deeade71408fa33bc8030ace85bf7b791f16,,True,True,a178687b0494ce929058cea330860811825bc49d857294e4a2980421ec6f42a2,Tests_passed,7110f678829647334a2739db4aadf76582173dd04d5730a18d9ad874958e307f,Tests_passed,True,True,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,46e5360d5e0b97e8ab490a0e058a30f201ae3c7416a3bcc35588a3d877bdc366,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,8df8b356bfcb8f3692d81c3e8efceeba32892027d03c9386f54dd3f25ce07fb0,Merge_failed,8df8b356bfcb8f3692d81c3e8efceeba32892027d03c9386f54dd3f25ce07fb0,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,b7b09533a02d3bd79e8b8d118e8969bf2c90a14c6ba064c4ef727a1da4a19874,Merge_failed,23fd23fd6da1a2008375ab3d36ffc27a36fb41dba4d3b348659010777416a5e6,0.04676532745361328,0.04135274887084961,0.04450058937072754,0.04259228706359863,0.04786276817321777,0.029761791229248047,0.04519939422607422,0.3025088310241699,0.08245348930358887,0.278461217880249,0.27773594856262207,0.24462652206420898,1.4528205394744873,0.19692182540893555 diff --git a/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv b/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv index a3c088a969..8f7194e9b5 100644 --- a/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv +++ b/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -134,refs/remotes/origin/pull/76,14a73cb57b51b49248c3f76c52d97c311dd7a4c2,10e134245825a25842e170ec12c08c99b86b261c,566f6b3a1cf6c52c902e9c2f1b8fdce0281f72c1,,63c8c47e67f9341d3e086d4023201ce8803c54d0bef75d8a5d62c191f157cbc7,Tests_passed,38ba3b34cc141cead979862489112bc5bca6c07176d8260aead8883ab5ea3e46,Tests_passed,True,True,True,True,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,0e7ed1f1cfc0d1e78d3c62d2b0e44b90692bd34e8a64e779d2b8cad0c5d8996e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,e8342cd8b474ad554e74581f1c2865ebd8673c4d6f9cb2934112c712dc841284,Merge_failed,e8342cd8b474ad554e74581f1c2865ebd8673c4d6f9cb2934112c712dc841284,Merge_failed,52111320e2a374679cd7d1dcb43c883464af176e0f5aa64ef53146f8897bc92f,Merge_failed,cd84e1e1b7244b232716313ed8d219508e07fc4a7b14313b079372e07b5032eb,Merge_failed,23fbc76410299a046ad15a1ac5eee51daedd6d588f7939767fee326c11f89953,0.047963619232177734,0.04803180694580078,0.043988704681396484,0.037221431732177734,0.046434640884399414,0.04266834259033203,0.03987264633178711,0.17411375045776367,0.06508016586303711,0.0897974967956543,0.08737468719482422,0.11956381797790527,1.511155128479004,0.1725778579711914 +134,refs/remotes/origin/pull/76,14a73cb57b51b49248c3f76c52d97c311dd7a4c2,10e134245825a25842e170ec12c08c99b86b261c,566f6b3a1cf6c52c902e9c2f1b8fdce0281f72c1,,63c8c47e67f9341d3e086d4023201ce8803c54d0bef75d8a5d62c191f157cbc7,Tests_passed,38ba3b34cc141cead979862489112bc5bca6c07176d8260aead8883ab5ea3e46,Tests_passed,True,True,True,True,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,0e7ed1f1cfc0d1e78d3c62d2b0e44b90692bd34e8a64e779d2b8cad0c5d8996e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,e8342cd8b474ad554e74581f1c2865ebd8673c4d6f9cb2934112c712dc841284,Merge_failed,e8342cd8b474ad554e74581f1c2865ebd8673c4d6f9cb2934112c712dc841284,Merge_failed,52111320e2a374679cd7d1dcb43c883464af176e0f5aa64ef53146f8897bc92f,Merge_failed,cd84e1e1b7244b232716313ed8d219508e07fc4a7b14313b079372e07b5032eb,Merge_failed,23fbc76410299a046ad15a1ac5eee51daedd6d588f7939767fee326c11f89953,0.047963619232177734,0.04803180694580078,0.043988704681396484,0.037221431732177734,0.046434640884399414,0.04266834259033203,0.03987264633178711,0.17411375045776367,0.06508016586303711,0.08617687225341797,0.08634424209594727,0.11956381797790527,1.511155128479004,0.1725778579711914 diff --git a/results/combined/merges_timed/wwadge/hbnpojogen.csv b/results/combined/merges_timed/wwadge/hbnpojogen.csv index b55b5f8bf7..5500b9a8e1 100644 --- a/results/combined/merges_timed/wwadge/hbnpojogen.csv +++ b/results/combined/merges_timed/wwadge/hbnpojogen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,16f458ccc0b3675ec72a298481794ed4afd70666,583f67a93208929c28782528af94a6befa838c22,c05e424bdf26cc9587415dc1b34ac3628e6f0ea0,,True,True,a8cbd141c88bbc428d841e90389995c171fe8021b35d1d0f6e6c75b6d96841b6,Tests_passed,5c9430292c82a9aa7a9bb357c563cef9def1a24418578eaccb2fc6617a018e1c,Tests_passed,True,True,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,b325267a184f637e32334acbdba2b4d032de35b67a884dd6df199db07db36455,Tests_passed,b325267a184f637e32334acbdba2b4d032de35b67a884dd6df199db07db36455,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,0.05835318565368652,0.053958892822265625,0.05819058418273926,0.024224281311035156,0.053214073181152344,0.03547549247741699,0.03730201721191406,0.18923687934875488,0.04485797882080078,0.20349431037902832,0.21507740020751953,0.08883547782897949,2.1661458015441895,0.22841906547546387 +8,refs/heads/master,16f458ccc0b3675ec72a298481794ed4afd70666,583f67a93208929c28782528af94a6befa838c22,c05e424bdf26cc9587415dc1b34ac3628e6f0ea0,,True,True,a8cbd141c88bbc428d841e90389995c171fe8021b35d1d0f6e6c75b6d96841b6,Tests_passed,5c9430292c82a9aa7a9bb357c563cef9def1a24418578eaccb2fc6617a018e1c,Tests_passed,True,True,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,b325267a184f637e32334acbdba2b4d032de35b67a884dd6df199db07db36455,Tests_passed,b325267a184f637e32334acbdba2b4d032de35b67a884dd6df199db07db36455,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,0.05835318565368652,0.053958892822265625,0.05819058418273926,0.024224281311035156,0.053214073181152344,0.03547549247741699,0.03730201721191406,0.18923687934875488,0.04485797882080078,0.19746994972229004,0.19141364097595215,0.08883547782897949,2.1661458015441895,0.22841906547546387 diff --git a/results/combined/merges_timed/xaverw/msearch.csv b/results/combined/merges_timed/xaverw/msearch.csv index 1341654028..4aa26b84dd 100644 --- a/results/combined/merges_timed/xaverw/msearch.csv +++ b/results/combined/merges_timed/xaverw/msearch.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,ab544f9464acace234ed164113e9d6fc42fcc898,cd770473148aa5a7de33b3505b2257416a605c55,285cd0684d635bc4f6288be7b66d5513ff2f5268,,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,cb4d57b07771831aa03da393176ab13571fa7b995235e5419b3e5b6c9fb01a0e,Tests_passed,True,True,True,True,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9d45eb1f4284a70a3e4093ab5cf1141ba1bc8e1014bf1976e7c125d7b9b71ed2,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,c2c3051fe6ad1ffa0162c9f78984ef94822d4006b42f3184738f99e24aa886bb,Merge_failed,c2c3051fe6ad1ffa0162c9f78984ef94822d4006b42f3184738f99e24aa886bb,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,bb84efae233f35826bd693c5510ffe64c92afef91b86b6605c058b565e989171,0.03905344009399414,0.04337596893310547,0.035262107849121094,0.031200170516967773,0.045031070709228516,0.04102492332458496,0.03164958953857422,0.18196439743041992,0.06703877449035645,0.07957887649536133,0.08014822006225586,0.12399411201477051,1.1821303367614746,0.2351243495941162 +5,refs/heads/master,ab544f9464acace234ed164113e9d6fc42fcc898,cd770473148aa5a7de33b3505b2257416a605c55,285cd0684d635bc4f6288be7b66d5513ff2f5268,,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,cb4d57b07771831aa03da393176ab13571fa7b995235e5419b3e5b6c9fb01a0e,Tests_passed,True,True,True,True,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9d45eb1f4284a70a3e4093ab5cf1141ba1bc8e1014bf1976e7c125d7b9b71ed2,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,c2c3051fe6ad1ffa0162c9f78984ef94822d4006b42f3184738f99e24aa886bb,Merge_failed,c2c3051fe6ad1ffa0162c9f78984ef94822d4006b42f3184738f99e24aa886bb,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,bb84efae233f35826bd693c5510ffe64c92afef91b86b6605c058b565e989171,0.03905344009399414,0.04337596893310547,0.035262107849121094,0.031200170516967773,0.045031070709228516,0.04102492332458496,0.03164958953857422,0.18196439743041992,0.06703877449035645,0.07944488525390625,0.07966065406799316,0.12399411201477051,1.1821303367614746,0.2351243495941162 diff --git a/results/combined/merges_timed/xceptance/xcmailr.csv b/results/combined/merges_timed/xceptance/xcmailr.csv index 41bb150d9a..3fdbf271bd 100644 --- a/results/combined/merges_timed/xceptance/xcmailr.csv +++ b/results/combined/merges_timed/xceptance/xcmailr.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/develop,d2595e205ca2e2c05d51c0005d2a0a476346a766,57b3825589b9a4df633d45657f2f19b1aae327ab,e0e4311c3dad42818e9d6069f6a2234fd2dcf42c,,e640551537f04f760b1f31e060acf3edeb744f3db132a70947b1dbf55fc86be9,Tests_passed,5cf7025ad9cd77670ad2b8f14758f387218dbab9ddaf72f3f23042a63c3bf3a9,Tests_passed,True,True,True,True,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d3d9b69b51958c8a329e0de78b0e4e1f31ac8767fbac22a4f2b08c4f97d9652f,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,477173b308636e58d923a33ed366217d68443569a734cc900f24504318a22b1c,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,0.06205415725708008,0.06223344802856445,0.07507705688476562,0.06677532196044922,0.04774165153503418,0.07446432113647461,0.07465314865112305,0.16774606704711914,0.07020211219787598,0.22247838973999023,0.22178435325622559,0.21636247634887695,1.067270278930664,0.25496935844421387 +6,refs/heads/develop,d2595e205ca2e2c05d51c0005d2a0a476346a766,57b3825589b9a4df633d45657f2f19b1aae327ab,e0e4311c3dad42818e9d6069f6a2234fd2dcf42c,,e640551537f04f760b1f31e060acf3edeb744f3db132a70947b1dbf55fc86be9,Tests_passed,5cf7025ad9cd77670ad2b8f14758f387218dbab9ddaf72f3f23042a63c3bf3a9,Tests_passed,True,True,True,True,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,d3d9b69b51958c8a329e0de78b0e4e1f31ac8767fbac22a4f2b08c4f97d9652f,Merge_failed,d220e27a2653dc386560828433ea62b71828d026fcdf85aa6bb502c78130169e,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,477173b308636e58d923a33ed366217d68443569a734cc900f24504318a22b1c,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,0.06205415725708008,0.06223344802856445,0.07507705688476562,0.06677532196044922,0.04774165153503418,0.07446432113647461,0.07465314865112305,0.16774606704711914,0.07020211219787598,0.17122197151184082,0.2206423282623291,0.21636247634887695,1.067270278930664,0.25496935844421387 diff --git a/results/combined/merges_timed/xebia/xebium.csv b/results/combined/merges_timed/xebia/xebium.csv index dc60af373d..1411ac9401 100644 --- a/results/combined/merges_timed/xebia/xebium.csv +++ b/results/combined/merges_timed/xebia/xebium.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/master,2808ba14a8b8932184099d8a63e9c5a4d69d6a25,5741e34076818d5ab03d55067a60a4a9db37a064,3a99245672b2f98fe3de5600d1012e2625201edd,,True,True,4fea512beed85924066989703783ab13254da091cda925f5ed2852253fb602af,Tests_passed,d8b3cef5ffdc8707665176455fa4c806a7f94cd22a6a82fcd9fd6ab724e940da,Tests_passed,True,True,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,0.05892348289489746,0.04136180877685547,0.04996514320373535,0.04343986511230469,0.0494232177734375,0.04474925994873047,0.044936418533325195,0.17433571815490723,0.03954648971557617,0.16981244087219238,0.17055630683898926,0.07441997528076172,1.0687639713287354,0.2242143154144287 +16,refs/heads/master,2808ba14a8b8932184099d8a63e9c5a4d69d6a25,5741e34076818d5ab03d55067a60a4a9db37a064,3a99245672b2f98fe3de5600d1012e2625201edd,,True,True,4fea512beed85924066989703783ab13254da091cda925f5ed2852253fb602af,Tests_passed,d8b3cef5ffdc8707665176455fa4c806a7f94cd22a6a82fcd9fd6ab724e940da,Tests_passed,True,True,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,0.05892348289489746,0.04136180877685547,0.04996514320373535,0.04343986511230469,0.0494232177734375,0.04474925994873047,0.044936418533325195,0.17433571815490723,0.03954648971557617,0.1678295135498047,0.16742658615112305,0.07441997528076172,1.0687639713287354,0.2242143154144287 diff --git a/results/combined/merges_timed/xerial/sqlite-jdbc.csv b/results/combined/merges_timed/xerial/sqlite-jdbc.csv index 66fbd67b7e..8b68c66253 100644 --- a/results/combined/merges_timed/xerial/sqlite-jdbc.csv +++ b/results/combined/merges_timed/xerial/sqlite-jdbc.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,1b28e87bebefd5dd7deb7b0712e2ab5729a363e8,60bcbe8753b72abdabdcf203381c7615e7df499c,a987e5deb8ee1c54c747ef5c364c83cb2425a8a9,,True,True,90b3f767992119fe56afe43f9484afc247cc18627578d400bf1310ab5c2c153e,Tests_passed,21877632a27041a36fff6fb23c59ac8be08845afa59e64876c2c7fbb23a88662,Tests_passed,True,True,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_failed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,0.045928239822387695,0.04534125328063965,0.013927221298217773,0.03855538368225098,0.053664207458496094,0.054592132568359375,0.014462471008300781,0.1858205795288086,0.057497262954711914,0.2988147735595703,0.30129528045654297,0.07611298561096191,2.214717388153076,0.6429359912872314 +12,refs/heads/master,1b28e87bebefd5dd7deb7b0712e2ab5729a363e8,60bcbe8753b72abdabdcf203381c7615e7df499c,a987e5deb8ee1c54c747ef5c364c83cb2425a8a9,,True,True,90b3f767992119fe56afe43f9484afc247cc18627578d400bf1310ab5c2c153e,Tests_passed,21877632a27041a36fff6fb23c59ac8be08845afa59e64876c2c7fbb23a88662,Tests_passed,True,True,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_failed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,0.045928239822387695,0.04534125328063965,0.013927221298217773,0.03855538368225098,0.053664207458496094,0.054592132568359375,0.014462471008300781,0.1858205795288086,0.057497262954711914,0.20263004302978516,0.2970273494720459,0.07611298561096191,2.214717388153076,0.6429359912872314 diff --git a/results/combined/merges_timed/xuxueli/xxl-job.csv b/results/combined/merges_timed/xuxueli/xxl-job.csv index 1e5a698fd1..181d6b164f 100644 --- a/results/combined/merges_timed/xuxueli/xxl-job.csv +++ b/results/combined/merges_timed/xuxueli/xxl-job.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -283,refs/remotes/origin/pull/529,ae3ba5571a06adf8fd231cea40241a11d4c3f651,60bfd95c8f4c60a17b326a5d7885955e66d521eb,f24df15ddb82b839ce2e1ea0ae16c75bb408617a,,True,True,d24396fdf7e038af858c2f8b3b657fb4357093285d506579e71cb5b920b274f5,Tests_passed,6d5828dde6df6dea4360927268532dec1899ca458a81b058db0de73729b0ae6f,Tests_passed,True,True,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,187b1cfadd12faa2966e3bbb997e14d2be06afade2953b032d0dc76dd71f0673,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,c9ddb1a1da3e5b1fe03bd559c020c0b12ee446e1cd8ae9baaf36938d71295283,Merge_failed,c9ddb1a1da3e5b1fe03bd559c020c0b12ee446e1cd8ae9baaf36938d71295283,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,0.05978679656982422,0.06105756759643555,0.04837965965270996,0.03770732879638672,0.07230377197265625,0.07218217849731445,0.047579050064086914,0.06858587265014648,0.08507895469665527,0.26906871795654297,0.2694847583770752,0.17415165901184082,0.01564788818359375,0.3082849979400635 +283,refs/remotes/origin/pull/529,ae3ba5571a06adf8fd231cea40241a11d4c3f651,60bfd95c8f4c60a17b326a5d7885955e66d521eb,f24df15ddb82b839ce2e1ea0ae16c75bb408617a,,True,True,d24396fdf7e038af858c2f8b3b657fb4357093285d506579e71cb5b920b274f5,Tests_passed,6d5828dde6df6dea4360927268532dec1899ca458a81b058db0de73729b0ae6f,Tests_passed,True,True,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,187b1cfadd12faa2966e3bbb997e14d2be06afade2953b032d0dc76dd71f0673,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,c9ddb1a1da3e5b1fe03bd559c020c0b12ee446e1cd8ae9baaf36938d71295283,Merge_failed,c9ddb1a1da3e5b1fe03bd559c020c0b12ee446e1cd8ae9baaf36938d71295283,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,0.05978679656982422,0.06105756759643555,0.04837965965270996,0.03770732879638672,0.07230377197265625,0.07218217849731445,0.047579050064086914,0.06858587265014648,0.08507895469665527,0.26608705520629883,0.26655149459838867,0.17415165901184082,0.01564788818359375,0.3082849979400635 diff --git a/results/combined/merges_timed/yandex-qatools/ashot.csv b/results/combined/merges_timed/yandex-qatools/ashot.csv index 9ad384276c..55cafccc0f 100644 --- a/results/combined/merges_timed/yandex-qatools/ashot.csv +++ b/results/combined/merges_timed/yandex-qatools/ashot.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -74,refs/heads/master,c885c16709720ca016eeaad7056c0a39a9490878,3f0f936d5420486e0fc81188a8b910efd658d527,c4dd51684fd9c41c3007a2738ea5956eb3de894d,,True,True,fe30a35cebd8fd18b96194edc73b49b9ee0f724aa8c4e548f7bc6022c2d7eceb,Tests_passed,5241c4d02046c03f064e714c909160493feca3f1ecf6295fbcf1403682a0890f,Tests_passed,True,True,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,de3f02302a8699e9a6cc8fcd5ce44d8a36e0620929858d65cbe60bf0f47b20fc,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,46b4fc4f8c72586fd1c67aa81164838ba4bb6f599fff34d81def9e637d2c3329,Merge_failed,46b4fc4f8c72586fd1c67aa81164838ba4bb6f599fff34d81def9e637d2c3329,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Merge_failed,1b09026912390a2bf056973e07909e6798eaef04930515e6c33b28f560c7ed8a,0.010593175888061523,0.010580301284790039,0.010961771011352539,0.011276960372924805,0.011044740676879883,0.010965585708618164,0.010863304138183594,0.05048847198486328,0.01930975914001465,0.12243986129760742,0.12111902236938477,0.12567710876464844,1.3154582977294922,0.16436314582824707 +74,refs/heads/master,c885c16709720ca016eeaad7056c0a39a9490878,3f0f936d5420486e0fc81188a8b910efd658d527,c4dd51684fd9c41c3007a2738ea5956eb3de894d,,True,True,fe30a35cebd8fd18b96194edc73b49b9ee0f724aa8c4e548f7bc6022c2d7eceb,Tests_passed,5241c4d02046c03f064e714c909160493feca3f1ecf6295fbcf1403682a0890f,Tests_passed,True,True,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,de3f02302a8699e9a6cc8fcd5ce44d8a36e0620929858d65cbe60bf0f47b20fc,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,46b4fc4f8c72586fd1c67aa81164838ba4bb6f599fff34d81def9e637d2c3329,Merge_failed,46b4fc4f8c72586fd1c67aa81164838ba4bb6f599fff34d81def9e637d2c3329,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Merge_failed,1b09026912390a2bf056973e07909e6798eaef04930515e6c33b28f560c7ed8a,0.010593175888061523,0.010580301284790039,0.010961771011352539,0.011276960372924805,0.011044740676879883,0.010965585708618164,0.010863304138183594,0.05048847198486328,0.01930975914001465,0.12236189842224121,0.12172102928161621,0.12567710876464844,1.3154582977294922,0.16436314582824707 diff --git a/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv b/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv index 1299661fcc..c6abaf3136 100644 --- a/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv +++ b/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -30,refs/remotes/origin/pull/82,a3c37f7112acccd27f2c75daa7c0414fa495845f,b07cc8784d865c964493bdf10d4180719cf2c825,c9281552120f7d0ffb2b5a487e4f4cdb4138fe19,,True,True,ca95662991c6369583c4236a41049b9b1551eacd2beecd145668229f90d75304,Tests_passed,9e1fb8c13cd003c9648748e88fb969fab05fbc039dad492b0bc05fe8c3e05465,Tests_passed,True,True,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,7dba4a92afb17ea3d8b9fbca44eba5f21a698c99fc60682b6a1857e217bfd121,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,d75459ca505f10fc05aa3323f37e559113018007c44ca83036a3db04c879cc7f,Merge_failed,d75459ca505f10fc05aa3323f37e559113018007c44ca83036a3db04c879cc7f,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Merge_failed,1a74fb0892479cef97152707bbf521f5efae581ead29195606c19bd3d4db26b2,0.009865522384643555,0.009993553161621094,0.009551763534545898,0.009876489639282227,0.009877920150756836,0.010052680969238281,0.009794950485229492,0.03475666046142578,0.014343500137329102,0.1307375431060791,0.1312105655670166,0.06993818283081055,1.1524724960327148,0.1757519245147705 +30,refs/remotes/origin/pull/82,a3c37f7112acccd27f2c75daa7c0414fa495845f,b07cc8784d865c964493bdf10d4180719cf2c825,c9281552120f7d0ffb2b5a487e4f4cdb4138fe19,,True,True,ca95662991c6369583c4236a41049b9b1551eacd2beecd145668229f90d75304,Tests_passed,9e1fb8c13cd003c9648748e88fb969fab05fbc039dad492b0bc05fe8c3e05465,Tests_passed,True,True,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,7dba4a92afb17ea3d8b9fbca44eba5f21a698c99fc60682b6a1857e217bfd121,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,d75459ca505f10fc05aa3323f37e559113018007c44ca83036a3db04c879cc7f,Merge_failed,d75459ca505f10fc05aa3323f37e559113018007c44ca83036a3db04c879cc7f,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Merge_failed,1a74fb0892479cef97152707bbf521f5efae581ead29195606c19bd3d4db26b2,0.009865522384643555,0.009993553161621094,0.009551763534545898,0.009876489639282227,0.009877920150756836,0.010052680969238281,0.009794950485229492,0.03475666046142578,0.014343500137329102,0.13142871856689453,0.13142824172973633,0.06993818283081055,1.1524724960327148,0.1757519245147705 diff --git a/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv b/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv index 9ec95c3fd0..004a089177 100644 --- a/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv +++ b/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/remotes/origin/1.2,5bf2597661014520aa35d0746d813bc012422c8c,33e6486562edeec6be5e0a90c6e7c868bd94381b,618ea967aaf811d96411c1ae2d921593de57446a,,3d0810c58349314c5d970dd2c552f45a4be8836cdb5e2ab031cb6b788856009c,Tests_passed,9b8fe86f95fecb955372aee2fab01b5e27f066ceda4c1ef385a90bd58cdd3849,Tests_passed,True,True,True,True,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,9a4244f358a7427417fbb4a913c1380cb724db529f7e85f3094cd47b323818ab,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,0.015785694122314453,0.04281473159790039,0.04190349578857422,0.04496431350708008,0.03847336769104004,0.04178738594055176,0.03984570503234863,0.23376226425170898,0.06566262245178223,0.14260172843933105,0.14359283447265625,0.178663969039917,0.04440665245056152,0.19049429893493652 +20,refs/remotes/origin/1.2,5bf2597661014520aa35d0746d813bc012422c8c,33e6486562edeec6be5e0a90c6e7c868bd94381b,618ea967aaf811d96411c1ae2d921593de57446a,,3d0810c58349314c5d970dd2c552f45a4be8836cdb5e2ab031cb6b788856009c,Tests_passed,9b8fe86f95fecb955372aee2fab01b5e27f066ceda4c1ef385a90bd58cdd3849,Tests_passed,True,True,True,True,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,9a4244f358a7427417fbb4a913c1380cb724db529f7e85f3094cd47b323818ab,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,0.015785694122314453,0.04281473159790039,0.04190349578857422,0.04496431350708008,0.03847336769104004,0.04178738594055176,0.03984570503234863,0.23376226425170898,0.06566262245178223,0.14102721214294434,0.14115548133850098,0.178663969039917,0.04440665245056152,0.19049429893493652 diff --git a/results/combined/merges_timed/yaphone/itchat4j.csv b/results/combined/merges_timed/yaphone/itchat4j.csv index e26d2616a9..8c1555e864 100644 --- a/results/combined/merges_timed/yaphone/itchat4j.csv +++ b/results/combined/merges_timed/yaphone/itchat4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,26a0c2271ccd5a96c27ba6c419c6ae4cb85782b3,a1bc4b4b814df4c3c201f9b69f9d9339bad3d136,12d2c7a7944135b09055470d9ac180f80222c6c4,,True,True,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,1bf9771bcf147b9ca6e53253bb62e973789eeb1eefdd53db8e7df796d21a1962,Tests_passed,True,True,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,0.041831016540527344,0.048271894454956055,0.03961300849914551,0.04330134391784668,0.03619885444641113,0.041841745376586914,0.04855966567993164,0.161484956741333,0.04646754264831543,0.3005673885345459,0.30115675926208496,0.1192479133605957,1.3738751411437988,0.22767186164855957 +8,refs/heads/master,26a0c2271ccd5a96c27ba6c419c6ae4cb85782b3,a1bc4b4b814df4c3c201f9b69f9d9339bad3d136,12d2c7a7944135b09055470d9ac180f80222c6c4,,True,True,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,1bf9771bcf147b9ca6e53253bb62e973789eeb1eefdd53db8e7df796d21a1962,Tests_passed,True,True,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,0.041831016540527344,0.048271894454956055,0.03961300849914551,0.04330134391784668,0.03619885444641113,0.041841745376586914,0.04855966567993164,0.161484956741333,0.04646754264831543,0.30831241607666016,0.30007481575012207,0.1192479133605957,1.3738751411437988,0.22767186164855957 diff --git a/results/combined/merges_timed/yegor256/rexsl.csv b/results/combined/merges_timed/yegor256/rexsl.csv index 04c0edf20e..860a0d602d 100644 --- a/results/combined/merges_timed/yegor256/rexsl.csv +++ b/results/combined/merges_timed/yegor256/rexsl.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,0c8dac7b6c144a3f260a7ebcc1367f9b1efac767,caab13af375e8059b2bfcaeb1af74d0b167f5d56,3dd37ca97a34b46cbd1185d9ec78bc0484f86497,,True,True,efa53ab5735db2aa4dfa9eabd58f983054d92c643607d66a704557a122eff0d0,Tests_passed,0113baa9e2be37aba416881b8dc77c0b4e0d4a0d69322a9066c6f35fa2aecc15,Tests_passed,True,True,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,0.04503488540649414,0.04123234748840332,0.061663150787353516,0.0438694953918457,0.07154345512390137,0.04764103889465332,0.051438093185424805,0.18664884567260742,0.050116539001464844,0.16516900062561035,0.16504240036010742,0.11896014213562012,0.05459451675415039,0.29636359214782715 +12,refs/heads/master,0c8dac7b6c144a3f260a7ebcc1367f9b1efac767,caab13af375e8059b2bfcaeb1af74d0b167f5d56,3dd37ca97a34b46cbd1185d9ec78bc0484f86497,,True,True,efa53ab5735db2aa4dfa9eabd58f983054d92c643607d66a704557a122eff0d0,Tests_passed,0113baa9e2be37aba416881b8dc77c0b4e0d4a0d69322a9066c6f35fa2aecc15,Tests_passed,True,True,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,0.04503488540649414,0.04123234748840332,0.061663150787353516,0.0438694953918457,0.07154345512390137,0.04764103889465332,0.051438093185424805,0.18664884567260742,0.050116539001464844,0.16254353523254395,0.16133952140808105,0.11896014213562012,0.05459451675415039,0.29636359214782715 diff --git a/results/combined/merges_timed/yegor256/xembly.csv b/results/combined/merges_timed/yegor256/xembly.csv index 2a88968d84..3dbbaac0c9 100644 --- a/results/combined/merges_timed/yegor256/xembly.csv +++ b/results/combined/merges_timed/yegor256/xembly.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -20,refs/heads/master,e279293590e9d10fbd09353bd505e6f97a060c8d,f058e1333921e0446563e5da54b16fbc6552832d,35385af641c110c21c0b6af59835b9370a5d674b,,True,True,2ae3bb884a481812716afec81dd4f72536ed652da690448883864a80c18dec35,Tests_passed,94eb3887b406f32733b84e93944f71dcf3f36fd960c918b9180870b2c4f1f16c,Tests_passed,True,True,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,0.06286096572875977,0.05670046806335449,0.060605525970458984,0.06630587577819824,0.07490921020507812,0.07285356521606445,0.05457878112792969,0.2848944664001465,0.05303025245666504,0.32474470138549805,0.32354116439819336,0.1720104217529297,0.053894996643066406,0.25484609603881836 +20,refs/heads/master,e279293590e9d10fbd09353bd505e6f97a060c8d,f058e1333921e0446563e5da54b16fbc6552832d,35385af641c110c21c0b6af59835b9370a5d674b,,True,True,2ae3bb884a481812716afec81dd4f72536ed652da690448883864a80c18dec35,Tests_passed,94eb3887b406f32733b84e93944f71dcf3f36fd960c918b9180870b2c4f1f16c,Tests_passed,True,True,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,0.06286096572875977,0.05670046806335449,0.060605525970458984,0.06630587577819824,0.07490921020507812,0.07285356521606445,0.05457878112792969,0.2848944664001465,0.05303025245666504,0.3196420669555664,0.3199470043182373,0.1720104217529297,0.053894996643066406,0.25484609603881836 diff --git a/results/combined/merges_timed/yfpeng/pengyifan-commons.csv b/results/combined/merges_timed/yfpeng/pengyifan-commons.csv index 70de9f6895..0d7a1de147 100644 --- a/results/combined/merges_timed/yfpeng/pengyifan-commons.csv +++ b/results/combined/merges_timed/yfpeng/pengyifan-commons.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,12b4284589d4f1e0461def2ab4b95e07f51ad9f6,495932109e40fc131106c796bcb3357b3549b286,8292eeb7786230f3b080ff8b29868eea46a0d6d0,,e10885075e953e4c4f2f35796af07521e202243ee79b80079ba91b7fa0d8057e,Tests_passed,7c1e8134a2ec2052b46ea435402026f23d79db6dba164631bd53820ed1359cc0,Tests_passed,True,True,True,True,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,0.047850608825683594,0.054338932037353516,0.04835200309753418,0.05653047561645508,0.0469362735748291,0.047505855560302734,0.05023479461669922,0.254378080368042,0.05188918113708496,0.3168163299560547,0.318007230758667,0.17200541496276855,1.9539625644683838,0.2353053092956543 +9,refs/heads/master,12b4284589d4f1e0461def2ab4b95e07f51ad9f6,495932109e40fc131106c796bcb3357b3549b286,8292eeb7786230f3b080ff8b29868eea46a0d6d0,,e10885075e953e4c4f2f35796af07521e202243ee79b80079ba91b7fa0d8057e,Tests_passed,7c1e8134a2ec2052b46ea435402026f23d79db6dba164631bd53820ed1359cc0,Tests_passed,True,True,True,True,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,0.047850608825683594,0.054338932037353516,0.04835200309753418,0.05653047561645508,0.0469362735748291,0.047505855560302734,0.05023479461669922,0.254378080368042,0.05188918113708496,0.31167078018188477,0.31163716316223145,0.17200541496276855,1.9539625644683838,0.2353053092956543 diff --git a/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv b/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv index b76bcbc072..37ce4a9b86 100644 --- a/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv +++ b/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,bb9b165e9b6f5db5725394be827250f61e87b71a,307fe1c63dac2e5049efdf21a478ed577fe1ed66,79216680be9c17f819e516efb5c9dfd210dad720,,7389c76b28bb8988108f02d3f429c9a276769fc94c3b5b47a4382b34d600ac87,Tests_passed,732cba39f762d73abe26fcf138efdb5d481f7589c86d81d831d0f4957a95da99,Tests_passed,True,True,True,True,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,e60bf5dbcbd3bc423ac16fea99a975d89cfb8cbf4de110ffb770547eba3807c7,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Merge_failed,b68585a691fa8a26a64c882b626d86361089414748c0254c8a66c08716c1117e,0.042832136154174805,0.042839765548706055,0.03577995300292969,0.03447747230529785,0.039369821548461914,0.03593921661376953,0.04081106185913086,0.17174267768859863,0.05378866195678711,0.13769841194152832,0.13847780227661133,0.11858630180358887,0.42534947395324707,0.17992401123046875 +3,refs/heads/master,bb9b165e9b6f5db5725394be827250f61e87b71a,307fe1c63dac2e5049efdf21a478ed577fe1ed66,79216680be9c17f819e516efb5c9dfd210dad720,,7389c76b28bb8988108f02d3f429c9a276769fc94c3b5b47a4382b34d600ac87,Tests_passed,732cba39f762d73abe26fcf138efdb5d481f7589c86d81d831d0f4957a95da99,Tests_passed,True,True,True,True,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Merge_failed,e60bf5dbcbd3bc423ac16fea99a975d89cfb8cbf4de110ffb770547eba3807c7,Merge_failed,02aa171c53293cbe984c5302d24f60069be33e8f1546526b56ae430ebe4c1beb,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Merge_failed,b68585a691fa8a26a64c882b626d86361089414748c0254c8a66c08716c1117e,0.042832136154174805,0.042839765548706055,0.03577995300292969,0.03447747230529785,0.039369821548461914,0.03593921661376953,0.04081106185913086,0.17174267768859863,0.05378866195678711,0.137711763381958,0.1377415657043457,0.11858630180358887,0.42534947395324707,0.17992401123046875 diff --git a/results/combined/merges_timed/yinlou/mltk.csv b/results/combined/merges_timed/yinlou/mltk.csv index b7f634dbbd..75f9c29381 100644 --- a/results/combined/merges_timed/yinlou/mltk.csv +++ b/results/combined/merges_timed/yinlou/mltk.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,d8ba61b83ab596ce5a69819325449353409fe333,1e2122a2841cd7ebe466af889c6e69ff6361864d,2fad94a58127f000fdcb9674e1c9a4591e23fd09,,True,True,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Tests_passed,dd3673f125e6e0e5f6681bd64cdfa150aaca6ecccb350eeb99cd597ba33682d2,Tests_passed,True,True,Merge_failed,5121cb0d285e1823b8272953e3eef0da5aaf8666f96887b8d89804c3397ca49b,Merge_failed,6bbd31d87f9c24eb13764aaa704d40729384a142c62aa3fd66f289d8b839752e,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,5121cb0d285e1823b8272953e3eef0da5aaf8666f96887b8d89804c3397ca49b,Merge_failed,284df7bec1d4b6a9791ce5b38cbc7ab7a59d17c7edc18c38f98ba04aa6233699,Merge_failed,284df7bec1d4b6a9791ce5b38cbc7ab7a59d17c7edc18c38f98ba04aa6233699,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,1034c047b0d0605bda212c41dec63863dd9b110b2a96df63a89d8ea6d35d9028,0.06792473793029785,0.0612025260925293,0.055242300033569336,0.05859208106994629,0.0596160888671875,0.03842973709106445,0.06410479545593262,2.7300796508789062,0.08645486831665039,0.2283172607421875,0.22821307182312012,0.19652986526489258,1.1095428466796875,0.2834644317626953 +6,refs/heads/master,d8ba61b83ab596ce5a69819325449353409fe333,1e2122a2841cd7ebe466af889c6e69ff6361864d,2fad94a58127f000fdcb9674e1c9a4591e23fd09,,True,True,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Tests_passed,dd3673f125e6e0e5f6681bd64cdfa150aaca6ecccb350eeb99cd597ba33682d2,Tests_passed,True,True,Merge_failed,5121cb0d285e1823b8272953e3eef0da5aaf8666f96887b8d89804c3397ca49b,Merge_failed,6bbd31d87f9c24eb13764aaa704d40729384a142c62aa3fd66f289d8b839752e,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,5121cb0d285e1823b8272953e3eef0da5aaf8666f96887b8d89804c3397ca49b,Merge_failed,284df7bec1d4b6a9791ce5b38cbc7ab7a59d17c7edc18c38f98ba04aa6233699,Merge_failed,284df7bec1d4b6a9791ce5b38cbc7ab7a59d17c7edc18c38f98ba04aa6233699,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,1034c047b0d0605bda212c41dec63863dd9b110b2a96df63a89d8ea6d35d9028,0.06792473793029785,0.0612025260925293,0.055242300033569336,0.05859208106994629,0.0596160888671875,0.03842973709106445,0.06410479545593262,2.7300796508789062,0.08645486831665039,0.22638583183288574,0.22741413116455078,0.19652986526489258,1.1095428466796875,0.2834644317626953 diff --git a/results/combined/merges_timed/yinwang0/rubysonar.csv b/results/combined/merges_timed/yinwang0/rubysonar.csv index 4a1341dcd9..98579b0efc 100644 --- a/results/combined/merges_timed/yinwang0/rubysonar.csv +++ b/results/combined/merges_timed/yinwang0/rubysonar.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,fe4005af961bdc19c4f47fd0d60dbea83278b782,b216073a1f42d7eca77a755a5ca50289a7138606,1f10f0ded03292220c69999e0577a96026569dc5,,True,True,738502cdf6141889aa60d232a8b2b18fc3864f82cad46ea9c1a5ea2370fb35b8,Tests_passed,2f8655afdab831f4045ae6d708c557be0de01a5fc7273ee4181a49ee634144e2,Tests_passed,True,True,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,8a03a5db56d203fcff8d452dcea1142fcd33ad1a7ac5fd52571ec0df5994d0e4,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,cdd87f74027ce7243d25a44356f400a861c6718cc0a9a4fc5a354d751f3ccf13,Merge_failed,cdd87f74027ce7243d25a44356f400a861c6718cc0a9a4fc5a354d751f3ccf13,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,1bd907e6d2991ac94e9c7e31203e84893631e1a0217e815942d7b67b6f261e33,0.040146589279174805,0.018051862716674805,0.015120983123779297,0.05376768112182617,0.02375006675720215,0.05970931053161621,0.04673409461975098,0.22001910209655762,0.07710456848144531,0.3083360195159912,0.3101687431335449,0.17007827758789062,1.3007075786590576,0.2459709644317627 +15,refs/heads/master,fe4005af961bdc19c4f47fd0d60dbea83278b782,b216073a1f42d7eca77a755a5ca50289a7138606,1f10f0ded03292220c69999e0577a96026569dc5,,True,True,738502cdf6141889aa60d232a8b2b18fc3864f82cad46ea9c1a5ea2370fb35b8,Tests_passed,2f8655afdab831f4045ae6d708c557be0de01a5fc7273ee4181a49ee634144e2,Tests_passed,True,True,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,8a03a5db56d203fcff8d452dcea1142fcd33ad1a7ac5fd52571ec0df5994d0e4,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,cdd87f74027ce7243d25a44356f400a861c6718cc0a9a4fc5a354d751f3ccf13,Merge_failed,cdd87f74027ce7243d25a44356f400a861c6718cc0a9a4fc5a354d751f3ccf13,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,1bd907e6d2991ac94e9c7e31203e84893631e1a0217e815942d7b67b6f261e33,0.040146589279174805,0.018051862716674805,0.015120983123779297,0.05376768112182617,0.02375006675720215,0.05970931053161621,0.04673409461975098,0.22001910209655762,0.07710456848144531,0.3058500289916992,0.3059847354888916,0.17007827758789062,1.3007075786590576,0.2459709644317627 diff --git a/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv b/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv index fa91bd7787..2f3af9ddbc 100644 --- a/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv +++ b/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -7,refs/heads/master,be10f22b86225a1829a2ff4074580f1a0482a5af,939214e7588fdf67c6efddaf4ad33b869fbd8146,4dd2606f9629045e4fd93c424e706d40bfb73cb3,,True,True,20e66fcda3a3c4469312b95fec33cc22fda7755a2892418a7e645c8ca90150b4,Tests_passed,4827da6cc889d3a053eb6d882d30754efff45091167de6f34709f88045fda768,Tests_passed,True,True,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Merge_failed,f60f8bdfc7136400536e9227e14f08f2873c989e404c0b27dee02d88acc8dec3,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,0.044097185134887695,0.0442967414855957,0.04829597473144531,0.05019235610961914,0.049395084381103516,0.04402923583984375,0.04138898849487305,0.2341747283935547,0.038657188415527344,0.007634162902832031,0.007782936096191406,0.031717777252197266,0.04310917854309082,0.19461679458618164 +7,refs/heads/master,be10f22b86225a1829a2ff4074580f1a0482a5af,939214e7588fdf67c6efddaf4ad33b869fbd8146,4dd2606f9629045e4fd93c424e706d40bfb73cb3,,True,True,20e66fcda3a3c4469312b95fec33cc22fda7755a2892418a7e645c8ca90150b4,Tests_passed,4827da6cc889d3a053eb6d882d30754efff45091167de6f34709f88045fda768,Tests_passed,True,True,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Merge_failed,f60f8bdfc7136400536e9227e14f08f2873c989e404c0b27dee02d88acc8dec3,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,0.044097185134887695,0.0442967414855957,0.04829597473144531,0.05019235610961914,0.049395084381103516,0.04402923583984375,0.04138898849487305,0.2341747283935547,0.038657188415527344,0.007296323776245117,0.007195949554443359,0.031717777252197266,0.04310917854309082,0.19461679458618164 diff --git a/results/combined/merges_timed/yubico/ykneo-openpgp.csv b/results/combined/merges_timed/yubico/ykneo-openpgp.csv index 202206274b..76b6ce3fcd 100644 --- a/results/combined/merges_timed/yubico/ykneo-openpgp.csv +++ b/results/combined/merges_timed/yubico/ykneo-openpgp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,df508d799167e2667bf3488214b6df53e5f647b3,998a7e0f1d376b8b0cdfbd4ae512c0aef227923c,3f5a582f98187b408aa67180a2224e041436d945,,68482b384a81381b88328b4f324dfc1b16589007875c4434d72af0007d01b05e,Tests_passed,f98c3c7db67ba9142cff006db01c9e15d03dbc09e2324acae7bc311a2f4f0621,Tests_passed,True,True,True,True,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,0.04641914367675781,0.049211978912353516,0.043523311614990234,0.045267343521118164,0.049997568130493164,0.049814462661743164,0.04286551475524902,0.23771262168884277,0.04603290557861328,0.3316051959991455,0.3348114490509033,0.168565034866333,2.5300581455230713,0.19163727760314941 +3,refs/heads/master,df508d799167e2667bf3488214b6df53e5f647b3,998a7e0f1d376b8b0cdfbd4ae512c0aef227923c,3f5a582f98187b408aa67180a2224e041436d945,,68482b384a81381b88328b4f324dfc1b16589007875c4434d72af0007d01b05e,Tests_passed,f98c3c7db67ba9142cff006db01c9e15d03dbc09e2324acae7bc311a2f4f0621,Tests_passed,True,True,True,True,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,0.04641914367675781,0.049211978912353516,0.043523311614990234,0.045267343521118164,0.049997568130493164,0.049814462661743164,0.04286551475524902,0.23771262168884277,0.04603290557861328,0.3282589912414551,0.32723283767700195,0.168565034866333,2.5300581455230713,0.19163727760314941 diff --git a/results/combined/merges_timed/zalando/java-sproc-wrapper.csv b/results/combined/merges_timed/zalando/java-sproc-wrapper.csv index a35d33a8e2..778c5d2897 100644 --- a/results/combined/merges_timed/zalando/java-sproc-wrapper.csv +++ b/results/combined/merges_timed/zalando/java-sproc-wrapper.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/master,d748054093c85a1696a2acd4b5183d47da342f4f,f4be887e89736120593dec1076df7e7f4032ebd4,bf69bdb95870794d0419e564ca5af1073ec1afcb,,True,True,1427d00dafdcb90797233a1c08a8622d648fd043547efcc06b9f896183ce2a1b,Tests_passed,648be499fbd7eaaeb5eaf523af3e664e8bccb536fae3927d8b7979193ec47859,Tests_passed,True,True,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,0.05435514450073242,0.03977394104003906,0.0476071834564209,0.055161237716674805,0.05068850517272949,0.045848846435546875,0.06190967559814453,0.1990358829498291,0.05789589881896973,0.18238425254821777,0.18606781959533691,0.11773347854614258,1.7386884689331055,0.2503526210784912 +26,refs/heads/master,d748054093c85a1696a2acd4b5183d47da342f4f,f4be887e89736120593dec1076df7e7f4032ebd4,bf69bdb95870794d0419e564ca5af1073ec1afcb,,True,True,1427d00dafdcb90797233a1c08a8622d648fd043547efcc06b9f896183ce2a1b,Tests_passed,648be499fbd7eaaeb5eaf523af3e664e8bccb536fae3927d8b7979193ec47859,Tests_passed,True,True,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,0.05435514450073242,0.03977394104003906,0.0476071834564209,0.055161237716674805,0.05068850517272949,0.045848846435546875,0.06190967559814453,0.1990358829498291,0.05789589881896973,0.18399333953857422,0.18326926231384277,0.11773347854614258,1.7386884689331055,0.2503526210784912 diff --git a/results/combined/merges_timed/zauberlabs/gnip4j.csv b/results/combined/merges_timed/zauberlabs/gnip4j.csv index 314e1c1fcd..8dbdab1673 100644 --- a/results/combined/merges_timed/zauberlabs/gnip4j.csv +++ b/results/combined/merges_timed/zauberlabs/gnip4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -40,refs/remotes/origin/pull/61,88be680a758bd1873bbabef4cf0a70d52220d333,f83b201e645e716eedc4c3164078612d9d571274,a4661012e34163ba24fa216b5d252831a25e6546,,True,True,32026961cc0cf7ef2360fb62d63d102b980828a121a33adb5eef06445cc53ad8,Tests_passed,41bcb0b98c3473869ebf9a04842abd4900e731b14db2f64dc3b4b854c2a34126,Tests_passed,True,True,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,ad5cd52fa1a7a994b4f1a507c146c0efdbfe3d7412e2e21413e7cd3294b45e4b,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6a74d1844555ac037419bee30512919f37f0fac32a9ec1d1080fa3120f506c57,Merge_failed,6a74d1844555ac037419bee30512919f37f0fac32a9ec1d1080fa3120f506c57,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Merge_failed,724b09606f10c3899db338e2df7e9ec02a4071d8b6d9adc480879111a6d6325c,0.027280092239379883,0.04873514175415039,0.025678157806396484,0.044184207916259766,0.03682374954223633,0.04065847396850586,0.03618979454040527,0.16874933242797852,0.05919051170349121,0.0824124813079834,0.08223509788513184,0.11606073379516602,0.6379499435424805,0.2198023796081543 +40,refs/remotes/origin/pull/61,88be680a758bd1873bbabef4cf0a70d52220d333,f83b201e645e716eedc4c3164078612d9d571274,a4661012e34163ba24fa216b5d252831a25e6546,,True,True,32026961cc0cf7ef2360fb62d63d102b980828a121a33adb5eef06445cc53ad8,Tests_passed,41bcb0b98c3473869ebf9a04842abd4900e731b14db2f64dc3b4b854c2a34126,Tests_passed,True,True,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,ad5cd52fa1a7a994b4f1a507c146c0efdbfe3d7412e2e21413e7cd3294b45e4b,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6a74d1844555ac037419bee30512919f37f0fac32a9ec1d1080fa3120f506c57,Merge_failed,6a74d1844555ac037419bee30512919f37f0fac32a9ec1d1080fa3120f506c57,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Merge_failed,724b09606f10c3899db338e2df7e9ec02a4071d8b6d9adc480879111a6d6325c,0.027280092239379883,0.04873514175415039,0.025678157806396484,0.044184207916259766,0.03682374954223633,0.04065847396850586,0.03618979454040527,0.16874933242797852,0.05919051170349121,0.08042263984680176,0.08140349388122559,0.11606073379516602,0.6379499435424805,0.2198023796081543 diff --git a/results/combined/merges_timed/zenria/weed-fs-java-client.csv b/results/combined/merges_timed/zenria/weed-fs-java-client.csv index eed06355dd..7c0ecc527e 100644 --- a/results/combined/merges_timed/zenria/weed-fs-java-client.csv +++ b/results/combined/merges_timed/zenria/weed-fs-java-client.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,9cb89da92f92cc11798e83769c332241e6a70d47,dc03761289040c0875e3108602f290c8967277ed,b19e89ccdcf91b972a4160ae81456acf548282e2,,True,True,00e8db58db1486806e1bef826b0fd5723fa6c8c8857c616603f9f3975953cd0d,Tests_passed,a3eca0cb6bb9c0c8a8fc7978b5ba76b2b80d8105804d55824eabb903c80cfa02,Tests_passed,True,True,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,0.03885316848754883,0.03927254676818848,0.042862653732299805,0.03614449501037598,0.035462379455566406,0.043630361557006836,0.04184293746948242,0.16144967079162598,0.03888392448425293,0.15730071067810059,0.15686440467834473,0.10970926284790039,0.8189198970794678,0.1863863468170166 +3,refs/heads/master,9cb89da92f92cc11798e83769c332241e6a70d47,dc03761289040c0875e3108602f290c8967277ed,b19e89ccdcf91b972a4160ae81456acf548282e2,,True,True,00e8db58db1486806e1bef826b0fd5723fa6c8c8857c616603f9f3975953cd0d,Tests_passed,a3eca0cb6bb9c0c8a8fc7978b5ba76b2b80d8105804d55824eabb903c80cfa02,Tests_passed,True,True,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,0.03885316848754883,0.03927254676818848,0.042862653732299805,0.03614449501037598,0.035462379455566406,0.043630361557006836,0.04184293746948242,0.16144967079162598,0.03888392448425293,0.15549445152282715,0.15518736839294434,0.10970926284790039,0.8189198970794678,0.1863863468170166 diff --git a/results/combined/merges_timed/zeromq/jeromq.csv b/results/combined/merges_timed/zeromq/jeromq.csv index 8d638a21d9..5b7db6d599 100644 --- a/results/combined/merges_timed/zeromq/jeromq.csv +++ b/results/combined/merges_timed/zeromq/jeromq.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/master,82bbdf0b66f2ebaf8cd845c77dd4762b96982363,c424e02c02e5e8c86082b1de353664bbfd858716,f5c6ecd1da3feb49d3cd6f4dcd53c457b062e519,,True,True,50ca1aa6fbfabbd1446bd4915e1fcbafd586bb322df2649d93a0649bee5281e9,Tests_passed,88af2617aeddca172e8c4087af3e2eff659b15cc2676c915a143040c9483f60e,Tests_passed,True,True,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,0.03474736213684082,0.03959298133850098,0.03258943557739258,0.04714703559875488,0.04834628105163574,0.04756927490234375,0.02677011489868164,0.15631365776062012,0.045981645584106445,0.20098066329956055,0.20315241813659668,0.1132655143737793,1.3718414306640625,0.2251417636871338 +14,refs/heads/master,82bbdf0b66f2ebaf8cd845c77dd4762b96982363,c424e02c02e5e8c86082b1de353664bbfd858716,f5c6ecd1da3feb49d3cd6f4dcd53c457b062e519,,True,True,50ca1aa6fbfabbd1446bd4915e1fcbafd586bb322df2649d93a0649bee5281e9,Tests_passed,88af2617aeddca172e8c4087af3e2eff659b15cc2676c915a143040c9483f60e,Tests_passed,True,True,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,0.03474736213684082,0.03959298133850098,0.03258943557739258,0.04714703559875488,0.04834628105163574,0.04756927490234375,0.02677011489868164,0.15631365776062012,0.045981645584106445,0.19248747825622559,0.19491147994995117,0.1132655143737793,1.3718414306640625,0.2251417636871338 diff --git a/results/combined/merges_timed/zeroturnaround/zt-zip.csv b/results/combined/merges_timed/zeroturnaround/zt-zip.csv index 6414d48319..828f8fcba9 100644 --- a/results/combined/merges_timed/zeroturnaround/zt-zip.csv +++ b/results/combined/merges_timed/zeroturnaround/zt-zip.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -51,refs/remotes/origin/drop-pre-jdk8-versions,ce0ab9ec996a81db498e43e0b8d1c104d5c0f479,e077c8e83048c78c0ac13ff04c22d4098a556a99,6933db74aacfc56f2452061e2360386570228a82,,True,True,48a6dced5edd2be8368cb73d2b2018c9d987796d8ed4eb1ad643440a197e0810,Tests_passed,1bffcf567ab88edab1e9c2117b20a6a3b427c0370e72ac0847e2c082d5196b4e,Tests_passed,True,True,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,c2c96189346997b1ecb29e0c28f52a33bc106076b50f4b4d059288c80e309832,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,5fb96d1ec7ab1b48fd92e74c6e9d630a0fe9b02bfffad8599d0878e920d4841f,Merge_failed,5fb96d1ec7ab1b48fd92e74c6e9d630a0fe9b02bfffad8599d0878e920d4841f,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,1468feb88cf2e0e4579dd002231bd0977e4b201932dc31739a920bb0c46ad0d2,0.04478907585144043,0.02575230598449707,0.03756284713745117,0.039095401763916016,0.044118404388427734,0.03557085990905762,0.036002397537231445,0.11208534240722656,0.05720400810241699,0.09196901321411133,0.08975791931152344,0.10580778121948242,2.287614345550537,0.22187495231628418 +51,refs/remotes/origin/drop-pre-jdk8-versions,ce0ab9ec996a81db498e43e0b8d1c104d5c0f479,e077c8e83048c78c0ac13ff04c22d4098a556a99,6933db74aacfc56f2452061e2360386570228a82,,True,True,48a6dced5edd2be8368cb73d2b2018c9d987796d8ed4eb1ad643440a197e0810,Tests_passed,1bffcf567ab88edab1e9c2117b20a6a3b427c0370e72ac0847e2c082d5196b4e,Tests_passed,True,True,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,c2c96189346997b1ecb29e0c28f52a33bc106076b50f4b4d059288c80e309832,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,5fb96d1ec7ab1b48fd92e74c6e9d630a0fe9b02bfffad8599d0878e920d4841f,Merge_failed,5fb96d1ec7ab1b48fd92e74c6e9d630a0fe9b02bfffad8599d0878e920d4841f,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,1468feb88cf2e0e4579dd002231bd0977e4b201932dc31739a920bb0c46ad0d2,0.04478907585144043,0.02575230598449707,0.03756284713745117,0.039095401763916016,0.044118404388427734,0.03557085990905762,0.036002397537231445,0.11208534240722656,0.05720400810241699,0.09150886535644531,0.09167003631591797,0.10580778121948242,2.287614345550537,0.22187495231628418 diff --git a/results/combined/merges_timed/zextras/openzal.csv b/results/combined/merges_timed/zextras/openzal.csv index decabf5481..0d8b75bdd5 100644 --- a/results/combined/merges_timed/zextras/openzal.csv +++ b/results/combined/merges_timed/zextras/openzal.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -692,refs/remotes/origin/pull/245,31fd311a6e3a8491ecf72c7a6bf8f020aeae7a63,c62df2463b60f8a3b79e7416db8c36ccdee3095b,3a719c8f2950f3b4a4d77c57510fa8a1766ad099,,True,True,a31de397b1eedb12cc7d0ddf0392369ac4cee402a23dffc3135e6e7480be8143,Tests_passed,881d20997458a4282bfbc2faca17e8fda3c3a57fe98ce8d08d77e5bbe8de8de5,Tests_passed,True,True,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,0296a9ae80c06570358dfe8365e3ba9c1f657934599ea08682a0e26b6b6d125b,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,d3278ce295f1022f1392d3c7c22d241fd30f1130fad216161df06fef3c398c27,Merge_failed,d3278ce295f1022f1392d3c7c22d241fd30f1130fad216161df06fef3c398c27,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,7ac826d71842c96c4357e01b9e5bce40b4332c827bb18aad39a5d3461b8b89d6,Merge_failed,1cb11174718b2b634a8d651578725f3616057cf06fd4863d94b2b12568c4eb05,0.010894536972045898,0.02673649787902832,0.031289100646972656,0.011505603790283203,0.030719995498657227,0.031239748001098633,0.030586719512939453,0.07842278480529785,0.03922915458679199,0.1982424259185791,0.19630718231201172,0.12412667274475098,1.292450189590454,0.20476484298706055 +692,refs/remotes/origin/pull/245,31fd311a6e3a8491ecf72c7a6bf8f020aeae7a63,c62df2463b60f8a3b79e7416db8c36ccdee3095b,3a719c8f2950f3b4a4d77c57510fa8a1766ad099,,True,True,a31de397b1eedb12cc7d0ddf0392369ac4cee402a23dffc3135e6e7480be8143,Tests_passed,881d20997458a4282bfbc2faca17e8fda3c3a57fe98ce8d08d77e5bbe8de8de5,Tests_passed,True,True,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,0296a9ae80c06570358dfe8365e3ba9c1f657934599ea08682a0e26b6b6d125b,Merge_failed,a395da6e8401e33ab3c655525710f22abda25d6728c9f11f7c51fbd395c07e63,Merge_failed,d3278ce295f1022f1392d3c7c22d241fd30f1130fad216161df06fef3c398c27,Merge_failed,d3278ce295f1022f1392d3c7c22d241fd30f1130fad216161df06fef3c398c27,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,7ac826d71842c96c4357e01b9e5bce40b4332c827bb18aad39a5d3461b8b89d6,Merge_failed,1cb11174718b2b634a8d651578725f3616057cf06fd4863d94b2b12568c4eb05,0.010894536972045898,0.02673649787902832,0.031289100646972656,0.011505603790283203,0.030719995498657227,0.031239748001098633,0.030586719512939453,0.07842278480529785,0.03922915458679199,0.20686101913452148,0.193098783493042,0.12412667274475098,1.292450189590454,0.20476484298706055 diff --git a/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv b/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv index acc849b846..297c5841d8 100644 --- a/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv +++ b/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,2183475da7a4f5a050c6fc4532e1f13052826dde,4ad42a4a0203c7391f2cf3bb72c2c5f6e4203ae4,0f3909ae5d5ab0939b7efc62fa018a0472055713,,True,True,890b00a3e005a713a0fbc72e5ed456b539291c1e90e440feb7577f923bb62091,Tests_passed,bd233b41fea7dd70fe2c4fcd3515c0dccf504d794824b8032896dbe0c70349f8,Tests_passed,True,True,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,0.03664398193359375,0.0241854190826416,0.04019880294799805,0.04694962501525879,0.025133848190307617,0.04468703269958496,0.03863668441772461,0.1674509048461914,0.04426932334899902,0.1575634479522705,0.1577129364013672,0.09549236297607422,0.7118239402770996,0.19338059425354004 +13,refs/heads/master,2183475da7a4f5a050c6fc4532e1f13052826dde,4ad42a4a0203c7391f2cf3bb72c2c5f6e4203ae4,0f3909ae5d5ab0939b7efc62fa018a0472055713,,True,True,890b00a3e005a713a0fbc72e5ed456b539291c1e90e440feb7577f923bb62091,Tests_passed,bd233b41fea7dd70fe2c4fcd3515c0dccf504d794824b8032896dbe0c70349f8,Tests_passed,True,True,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,0.03664398193359375,0.0241854190826416,0.04019880294799805,0.04694962501525879,0.025133848190307617,0.04468703269958496,0.03863668441772461,0.1674509048461914,0.04426932334899902,0.1552722454071045,0.15543675422668457,0.09549236297607422,0.7118239402770996,0.19338059425354004 diff --git a/results/combined/merges_timed/zhongdj/lifecycle.csv b/results/combined/merges_timed/zhongdj/lifecycle.csv index 00e6171721..a605f97dda 100644 --- a/results/combined/merges_timed/zhongdj/lifecycle.csv +++ b/results/combined/merges_timed/zhongdj/lifecycle.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,2774133dbdaee5039e7f7f21a96a02d2d56dfa29,de6837afbb460ae88d2aa2d580826df2933b151e,9fd474cd1551609c8d62449c15d40b3f40d03454,,True,True,b5a291465d69b1aad03f86c46bebc956dffa1380541490030d96e308a45213f2,Tests_passed,30e7d005cf53167db338ccd86721317803a435af87bee95e9cdc45650dfafed3,Tests_passed,True,True,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,aa8ad9d0755398357318e1f9375172d90dd094f1024b9669189a61f00d54bd2f,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,ae2729a98ad6af94c584c8a3bf553ce795df05ff7f9f2576e35616dbeb7aa7da,Merge_failed,ae2729a98ad6af94c584c8a3bf553ce795df05ff7f9f2576e35616dbeb7aa7da,Merge_failed,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,024f97036a5eac7e7855040f83ec7ec34ea4a2c1b8983f041cb627938ab4afbc,0.0444948673248291,0.05820894241333008,0.04722762107849121,0.04735231399536133,0.06663656234741211,0.05589008331298828,0.053575992584228516,0.32775259017944336,0.07749414443969727,0.4116048812866211,0.41219258308410645,0.2905256748199463,4.437683582305908,0.30559635162353516 +2,refs/heads/master,2774133dbdaee5039e7f7f21a96a02d2d56dfa29,de6837afbb460ae88d2aa2d580826df2933b151e,9fd474cd1551609c8d62449c15d40b3f40d03454,,True,True,b5a291465d69b1aad03f86c46bebc956dffa1380541490030d96e308a45213f2,Tests_passed,30e7d005cf53167db338ccd86721317803a435af87bee95e9cdc45650dfafed3,Tests_passed,True,True,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,aa8ad9d0755398357318e1f9375172d90dd094f1024b9669189a61f00d54bd2f,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,ae2729a98ad6af94c584c8a3bf553ce795df05ff7f9f2576e35616dbeb7aa7da,Merge_failed,ae2729a98ad6af94c584c8a3bf553ce795df05ff7f9f2576e35616dbeb7aa7da,Merge_failed,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,024f97036a5eac7e7855040f83ec7ec34ea4a2c1b8983f041cb627938ab4afbc,0.0444948673248291,0.05820894241333008,0.04722762107849121,0.04735231399536133,0.06663656234741211,0.05589008331298828,0.053575992584228516,0.32775259017944336,0.07749414443969727,0.40888094902038574,0.40836405754089355,0.2905256748199463,4.437683582305908,0.30559635162353516 diff --git a/results/combined/merges_timed/zhuowei/raspberryjuice.csv b/results/combined/merges_timed/zhuowei/raspberryjuice.csv index ce7c084d70..6ed29ca25f 100644 --- a/results/combined/merges_timed/zhuowei/raspberryjuice.csv +++ b/results/combined/merges_timed/zhuowei/raspberryjuice.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -9,refs/heads/master,8c537ab867b5f88945fb3985e05598c96efa70a8,28df7a5c2743b7fa8b43d378be49c84b82e11bfe,4deb15c845662e28d973c26b74650cf092dc0d73,,True,True,1f15ab56b8db882480879fcda00ab6124c0ac91b92a370509a6ec717d6a2869d,Tests_passed,7b3188e3707659936f9b50fc17325e158370b317d6d75506754894b8a7492ad7,Tests_passed,True,True,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,0.0156857967376709,0.0165255069732666,0.018988847732543945,0.019697189331054688,0.019244670867919922,0.018935680389404297,0.019138097763061523,0.0601348876953125,0.01565408706665039,0.17515134811401367,0.17792105674743652,0.12426924705505371,1.60455322265625,0.17778801918029785 +9,refs/heads/master,8c537ab867b5f88945fb3985e05598c96efa70a8,28df7a5c2743b7fa8b43d378be49c84b82e11bfe,4deb15c845662e28d973c26b74650cf092dc0d73,,True,True,1f15ab56b8db882480879fcda00ab6124c0ac91b92a370509a6ec717d6a2869d,Tests_passed,7b3188e3707659936f9b50fc17325e158370b317d6d75506754894b8a7492ad7,Tests_passed,True,True,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,0.0156857967376709,0.0165255069732666,0.018988847732543945,0.019697189331054688,0.019244670867919922,0.018935680389404297,0.019138097763061523,0.0601348876953125,0.01565408706665039,0.17384934425354004,0.17320823669433594,0.12426924705505371,1.60455322265625,0.17778801918029785 diff --git a/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv b/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv index fc6d7993ba..0b5b00b77a 100644 --- a/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv +++ b/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/remotes/origin/heikkij,908be82a20bb82045861412089b7c7e409807de8,ae5e0ab1b02da13f7429822e9a1290bc065942bf,c3e18a0c82c7bbb1c7fa220d3d7a1701e9e1721f,,e0d3707e4773af6228eddf33210cf51aa841f06a32579ddedcf43dc84357e72d,Tests_passed,7941519e8a53fd2f295b6a311a74cc0ada1997d9d148ca1929e59ea415e880a0,Tests_passed,True,True,True,True,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,542a91092a9e81b23bf5cfa4ed624cad722b8034e735dd18d00cc01821781951,Tests_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,5e5188ef80ec2c94ccbcccd1432d015d80328510f92eaea0bf25f51a7945cdba,Merge_failed,5e5188ef80ec2c94ccbcccd1432d015d80328510f92eaea0bf25f51a7945cdba,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Tests_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,0.03672480583190918,0.04035663604736328,0.03165769577026367,0.03134942054748535,0.039823293685913086,0.03998255729675293,0.041176795959472656,0.23372650146484375,0.05182003974914551,0.14917898178100586,0.14938569068908691,0.11052107810974121,0.45059752464294434,0.20978951454162598 +10,refs/remotes/origin/heikkij,908be82a20bb82045861412089b7c7e409807de8,ae5e0ab1b02da13f7429822e9a1290bc065942bf,c3e18a0c82c7bbb1c7fa220d3d7a1701e9e1721f,,e0d3707e4773af6228eddf33210cf51aa841f06a32579ddedcf43dc84357e72d,Tests_passed,7941519e8a53fd2f295b6a311a74cc0ada1997d9d148ca1929e59ea415e880a0,Tests_passed,True,True,True,True,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,542a91092a9e81b23bf5cfa4ed624cad722b8034e735dd18d00cc01821781951,Tests_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,5e5188ef80ec2c94ccbcccd1432d015d80328510f92eaea0bf25f51a7945cdba,Merge_failed,5e5188ef80ec2c94ccbcccd1432d015d80328510f92eaea0bf25f51a7945cdba,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Tests_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,0.03672480583190918,0.04035663604736328,0.03165769577026367,0.03134942054748535,0.039823293685913086,0.03998255729675293,0.041176795959472656,0.23372650146484375,0.05182003974914551,0.1465163230895996,0.14849472045898438,0.11052107810974121,0.45059752464294434,0.20978951454162598 diff --git a/results/combined/merges_timed/zxing/zxing.csv b/results/combined/merges_timed/zxing/zxing.csv index b9c5604804..5fc5d6effc 100644 --- a/results/combined/merges_timed/zxing/zxing.csv +++ b/results/combined/merges_timed/zxing/zxing.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,Tests_passed,True,True,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,63ebc1c73ed31c00778ad59b0933c6e772ca9982af54124d07797caa506d1d0e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,0.06766009330749512,0.05937600135803223,0.05975031852722168,0.08145356178283691,0.07650971412658691,0.05417585372924805,0.05770254135131836,0.46178340911865234,0.22607040405273438,0.5042908191680908,0.5041561126708984,0.21402740478515625,0.07382321357727051,1.4866154193878174 +89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,Tests_passed,True,True,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,63ebc1c73ed31c00778ad59b0933c6e772ca9982af54124d07797caa506d1d0e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,0.06766009330749512,0.05937600135803223,0.05975031852722168,0.08145356178283691,0.07650971412658691,0.05417585372924805,0.05770254135131836,0.46178340911865234,0.22607040405273438,0.510453462600708,0.5034139156341553,0.21402740478515625,0.07382321357727051,1.4866154193878174 diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf index 77b20b536fb1c4975f65378b5ed43b7552202131..f76a4ea6d33bf61f886c4c28c8d65df2042ffb6b 100644 GIT binary patch delta 2721 zcmV;S3SRZgn*z+60+1yEIFmpMD1XhHNpl-F7J%>k6@8RyiZC8_U&VzHl^|f{0q|Qf<{^@Ev zIW$wIKY(p4v5KkY?!(C3-TUU3D|-Fw-H$_S{r+y=wVS47?50Alfnr5w z#bt7B4Yn9vCD)y*Vy;tjKG$q6*Av&`Tu+Tv$+a{DEZ7S*Y>?QcSbtk3+r6%0x<>|m zzQtU=r{2X0&)BPxaR!n|DHXd+#u;!zQF)Dw_qvK19~tx+S92MkdKYIrW3NiaH6s=b zmY~Q-f{FXGhMddr8Wt25Y1|Gi9wh zDa6?og*szrud6&QObxavpB+4>?j`Vy=x!_JG>VHI@Evg)c-Vg)By1&4C1 zlG1vt0N()>?0+JU7T{o`D&Y#cW^r{@D&b-$a0Q2QxRTO}xGW{0sJI9%qlmLn2Uk!w z&#S9b2^c>GEVz^3QQW0n?IWM%|m zTA+zbFf-1bI>dTa^SpeGO0?uDTD?12R#9QaJ?>#w{eJ?aIMc*PS%+1mY?fAErxGu9 zf>-2Hj#yfJ-h#-sU9Fq2Q}^_&`h>0Htev?evR%&{v}M*rsYM_6_y4BApAX&2=jZMF zPn(zB^V96gX5w_Rw3&J_WMg{NA}A2aajnuY3%IW0+(yS^p~Z85;KbX5HDDkWCIxjV z_o{KFZhz9_DH9)0F>D3K@ZoiMLNp`jCSZxe^**Q8rsq{|t;ZzgIz6yT#J5$00~eMx z_yJv%!WN&5k`VZd@>X+?w)+>F8k6icJkD6Cj~Tbr3?QlNth#|d{}*?ulW zhYMt8Bn;8@@CwoXzd*!LxMdC{NO#!fUY*V*Eq}CscNR``nz^|5v*OwTN^GLmwN-p! z?hzCK`jw4!4j(5tCloNo7m2G!CoFYQagMDNUlAg}U({It`e==H+j&uUs;GW_cZxsL z(1fO(O+y>RwL|N>()9I}%@qA$l8u9N&j1%@99$%>9h~l3XZ!47CxfFmuiZ*D;W(T_ z8h9&- zGiS9@jn*~B>mx(4QbLVF%Spf9bmj|Mr_sc6baK=>4Z$aZkA}lo`n4xFr+ZLNCE>;> zKRhsofQ+?}^2Tnrhh9^%MrFn`o*!aAvSP}TpZg!_bZmsnt5>EI(9uG5v)==lqC**kDcHBXN)A7^jfRq;A|&F_mf5AL1eb?)k-Z=Rd` zq^523c=5?YzwpB#^_LYb`sikmom86kNPiV0 zuwLe_z=>XF{lW_rXRO({SUV}l1qy~MyH#5MeRs(~DaqZYPH%@Z<+Flz29G+K*BQJY zq^<)|*l#c9>F0?Oyyj_}Xm&&E3M7`kGwB$XLHAGOM!D5z(U9*o@YY(i)^GtysL67LGLBh+4FQ zwgRoL(uCG}_we+5*d9OLZ?-4N1xtByNqPBcyVzb%0Lm;SR=BPr1{$OZ(0@d{6sVg; zVpm!TXryf(XkRG>df0A09ge&ITr+dEUH`T_zC1r1?jKKqjVxxtrsYMjRky7omKv8? zRtuf79Hc4BSiG2}#`%MlwO9si1(sc<63YdTX=F1`Gbu09thYxOp;Tx>a*>XTL7JkB z#fwo&oJCe6IVdZDZ0nRbK7a0>c8~Y_lMDxId4zFsnc&6tAtR!~T}A6Q3I?FPFy$FZ z7vuDQfuw5j4B84nyGli(*Gymi*S|j;PjU@b^I((ma!*@p&ou(cB~F zE5Quf3NX7$9_DxNf5+*~lY{v3w=-6fk%c_Sq`U~S>fu0O2bSZ=n}F*?3AG?wiVTb; zrrN?k(l(E*uhd?Ke}DXVjmv{8q;)(8S!5xLEG@6PVRKH$=`PiCBW=3O2-1{VEM5#w zOX8YKC2&Do0bExp3vS5*BeIr^?z?xDf>ZNA^lw? zpZ}lkJ%CU5`!)8Cse`b4dN_$87|L@<%5VHx?@cpk^v>ZD7as&GCG+=vnI=NJ=_O88 zjG6gMqyGV3DA4q??+GG&2RSk@GB`3blNg572RSk@GB`3bv-5`J1wuqQMKm`>K}AF{ zHA6NzK{YT%MnghHGc!XsK{Z4~GDbciJVZG~G&e;-MMN<*LpC`-z26LGEsDWx|geDLH5(z1FQUZ*Fr`cd7eNNsZLk`(>h#FE; z7q>%#4lQ~NC{Q9;aPe2!vc}f7J+Tc&OqlI_W%sThSda&M3T19&b98cLVQmU!Ze(v_ bY6^37VRCeMa%E-;Gc`FjHVP#rMNdWw+xI7y delta 2693 zcmV;03VQX-n*z(50+1yEHb}0Q3w*n}>!r?^bm5`e%c0-!=a8 ziV|*(Y(Bepv~fQ|QDUf+4HuFqDwJvt+h+BzX7$vx-~G}3`n_2}=`S$$|$H>VuI{`lWH^5)~ihj0J>9m@T` z=HZw)CpbYPMm5|Lsf`xiO*BraG$Kg%iIfB3oIxudG~}g`hKcjwoNs+?oj0lTk)waQ z-cAn9RQKl5bqI-ezt@~dN`IL~!*81#Z??DGs}GiA?UY!p8m0(Hjha``sdYc``_^bs z((4^GtvglgpzH13>dg;e8%wNWs=50xGI#gB`Q?gU|9bc1Fj~LAn|JM|DH*$|kZYjW zky&w>Tw8-9Mpwyor>dCi)SS;Xo6GgYwK&&PV^wl34FL=GLIWElPJb!ZR>^j+tC;SQ zL7#6im+z@}al$k9YGj;&BvMMnE|YNvoKRF=BjdfUV#Y@Xea6*X#;4xJ8PC|Ol5x$5 z1q0?n8P}8uChBCo(^bxRYS3rg%w~MzU6S#sy&4(koDycJ=9kGhXOb{0t7N>_Rm}Lv zpwBqWE}2vJ;*@6$R)0yk(L@Q(E;PuwVMNI~%Vw{uobuFQoATL}bLw7_@~OcZDbH+K zt8NN$cSWJj+S%(WZwpg{ZOUgCOK&Twk*>^+0F1gL6&5&haNL#Jvz=*sLE5_3N2 ze?D!V4~OmM<$BFIzk1vr9=6wOxH`6yPtRDZCGTv~vOjjDtz=$ggVb*Y4loxl|w%Hc{{E8?=0fTH3ew2UIoMjc#1 z**veVPbFad6tLh@mRQnU4;kZ{Fwp8E%oyiHi%OSRq->U1-=`8Yae`UoQjS^LT#=a( zglT~$F2T$=cj^%9Rn7DAJu1jFfd)MapJr^?fSw zQYUytF6D@&&F2+Fww-F-hMl^rXVoWc9cS&#lE`*5bI_KliBgL`?(hFifj=L*%ID|p z`%jyf-Sg9IWixR)DQ%`+4B41IY7rEO3>TPo3fBquz_R^Z zhz<*6W+V*J_3#SO{=Y!PP`G6dB}n(M%e^|COMgaa|L!cD=rnV2?`Ore1C%&KtsATO z!rUb&0Q4&d>l{8#a8D>;j4u*bk4{+XqT(D!DZU~^fWK(4{`Jus>u%>o)2X8R_0uW- zOhXfzayAWZ5Z4Z^pGwo$R}NG3gGn|H&Rqjsm~n8CxOQ;58=dX7hm#Dh-n{lG)r8}6 z4u5I1xZS71s8O)7w05kt8>6^*Q1@yuNJs^-DT z;UP-m;~?G7Ne3U>{2)@)p?os?sVg5k=pPV2w#ju|K=xx1~?+u=<4te~C2qfX{^2JZ){ zn?MxK8;ptQ>rMnxN*Qs>quMX@Wsfa zzX9}a_u`*~uiZ_cxpNp(Uz39v8S6JiW>s!=M6@UlHlsD9v<7KPD;6)Ng)0p=q86>7 ztw5{mG@-TLJv==hw#Se6o9#(*!BU=F(q6vWE_OF30Cl@lE8J8O0}avyXn!JJ3e@c) zaVo6@G}1N?wC|JxJ#06h4#(Ypu9>;ou7BGdU!ETh_m8K*Mi#SR)Al0RsyD78mRb>O zHC7r4%R!p5jKzytYTQ3qS&L=RR$$q6DzRK}nMOAAG?Vrs&3bp~B9sbENG{S$kZqq5$A8D&)9&$pf0E%~Esrp6E)%@ioydr&aEH;bPXe?TraU9* zVx0bOkW?+6L0bW6*QrSKn(3?m`uB(9Nv^?a9&FNHo@r~{b&WuBiCbpDMl0qZO;N_; z#VoN1QwnOa4B84TyG|vRAMamw+ov<8*kCY^F=;Pitapbw;>dt7uzw&^j)OGi7>gHk z1Wh#5Dm)@>1&&>(F~{TczNL5)Ua*pfm$Vn*UG5Hg1e0pQv;>yI9Hc4CSiBe}! zN-%@A0?e+Hhxy(6-*J2M2EeLN7@f#taJCg3_zLM_OaA_HTI zsaE($+UAkF;! zByPA=0vEIuz;&In;Fc5^k+nR;q`lG|oG+L;K}jM6HEE?0q$$l^gax|JWhA^-unfQBJ`N%JcA&_Nq5=&e(y11RN2{q&MM$G=D`Fix(pkn%HV}ex$8{ ztn1{F-S*etA18?g-Fae3d)2!$XU&;hV=W3QEgFI}MHY(}BjWHhG` z?@PA({qDT$Y|x*F7B@$ax6XRR7$x7G9i{FFYLfgxnkGLMFHSzA{x8ldWj|;uq`&Lr z^Z(Pm2k_~B-!z^wbr5z>4<|7MLwOEK`;C9rd(#XWy>nRN;)P(PWd6i2(?n>uy~M4G zF*AQ_^gn$M(O$Fg2_k$4H8C_XFf%lh8HUscH8C_XFf%l>^oHaGLN+)yK{hi+H83|Z zG(|ZuLq$YEH#RUgH9JZ))T9m)c^)gxSYmzBWBq#0Pbgq>Ug5H3}sqMNdWw5db~0 diff --git a/results/combined/plots/all/cost_with_manual.pgf b/results/combined/plots/all/cost_with_manual.pgf index 170d67438e..347e8ee59a 100644 --- a/results/combined/plots/all/cost_with_manual.pgf +++ b/results/combined/plots/all/cost_with_manual.pgf @@ -596,9 +596,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{3.000000pt}{3.000000pt}}{3.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.704750in}}% -\pgfpathlineto{\pgfqpoint{4.068314in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.068314in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.706914in}}% +\pgfpathlineto{\pgfqpoint{4.086645in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.086645in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -611,9 +611,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{11.100000pt}{4.800000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.716653in}}% -\pgfpathlineto{\pgfqpoint{4.039874in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.039874in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.718817in}}% +\pgfpathlineto{\pgfqpoint{4.057817in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.057817in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% diff --git a/results/combined/plots/all/cost_without_manual.pdf b/results/combined/plots/all/cost_without_manual.pdf index 275c087b65b0a8f56882eb9099188f41e3d14e81..c7d402652a4ec321ce55187c8d77a23a12606309 100644 GIT binary patch delta 2490 zcmV;r2}SningZsU0+3LDNpmB&6@c&j6*x+jA_n`CQ#>hq5?AFQOI1ENKBzbxnKmVj zDLJnE`@Dx<0CWRQ(gHo1DXGZ^^xHn{-D2c{F!Eu=Cf8pHeEdMd_Z6ekJ57GaPmJJ? zGK@N=HIYhF!;~@PuqCVS$?A!8_kN4NekLnU@c-eVyZ84&@Ez!X{(<}$lzohPAIWM| zjojUNYyDq+rAuB0bgC zSryy_e<~&E|J6}8JUG9A1=&x8C<($lQZyvEiOf>#p zOR5$$Nexz>(y&;5lOHrFtuc;6)3gRaGYbWaS1e5+c%=ia3WFW765 zaltj!S{rehj0-L)1LZ9;KImG^_{3nyxT$4)?p>Pkg1sggw}N`^xVuosEu%`PHW}}A zEoVG87&7jv8J~HVWqfY0MaHFMR5)hkWil>>ro!tc86R{lW_)5WWSm#0%(;7M$_oaY zq}*9*loS_#YUI)hYIK`vbI`S%^4wsT^6JbvcP~r%++d587nZC|7lp98V!X}VIp|tm z7Ul-KlvgLuxqI2laBlGAHG}n(Gefwb_N_~XUe$WkRah}(=0ec_eA+x84%^M^^;$}K z^|(DeY_He+>ZSX>d4B0jKHYC#pAVR!ci#w+Diw-SVf0Qtg_N}tT=q)Oo@wh zEe?}^jcJ4{>Z;=Et2DwTj^K(8m2hRH4RLu!xnb%ew49-6qYbX8tj?>i(+HS61}wT% zB$gGoLnfr9f?IPDWNH}ejxbAHDlyB88!~f>3ah}xC73yMrwy?| zRh?I;(TJ8lMr&}V$SNspc*Z@Rs$YPV6qY)Ft=q6llvQaBbsF(9M|dSJm5AlVr)`LQ zH`L;Sonh};4GCMPSvzq{>*ZAaFaucf&IQ@-sjJ&aIYsclQw@~m5Fbg2FEch@8Ao#sFh!cibD(0 z4q7klN1foJ6qYqqIVIgBEDmDrteJ$Bif>ypvqCFy(7-%_4=lUy3(>&_Svbwd=mvNT z(f+?cgixdxh>~l3*o9Zrc}@!*KAnVr6Py+p_r5A_9iWCL>anfDMPL_HoZB}x)*3!Z zVNIy`6kj549-Z>}=YLXT{qv)B9*^^q;nXnu_TdzM=AkLeq?m^`id%;^ z45j(?jm;GN5L!%w!#*IDn+BJNTL)+R*4gzv7-V4fmaSWfak8w{w%z#4_QFrY#wr$XVQL@m8E?2bG6Ksipbc{`muc|HWf6FhU72hvASM&Vw;A8cTwkBQ|U!nWM znn(9e@VfL`U_igQ&(QPGYDC{^$naBdDWhK+M?R|rQ3_-0+dOwva)aZ+AjLM1yGxCy z6ulJMGEA|OTkskJ5egsB3?faG!CFF)4fdBoDipecbND`r6^NmQN+TS9iDpm+JqvFd z9U5c?wT{k5DYjpav$4_1{jeQ|?8Cw;n(0I?@dp$R!qN5pAcK3y5Jv-J9_Crxlv3Nh zH~D^krgWJdwic+vLyQszG|VWlH7K+&oQ%SK7#=`~IuhaSiRUOT#0j^;xaR%a4xoBn z>qOc77-eEG9HV^Ly@uz1$!k1Hshpk69ZkQdb0HIC>X_RJ^Qt7#v zI3ARlMwp_qI;OtP4AXk|@brAxzI?vlY>y#}c8bWd;^oeDv7?Ykl37^oNUd^`qckI# zO3x+9B=xX0ZbLFEtCQ^OP^~07hkXfPI}MfRDSU-Q)fK7`$k$2rnyMhIg?uy9m?h&_?q4 zF-kL>sq|c)pc{{W;M(wv%IZA(I*UB7g}wT3_<2Z6*?Bb%1@HDZrQKeTVNDwP>SAEh}Dsq;|QJt# zFcF@M5cc*srM5vBmDLgUbppb#KK=}=mnTH``j_K-!bE=&Usk+`ujyfVB*r}6=1q=l zlxECQ>ABFDp{<6^K~)`CsL{O|{`mQN4Xl9F%PF`9-9=bQVbg<_6UIlcaU<&UUBf6$ zDW$?QA$b9RyMNt=Qq)z&)K@8TI%BI4EtQ~UrHu|<&L0>Z$6cq(=nb+IULre_oy8|1 zjdlxBSCw5~C9wO)4nVE{75?gC8C6tVLY0*^J#0C?fHW5OlQ!Q3jKUOADm;^sQQ^{r zQPfps)K>|NZinvm%MnCTZwXOW+Vu3~gfUPn+%}p^e5x9SDWg<)CL;}-&Q`nbsH@7T zuhRb+Q&?4O_xs%`ohfQBk;+PM!o$EDGHMI{2!~nsT8r?~q_9+3N!9{pdFLvBuJJ#f z)=ez4i3uWn2RSk@GB`3ald^@>2RSk@GB`3avyF!21w%D9G%_w}7>6(*GA zkjkd^-*5N40L%bGjs?cCOCs3-`}JV}G-kxe17YOdij7`>C-C+iX+EzQmELLcC%$6@ zf0SX=F|CPIni{5zA%`tl{X|wzr2Xy>`0H1);spO69@_8z*$aMu1l>QA_l>d-LGL43 z4XW|;KKdL??b|O*1l>1&A*+vMb#uxQ=nwzVkvE?nK7RGDuR-4YBM-;KIVC9=afV1w zwRKiCZh~>fv{OO4Po$DlDFtuEgND2`(lBwJqw}q=t@AE*K63PT?2U3xrn)ze*dZhu zf3GFgj0p>d-;$eu#%yo7S060L+8OoM5Me0S7BsJTrxt(W_pQ;Oq}MxWT6e0}LD$>6 z)thg*C!TsE47vL_GI#fZ{Cvf(-{1W(jMi`N%C6mzIb$~!a?KfZ6kc5>*WSU1u~l;2 zshZ7oYOcw(DCK(MTAb^tu`0RNj&jfag$6d)Fr|23CELA!uGw^t3^w^zrF>7lixZx) zS0m$sYpS(2;xZW*Tv7(gYh=9FHJkB~!6xITl<}!|amF+Ds$|>>>bc|YLK(M=DxvCR zywf$G@zh|GaaYXv#JeQpQ+qWsE+wPFF)J^VaVazvURTL@uWL5rBZE!Gd2z{{x)-NB zW3Wofoux*9NpYb;E}fu8*I71uUGphV4YnySuAEc%l9W#k)<}6~%UX3)2)irB>#Uu< zuK8_YYOqataq*nGm+TCu2G8CzSWh`KgbQk4yJhH9tp{D19YbQS3Htk|&GX@~-Mn0{ zrIc5X+rz{5dd;tn?dQ$&v1|Ewzj=8+V20j&D@3e+R48h(=4uuGR@{M%V@)<76Yp8_JZu1S>CK@{)B}1zkl}U6)F%_z70Qp&YBEwH_-D?>JN9 zB9|6_hsDNJ!WDECadllP;Swis1&4CDlGcj2Jfqw&brD+5P_$78S5Q{w)%B?aOr8Q3 zT*?wln(HAG(o(^#xd<~MCAF&3B^D_wGVA+PVx~?oi(JYvOPeb)bBYS9z{Dk(IdrEE zv0hb~SJR^sEq#hs?@pFg)L8M1dpK3U04XVdEOlDfVHGJW((3zE;$=?oid@POOPkLt zha-LWJi~S4ruk+hbwG%jSlYY;UY_!L@;;fG&ft7Akd@-kx%Q z@$D%Aqrf>iybf206%^d$&|;w8m(2V0eihbwLNjU88&-+}LOtpP7rC&kp~@-gMqzOfYiG?UtXO0 zNeX*H#mD#}arNkwXBd@~FiPPSAaec}4c5OtTIcaNFPcsbv#*~{;b$6}vP_C;XoI+R zX#G^0zP@spf*(SQad3DINae=CMdI4Q*=}^U*B(qVuzJhdqtsFf%Q;V@h3!6nQ_hTn zjit3?W!)Hs#e?CigODpssK$UstXm*F;h~Fw5{XC$`#2mZ`;zqb3-4&o8mE>T2JW}9 zfdYusj$+G6zuboAGsdU0)Jt%3G(H`LYeJ3|#8~>Jw>PKfP{}lv&Y5;>3IOE1=PAFe z^h@t$&KjH0CKxj#Y`9_3R*$fMMbaTQF+8j`R{`fAN6S88wp8=<2H|7znYJokXCI>b zY|VpvXLy}^Ft9X~G|qfh38ECn){S}YsN@FcgIEI14dwa*;ovuon)l?|T`1cL;GXFyvvH#Z4}? z?UR#lr>9Dnsj;;{9UfwoFri^afvrKIh3RAv?wjcWgs3AD-ky1q;+i<&t1z#5|GFcn zPS-k8Ha$og8Eg(x-tAt0nmfvCJWMH^o=hE$Pfs$YZ)QnVIWP!}1WW);p9In%O(@0E zrI;kf(nwQyJ4^)I{Q%k#s3;r{Uy(O@r2G-;kC zTJ^wZfXF>A*j~#7VvxoV6X`;T++mt+9f*;#BE-JW9K`c4%*bL6W7<56vEH#(U}#~# zCRBPI4#I?BBwPy68p?2!Qw3m9RtDJhnFIK^d)htT?@z%C*0S)D=6QG*JGBcijc&$B zx;_SJf-{ybG49dy~yFLxVuRr_>yO$?K_wtX^HDRPbi!W)O#aH#XJP>0ZzvfMf zY>+0*V(C(7%+OlXX0NIYtm)A{9RB#}dJU|A)bSi#z3wcmsIlrn%Ng^d*I0=9v}zcH zF{N0z5Rw;vQ2pyVl!C4zrmjnt(}GeVSjs_5S}Ps8ET0%1$EwpM^mo5M->$3P$jKZ4_i)eAdSU((xyegAdC^k!i9{CYF?@^ z3c8Anx-Jc)+y3(U?F6ErH-{)`t$KQL#vG^>mW?J$U8)9Q%qSKvWTc_!tW|XfT}4J+ zm+lXlnq9?qzu%p6F$L{8Qc3Ggb2IRU4B8rhgu|?Rtwr2Q@J?F)%YTvyF!21w%PFHZd?WGd4FhK}10`IYKo; zMKwf2G&w~zG%z+WIYT}mJUKWvF)%YTHa9gvL_st;LN!7~HAF)+IYl)zFg7qbLzA?O EvKySg6951J diff --git a/results/combined/plots/all/cost_without_manual.pgf b/results/combined/plots/all/cost_without_manual.pgf index f3a4eee13c..d303f1337f 100644 --- a/results/combined/plots/all/cost_without_manual.pgf +++ b/results/combined/plots/all/cost_without_manual.pgf @@ -596,9 +596,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{3.000000pt}{3.000000pt}}{3.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.704750in}}% -\pgfpathlineto{\pgfqpoint{4.068314in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.068314in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.706914in}}% +\pgfpathlineto{\pgfqpoint{4.086645in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.086645in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -611,9 +611,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{11.100000pt}{4.800000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.716653in}}% -\pgfpathlineto{\pgfqpoint{4.039874in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.039874in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.718817in}}% +\pgfpathlineto{\pgfqpoint{4.057817in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.057817in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% diff --git a/results/combined/plots/all/heatmap.pdf b/results/combined/plots/all/heatmap.pdf index edb6e9f91db53aea810163bbbe904c97b24d22db..ff3d707b7b6b3dd3c6aae0b28619cdaa423f43d9 100644 GIT binary patch delta 2087 zcmah}dpr|rA3sMi$7ROmS_dPy=wNeO2elg$2h+h(W4&@jk+W4Ub6GkubaGp=T!v)| zQ;EpIwltSsN+Pl$DVL~Bb2s(QdEfqiKcDB1=kxu2pXc}eU7G}QEdse*6FDas{cOB> zy-%kGwUTWxc6BPP|6|t|htSo)wf;jUNpE(FT9>T zch*1iyV{0A&N8whA+gwjdb%mul6 z3)G<{0R0w1Shl(e)GO7!jj7#nmC|ME(E#a0LJ|QQ_WLgr2hh|2%^)@{D&J1+5V>U) z6r#}qNfIn1K*wrmoP0YUJVfvU4YO>I9J&p+HxdEqP*@_W{c+juB}#=^pz zSP=!430W+|fULjsK~?6ce|(t>_eEZ3Ic207S$d)v<%$wYh+^|M=5R>m5fp=^xJ0G6 zDQ?B-HhoJ>O7>-@MWrp;q-4_>`TWE!Gr)26Mus&=mJxGjHZGV+6{S%(Mo&aF zj0EpqeZLmW(f&nx-tSsSyt)qdb^P~-s4EhUD~DqQ&rQV*Dp(}vN_R5p7}EE0yvx_A zD{heJ#flz32mn8i!9AzW^;*x{G@f2}Q;9xz(F%Rn7FP2jO6~w>*z}UG$X=IoTs@`it^6ZN?WUGdGmnQSeJz3kfMKkQPN@vm(nW zbln#_wbb_)dc#^Ps_R)O_plE{(C6bWp)06T&Gznm2JDT$TWl)})J7I)%}LzzKe%}Z zT^{)!a#|XV$_;s{t&??$vA|%x{yrU}%8N2vp@er0*hUIfQ8NFsYA9p#nGdS)k3HPy zS5_bv7NrjYR1OSFc4MLMPK8CbOUc;X-g#}IK^|I%C?l>hI@r^^&Vi25GUHi$!L<7WneQ)SYp3c&b zg@JtHEX02@2A*pr?U^o0#+R&t#OilxZ|?rADTBB4g4XkT?YF8P7Nhv?ZTjiFPpDs0 zc^`wq-njqND<0HYD$Nh%Q;BgpHT>7B#`nd>g_cRj$K;`t#vwT!uVd9t^Ixy&k;Nwq zuN2Kp{|MacIO~rNg8bcRhG4DhhyisvYhLb4E9e8Oyxzc?g%;fxpvAc^Z=*Z= zDIAA>S!D-qwn5MtgA!W89^1y!J5ON{K;9w}*E5$oaZqYycH;O_gZ{mz60kgJ+1Hxd z37T4#)=vbe)OANmWX;;=a@(@>16vW5#B>#jvdX3(MlJWs8iCLfWtFcCMKjCIGcpYydjgUzE`iEsb2gidB3u%S&CHdI zi2U5#fw$ZX>p`c^TwNaxPYg<78B&Mouw+uUhio|N?(KP*!HRZcu+5c1lhggQXDfDN zGe*E*+keeI_~HPmn~}&?hn2E@KC{LY`MCP@{Ib|9m^8fP?p8YHm24YuShgk$tLJV| z^o&a~t3rIvgW}v{362Yf|LxH}D{!fCE45`4?b|P7xUnAx zsm*a^{J8qlpG?VBk{lBp;I~N2v)OtFq=gZyu!wC?<9-XqJK^flh44!e3Jzb$i3zQ1 zi@H_3UxgFG_kPuvHIC;zon4Hv?!!H6eUiIH+8iV;H)|vI#I218S6{}sleT6Jh};$4 zS${59tHR>Ts*nmMhSajdQ_guVa~wa96^{JW^eMG|x%Z4QZG&0trX5QV5Q94spH|up z{)jIXzc*>B(RkBpTO^(?+UQJc!)=_^VDC*L9~M?oA=&ovRCS#Emykj(JFtua1-~c11iZJVOnC*1PR|FOv*(z0;l0eG5xs zAN#{~IZ7w}8^iS3bZQD$gh2od0^bo3TSD{EixO{-F3Ss&ajhro0 zDtHh5O*-y|1PqpuuCucxva4b8vry)%5+C=~YW&?AA!RTL$hQ8e!gvG(~ zXnO}c7#!h%aj=J@PzVeh1H(EZ(X!)U2S++#P_Bl~|BphaRJeK5>Szjc-{~PyM&(6y zskz>Ku=94k0)K(8w(lB_e=hY1u=u5Vnfb@qPP*Ue>dH6k%|xrr%92=-?yRWj+;)(1 eB%99cRt-^e)&95A4LXozsA#8TVuJN?Q~D2o!s`S8 delta 2100 zcmah}dpy%^A1+x&2Xo9Jh44&dRFgwnJ#y+Gjr^iv4aH+oX~UcxP||Gxj-pYMI$*Y*8gpX>hCwnc?1jNbeQpG#;#^KMWdk&Of zdJJ*r^$vY_g8Oqupx6#qjFXZ#Kh^8nxMxnQ&%Jt$&3z)w96Yf(Vd~{q$M8?mrf>a~Rgq2tJuP$vt6zVffO$Y{tmWI+Ft(JeJz{l*jDo>0~W!vN+k zC@BfLqOJ40$eXiK9}PEPD+vex6;IlZKC*R9)2K%#$OO3T=0D;BmKxI6YQVf03)F)V zwxkguDf#v~ggXk+2rxI%*=X1OkWduZha*SlCPx)fD^PugV&V3&L_~(n_;F#TAM)5| ztvnrO>zz~2>=0yvF=+219s{o7X_f0ReH1|z!c0sK!5AqwvD^TOK)&CP5-1|!WPR5n zCm=aWgQUzHCei%Rwepm9`(KKaDlg&a!Ou5Hh zg2;M4%t1Xpde(o#m;>n>~yyMtc|!$fDyd)QgV`Kq)lMnM0*k?p|upy){HF1k#qudGzC09QQgxz7K`}WqKdWRhiEemwU1O}^-l|;{An!*RrJjgE z#hjda)_w79z=O*{$FViUxy~CNd)ap%OT^`Mgou$ zu1|5^7^U5J4sN@83bPrY06xBnP0YhD`1^9hR=RAAB;(s=gG94vq>_lua8ee3A|^wB zz7)cjqomh!e$T($xQC8Q%H8ZF9vMD7#OCx1Jzh<3ixYjW(^HKRK94sQTiug4j zZmRKD8&h_#4NucbYYpe4IDC^04x24vj&I-%4kd;@Fpv2!_x=W%HTO!~xU&%}D^Lk1 z^RtukmS++`|KtW5lz^?Kye9TY>`A2~db&M7j|FB-kH0ZueaW7sxTGKcv=8IqmPG#1 z+2-sz9#UEGGmb5`&>gD$o3CsE0t+yC+goGPsy_nN-8lN z@h*mA(S_cP7zc!=@}~HXnw{{jis56DPs<_%l1R9lq$=jnr=xNNku5M#qXeHFVcWvJ zAYUa?2(O9^>_rzLg<#uB$G27=OVY0OEq2E{?gUjNa+bzg^VS*fH{|zG}b?ffcQM0<|liJ^T@?&9o zCHLovJc0+T!tXBlW5#;|jMWV@ngWoWSF@qhoJld+Qub2@dYSq1eK z&-~{pLHFI3JQXf~lJqc)SqJAaKwR{MY|F8UcuS{Cj8mqUF!S6*ck(5EwB0)!`vW9{ z!6ZQ;uGQH07a-b5Rw($O*J&+!rOoXeVL83s`tYjjLCoX4g=&n;>)fN*mM%(s4RLXY z{Zp6KX8#2}+=1chlv|8)#A-zPOk6FNN+QR_o>4fvJKlC*ZeA~X>dN7&`jynrtAney zmQl2!44=P8sEjBVQ~Sm<5od-1f-`1*Y?{rF8LY&qk#9(uo0ypxo0?`zz&%b~(V2rhY%Mg>!`?CGV=ksXeTlI>;k>kYnm6Q2H-@`=Zv^upERpx_&NQ5YDV! h|1-I&57jfdl`gecAwniGTaKm)Hj&ZQMS3{N{0B8x4730M diff --git a/results/combined/plots/all/heatmap.pgf b/results/combined/plots/all/heatmap.pgf index 72f918f2bb..69c7ee7925 100644 --- a/results/combined/plots/all/heatmap.pgf +++ b/results/combined/plots/all/heatmap.pgf @@ -4384,55 +4384,55 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.297306in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1129}}% +\pgftext[x=2.297306in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1128}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.623935in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1691}}% +\pgftext[x=2.623935in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1690}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.950564in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1129}}% +\pgftext[x=2.950564in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1128}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.277193in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1690}}% +\pgftext[x=3.277193in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1689}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.603822in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1134}}% +\pgftext[x=3.603822in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1133}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.930452in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1134}}% +\pgftext[x=3.930452in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1133}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.257081in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1136}}% +\pgftext[x=4.257081in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1135}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.583710in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1155}}% +\pgftext[x=4.583710in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1154}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.910339in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1136}}% +\pgftext[x=4.910339in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1135}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% @@ -4444,55 +4444,55 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.297306in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1157}}% +\pgftext[x=2.297306in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1156}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.623935in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1672}}% +\pgftext[x=2.623935in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1671}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.950564in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1157}}% +\pgftext[x=2.950564in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1156}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.277193in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1671}}% +\pgftext[x=3.277193in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1670}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.603822in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1162}}% +\pgftext[x=3.603822in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1161}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.930452in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1162}}% +\pgftext[x=3.930452in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1161}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.257081in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1164}}% +\pgftext[x=4.257081in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1163}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.583710in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1183}}% +\pgftext[x=4.583710in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1182}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.910339in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1165}}% +\pgftext[x=4.910339in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1164}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% @@ -4564,13 +4564,13 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.236968in,y=2.415333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1401}}% +\pgftext[x=5.236968in,y=2.415333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1400}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.563597in,y=2.415333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1425}}% +\pgftext[x=5.563597in,y=2.415333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1424}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% @@ -4714,13 +4714,13 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.236968in,y=1.818000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1137}}% +\pgftext[x=5.236968in,y=1.818000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1136}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.563597in,y=1.818000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1166}}% +\pgftext[x=5.563597in,y=1.818000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1165}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% diff --git a/results/combined/plots/git/cost_with_manual.pdf b/results/combined/plots/git/cost_with_manual.pdf index 1c951d96cfc31f591447db3e80434f12cad1126b..f237f369b53861187115ef3baf94d3e4a7958d73 100644 GIT binary patch delta 106 zcmbQ*%QUr@X~VNRc1t4zBMT#w$#3hfz}TBl)L&D=byrxOO^sa)%}tF>EiBE=-5kw~EnLl= ZT+NJ)fWoeh#;zuI3O0n4Om1q~2mpr(9f<${ delta 106 zcmdno#k9GLX+vi%yQ!gxp@FgKD=byrxO%`Ge(olKmKES((Sz}TC;I=xt(Tr6Ep%v~K_T?|c~%`6>F4P4!v aom`ELoy{FhU0jUZ>=bMWD4Be%Z#Mu(v>mJf delta 105 zcmbO@pK0QJrVSY#?52h$h6ctalk+>Sz}TC;I=xt(%q+|t&5Yel4a^NqTrCZpU0oc_ a%?!*<9i2^G%`Gk5>=bMWD4Be%Z#MuUz8u^D diff --git a/results/combined/plots/tools/cost_with_manual.pdf b/results/combined/plots/tools/cost_with_manual.pdf index de5e5092208df7364d14dbbe0518d8ca2ee978a8..7c3e0a3dca262481ff185f5d1e9f560a20addc0d 100644 GIT binary patch delta 2244 zcmV;#2s`)dk^Xz%!sEIyOPYM&!mAAh|gFTUM;{^QS=C=Wm6=6^AB zP6~=ftR})yWvr3GO*GD!vNB4ynN)Bp1n@@OYbZ+-4I}5dcfRqpao*<6CysviwY{8^ zvF`PquMh+6|1SkqjDbPJugEHx?JRfdqvcdPqt0jonsQ}O^Mbc({a^aIF&dS0dV5XF zR@E}!I9%YSR~@r<2+x_sC7*4LNQuC2(Nu~mgwbA}bc$UN~~K|v$4+2g;>K>tVgb;u^t<%5^H5Ccif$*V{?U5igQ(>-RYVQ_rPF?x15Ui z*t;~~1$#9j4qQ>Cl!ntp9JrtimDh-Pr)xIi1A`&rdMe^$@6w1D>{W@l0e|Ya<@Q7o zH;hVbj@!IbAwIDCl}ALdw)Bb zyUqIPd?|!DyW8w;Hs?!z_Sk%1KRmW2pRd+W4?7>B7jFPkr68&CIaj0b>*Nk(*w$^Gn0{)I_r!Yb=tneHu>Lii=m*}I)WoZasAA-uu-*)x(Z8SW`8bbG6NhETgp2a zzc&?fJ=AE^RhXREM~%yt(viDWX*o@qG^b$Y04Fa|hgH-y$*QeVi51_&DmqkRm6g_G z#qkqo5>7I-I4(B260WFg5?5QL5-!+-D>_udm6cY+b6v)4W2BO0?8ITAe#ZR!L#SXWac$^%Ia1V5n894y#1jB(1JaC0=?Duf(Mi zvAp=Ogvd2ht>3USKYA8jz?Ny$4orz$J2OXZg`6n27~1{%Uw_8M!>-MIK5VXkte*1$AkEHJGW} z{CLWy$5Vj4z*^B?`w?P*qMIB`H0Jw)IhUVT`CJba6DB{f%ET8{8^?XKoW(EbqLOZ= zRUCVWvexszR$D{6J)T8 z_pR&T&9qhTQ#b`8ElG zy%Vn(P|hoNQfsIa= zD6QSJZUW7(&+MXD28`(eHgp)2Q3Gs=^q1QPecQO-m|?&C*{!mJeO~Wm|JX0{v6pVA zq`i;OzkdQUx34U}o%c#uCKE0$wSYE zcF>aUZ@M@4et}ceI3;kJ!i}luIxmhq^b2$%4sX~vbka|Mome&J0N4cF>p7f>9FFW( zY=YQV`k z-VRRqibf@7I+;#93OYM+bblMgDz-Bkis2~4b6t#b^KR0sao%>CT`ZtsdHF2Ks`*s{4}Y^|=ZrK1c)d7>mx_;uXK>HpR4sT>+YG$6 zQgaM`_w5`beums04}uphl;LINv+(NWj|n-ACX|qabuWr@a;f-eatb$!)xh=2X1FzV zir9{sNu#YY!L)cD;K`EY1gP}yM>G!v5}utj$C*fvrWxLg*R^m)Z8JREN&)C!w|_`) z`98dbvX5U>UIv(z&(EK=QvU>)P?T#4!-cOG=g3m=(abQN(wf&|7PZYVYbyn27u^{A zx))j0T}GCb&myb$NF!keoC0@T4Vd-foLMS9nweL_Yh??Gwi#w^rS`S2uus`+x3`B4 zwrHVDE-OzS798}zCP9Ev2cwWrj!~c&=Lk~q(FhnOxu~QPf~aiz21w%tKHaJ2#F+nvpH!(0mLq;|+MmaPx zMnyR>L^VM~GBiFQJVP@!I6^rwK{YlvF)%_yMm8}kI}ixp@N4LiSb{Yefjy9Dn1Gg1!LK;FE)3vv@Ln>>1-w?Ml$40Jog@;al}>sI zQb@_L+ppsCT5BGgwUI$anRq_nJ>v&K@CKaWN%_>3UhQ}a&&ld SWo8O9G&nRd3MC~)Peux!pH(dY delta 2220 zcmV;d2vhgzk^<|J0+1vFG%+BP;3OxJPBVXONkeL0AD84TmysL7$lC=QynZM6_ALpY z7mNyL75VAkG2;KEX4EpJh>(hECbcHJ4O#p{7Wbt2?mPeQ3t4dDe|I;{cYk(*52*Vi z`4p60N4GbxR zmaVE~)b;9e@!}14#8Ia~lgrNobC-YDs%CSYn+v&ysa%g-OLILoRwdWUQtr4r(ZJ>krxfR^WV_Qfo9=yN#`RRj$KItGFW9S+aRYzUam($A zGHw`^AnRnj)is~-++fJKoy_>iyDZ~ldo?mH1fyV?5vR$x07b#6DjDx|&1QUHFl3xh zE}3KZ(v%krR!O-vR7(LT8sx$P)vC_2+3A{3d2X;t`Q*wub}vi$*kFy67q+ZbH-)&n zV!Y1U+3A|!7Ul+3k`KIJ?{IZZ_vje)iaWUOzmxEuXK}PY*kvp%-reQl%iN@ikYY@ayCbWEg9< z0U3F}s#(cMOPzH_jRtK$V4M2yxW!OVZ5_cYLvj7gwXjjOjJgU-VP=0WRx$$|5+mgu zjNh9MxgKh?={ihK?4#harF7(ORa#C{Ce0~WIl#$F)L|8MO|ojcRAR;Vu!;_qSY@sC zSaE#EnS_&ES{xS}T?tpzHHoY3QVAFA!4(}U;mTSo;&O~~&E!dFSxvo-I=G^;XcgWTi_iQ8vk}>r;uD+`}w!sl+UAuE@+v3Pz%d zQ!umMojSxiRnxpek4m)EK3bhSMOH~;#e3ZSUG)=?5@4uRst&6}*(9y5PbFS@53j_f z60yAbu!6`nQ?1{yGk^6gx`Zv$tQ}Yqxprob+6pyMZZX9D`d@#>#lxcX<5*V-;gaLAIO0V(a1zbI8V9a4CIxkA|7x&O zxB2muO^>GlM}f7Xf9>wZo$v>i&F7iuus{Z@ zcpqH{Zzfu8sKBwu^JsBxV$y1x2b)T3$7+QG50Wc?)a75j&SS=B_bv}lrGY2Z7(+q#zZ(>6Q7^xY=R+3haO*-ad z5(393z9K-*D-Tm^s1xYxV3=BprqIXjl(hOVb^bP9GL33xo;QsOrl_!1H$xPVlXZ^g z7>m-{p>^w)`1a}t0d;BL?1Oyuy& zZbe?=d@mHOeXOli;NA$sRqfuQ`?^0G(^?5%igbTw1n7_zOQJ`u47|?X`(7B90g1T= zoSfs=!3p2dsKiVs(}_nxXD5#CZ=+bnIHRGMjzT`y#Vj{ZC%qb1Zl~GD0va|>T1)`P zSyk|6YzyYa%0ePW&+s(_I}l$SaYSpJ|1wVYP~nW$D_bVo%7?V6$xyYty?qMDH%ni+ z%$$GM4tyOR*bc3)W}#KtpC`DO#MRIkKETzBb6lzTXk56~2rFyhirQvywVg(|mbW+e z54+9dx2yGLFS=-{j4o@Rzurz(gG8c!o9b}ww>i-$&WL8>V~P5WB+jOlh$h;miFTa= z(U;d>kl+0|*t4hK4!8&t3q_K7`z*<-6;^)&59?*;4AvMqyk4BcOT|aSGq`7PsusMc zZ3bT3sW}M0`*w~QKSOSh2f>RL%J8!GS$Os8$Ap|l6H3Uzx);Scxm0{KIfWa=YT$Zh zGu)a!MQq2+q|sKHVA?zn@MJ}D0#y1ZB(P7;vyr78J1I8^IFWJwi#w^r@-u@ zy9U4RMHY3Jk!9_($m-qFNSFbqz#UfuX1zFPmWq#N=GE|8)k30ehFROGeef&nQ#RY} z?O_*Nv`{9OwI??V4!U8JAi%7HQ5;hS2zqgjAQc~tfMJn~N-80U+GY^6odSaQSAoHg zt8H`82l-|Qt34V6h`?W=I>Y(;vF!8x2~@Op4cK{)gS+-MqsUv*ed*@?%E{s)}v zn^Lnw2zGe~H8C_XFf%rjz=6~UH8C_XFf%r@n}XN{LpC@_yI$R2C0)li696w3MC~)Peuyc???jx diff --git a/results/combined/plots/tools/cost_with_manual.pgf b/results/combined/plots/tools/cost_with_manual.pgf index ab317c953d..ef0439f4a7 100644 --- a/results/combined/plots/tools/cost_with_manual.pgf +++ b/results/combined/plots/tools/cost_with_manual.pgf @@ -506,9 +506,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{3.000000pt}{3.000000pt}}{3.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.704750in}}% -\pgfpathlineto{\pgfqpoint{4.068314in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.068314in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.706914in}}% +\pgfpathlineto{\pgfqpoint{4.086645in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.086645in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -521,9 +521,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{11.100000pt}{4.800000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.716653in}}% -\pgfpathlineto{\pgfqpoint{4.039874in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.039874in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.718817in}}% +\pgfpathlineto{\pgfqpoint{4.057817in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.057817in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% diff --git a/results/combined/plots/tools/cost_without_manual.pdf b/results/combined/plots/tools/cost_without_manual.pdf index b5eb82a59aa7496a7b6c052d799ffe2a0d5e8195..499d0d3d9c650590753360a6508e6c9e98b214f2 100644 GIT binary patch delta 2104 zcmV-82*>x7k^+*F0+1yEGm~+MD3MM&e>|2TBR7PR_bWEI{vi1AJqh1ej0$HJ`PYA9 z#Q#ansAWnKAr;k3YE2G1vig&(?n!g+2mkLYS#jcj4>!%d|8|0pi2aFt4q#Ui_l~T3 zX#ahme2=R3%?%?#d&l2obxl^AV}@XV{Pl*s`hIi$%df9d9)8HpV`iKb6qQ&_e}tpT zSR;d(sGKonWt8qSso+!y;ElLPC`%KBk@4Ic-`Lt1Z*$`lLx1?*Ue3uFdwb_Q#6bK1 zYe5xbU{LWJvI%NC%^iHyoT4-8j3%HdR|b(+yoL3D>E}ji1nF>lq;(6mj#zIlSFhf2 zM;vt;G`YMUsJpx(pU&9%=gSX$f4088oHlJk=9FzJ#F{hg2u>~&YiBWIOqE!-P_wbl z)rDBYRIEp)rLi6>s}gHvDR#2y3txF?b&{rkm2B_nf+l3--7?mLFe?+{+nvZy{ zFhtx=Mto#l7V)vZ8W9(QQLxO2Wg;#>QE;kC#5=6nhz}Hoi1W!Mb8KE3@`A!DA-9HV zDPW-_7Z#{ib(YNzYd++;!Y1UCE9cm}EaYQ_H9}t4vR2&`;_iy^I%{W#HNP#)6*eKC zTs+6-Wjn*M!e{RpjH8@sf5L&9mu?wasCAE3*fC`4g44g>Zyyea-S+8xErd9`+Z}Fp z=WBlU*nHnUJhm;@U$##V2OptV?*LLzkkt5^s{#BrxdR#cnr%Qv)^BQ7GSX6Kol&Et z?Gv`C|4v&B1=ZFO92tu17p{d3)H-4nmcmS3tYijsNc5CsD(WdJ#IkAtN z%a+oSxmDS6nlfpY;K~6`UZM_H5o?mGwo4_h_z|w6K_#xT)_PoV{KT1rMTQo~#YR`6 zD`HL3)pn^w7aXB08dRbyYpqC^W0Y$q7h%h4>UGqiD}qh))%K}Gm^emQG^xl~)?AM= z5QYLbdJ)b*2x?@de<7BDO>)-tsl=H)!dYTciL<=9B4<`oFcMWP!I|~u)M2cHn&vC? zsKk~!##U!ek*lP!;xq34srmv;2{6r&nt*rGu8SH zJM*Jw)dg&wM(vp;k!xq>h*qeHa*e_7w|_A%9u95g^Kp0ef6w;m_ThfAvKbkjl{RB5 z`e=-gS|sCC39MBJIF5Cd5H2|$iy1G%fs<$s);MsbF(`Pxuky7XC?-sPV3mn4syfHLTh8JaG*L-6;}ypYQ5Lfo>ro3F zN^TiVrIo@Cf863IR@Uf&TdDY>HfIKuL<2Rh6aK)m`99+v7RX=~@4f5DoAFi~DlqqW z?k%oOOj>PoXH#iyU#)Q9iR8*3b@{8uJS9K7Pq}*<2Nbh`Oa!JN{c~@NbB@oK{e-Z# za~{|EEX51>!6!L4FHBP;&Y(%6@eIXUOFeL{B(3h7e{{_IBm`zBUNNAYS58uEs1s=G zAW1DnRcPaWN?JWhoqvdzOrn~ZmrbIADJrbhVG;#Eo~&~`r?Dul?OHd1=GPadD7FD( zdO#Z*49chhZHct^4f@wB=Jssm7buGFM4XB|ex!Xj`4&bMtBbFF{BPvmyk}TldX*(m zzx|R?f6qhKKsz8v_cxs>ysvaWra*0VzauTa0t_=FgjPRkX|= z5gaZ~PFjor$2m*zCc6dmVr3x_qh)vv-VVeUCmeqo=WoWT6e^s5da!kZRz3htRfdY- z{q0jY8d>|QVCF1zVC(QObf|qZOInq^Z$cN7xYiiM2Xyt~oUT-SGF`Yz2`g*S713ts ze`-68=vv?2+&>(4kKey+cSos19AWSqAnatZ~nXFp9B;;W&>Kv{L1M+%tPF^ZL znLLBL2B&I~7tv%}=`srY2hu%ObK*WxUq&2ZLs3Y=YZWANKi zUCJVMnX;^Xma=*e3=+2X=V}IWjOZ zI5IVpY=P7VIWjOZI5IV}M}pV|Lqjt*I6^rwK{YlvF)%_yMm8}H0+1yEHIr|MD3MM&e*#znjNA}L-mlo;`h(!d_auB@F)Ex@if<0FTcJbI4E^DIdpRd#?CqWJ5CiT1 zuLV_%fkDM@$R?=mGa@w>FnNzl@5Npn`BRIKCtewS-F;!ySLe0iH zR~KRpQ?VYImd1LltV*nvrQC71P-1h1LyB`%qTON5hI^ne#9L0qdu&}A@PfV?5eKfQ zQcA-z5eF_PL+~0A@33YgK2R7UuBReCwl0l$L0^@K8=#I`ZWoHUVN`;we-rT*Yd+$+ z!Vqyg8S#;IS;WWsYD8QJM!_;8mWj9kMZu{m5$~{OBR)_VBF-nL%&~cC$O{Uqgxngc zrGSN!Tv(u5)tNRstoe}V3Y(Bm&YWZOvXGAz)(ClF$y#+$h^s5c>&%@U*8H+CSJ;Gn za`GITm#qxP3ZK1ZFphGje+dU_Ubnidd6ewOuN4#gA|m4JvV!wbtW`<0sA}Eb?e^oNRO@ zx+2yjU2T_2bion2qCq9Pvet@pIYzl=auK$yrd~%Kx+2&#Uu~aCgo$H>MU#q*WzF>{ z17Rp|qZi=}grG)Ne|p3cuu0CkK9x9=M>tDNDsh%KSLDn}3Pz%eB{;L*oH~qkP}6*c z9+lWq$Jpx3DRPxGR(!|Zzg1s=DFKFBrRs2%fK9U1^{K>{KEhXGQi-v=`FRDAYld3C zU}yg6S#<$hr%`)mN#xp*IieM6qFiI}`|V$hi-$v7`Fz}6fBmz4x_!8xtZYU`XQj>9 ziar|Strp2RRRU`j0*+%{C4@`1$705du;C<{jWrHjX$%TtX@50XsoQ*e%BI^>fLUOz z=&$_~Vt}HV99uNj`+_-_?^pR+4-^w7->}NW7ge3(-YsYG3!12;oAHWchA4~Ki}k1l z4kfpYrqW7be+O=H6f0}=z^zn#QJXUZN}_=p=Lx@I*?gbz4hv+kiuc}ibbP|> zr=+#r^SI9EDPF)oev)(Z!bC;tG(+m1K%EJ|y;)(xTg^@S;l zZNQiw(1r$sGHO6uBJF*H{(!~Ys;zv4qIfFeROInX?Yqfy7*(t;9{l*<$h~>bu)1`Z zB~ZWpf09wpL)Jk1K#=ZlI#YVPz$t2+!o)WG?Kc8Y2ymt#`JS3S4-gzp9#9#xCeDQX0!gn+(QPatEVo|{Cf5g%JeH5$2(Wof~q!7_BW(nS8w_skZEF@yI46ni4f%xKt4N&9!%{Y`og&j~2wocH>TcD}R zP!qhreF~c+YhM@4?1m0(9d3sXwQpugtFrn{=wcG*8e{l?u3ntem5NWM3uh@|Wi7fQ zf7%RPZKn}k>)V_Ahr{mi`@@_KPj zUMfDBJcFwSr)rTG(PqeNJ2l(Pci+!3f8uAz+vBsyiyF%0W$m-%)vL}D<}|8MLJsD= zD9)Kn#V0eTaH&|0xE^eVx28{#wo^vZsH@Ci+B{F-VkKxosPyL#uuslsC(Y?hq$jf( z&YkO8bVjrpKHE-#(BE#6z4agAl*cjtB6yj=tbKm`tW{Vigb78tmN1<7dT~x!e=0ti zGc2gI=CwGBXfvF(odRbU-81;@C}k15Oj*`GOIf`a1_@`tDR9TtfU{nlbC!xv=FG$J zTGc{=Hp5xlsXbN|)+xLF{`PqfThvfyE^FU}S3MijBL=H5yO9N_6oic&z~zk*c&o!z zyq!2g@*m4BE#wMiZe(+Ga%Ev{v-byVc?UHyG%+wUHj`?B)CV;&G%+wUHnT;7*abs2 zI6^ToFhnpnML{-3HZeIiMKVJ)G&4d&I5jmxL`6kDAUrlWLNPHgL@+l+K{iGpGeSc+H8n#-MMaZfh&fTq5kyb`MA2@>cn0Gef=FzoArNIFG7(5Z7TmWub$ij0 zo6yr?tX?J&Ln7#c{H!3KJ}78jHeIPJha z)-rP(uxD;V*;cXy@tDa%?in)i4cNp%{bEF4RA-jL&@YrJkD7VPc+_Mecc>H39)xg| zIs^K$Iyi+DL&@?*(&X_f7z%9Zos!2n%7njQDZ@cS-!XR8Qzlf}e^k)x*SX4OK{naS zBK=v&!C0JFHI@Q>B5DO|Ii`n91AR%Nc@jepv3k{AXo;w(d;G;Q1)I{NBpTpXB$_4B zNu!kv>Gof6YtfVVNDTio|#E+P735 z*X#*ed8aTQ)Z2>)W^JdCpprWU{Q6Zpg*x;vQ^6wrS;(Hgl4^AVD$pmQZlymip{vlp ztj8DW&qEHA3wLX~fC7Cg>Sp?bF;`(f+V~=Q9B?eXUYj`z)bo&AnO_{Y2KC9Gm$=VE z4&+r>ofT;Ie^k`X^sNBj_Lb-lU@P=zA;;R=vgv0zV$;u~K7CTuf-`086@pwfDUR^V z63vrXo)n3c(G93X$o&_@;&Vb=9d|)2!7pDB8xQK&RcjZ-5=iob7=C@{1+k;_8Lv$( z>oZGY>jklrLPXHr7sL({XuLqRsLw2g%N-=mI7=={gHsqUeAu;# zxu8xSvci_`7@GBC{l2}>Z zyx0M$-d`8}aH+;YdwQcJsSe;%x|*zqkXgd`q^*)O)xmce$lj@k)W zQSR}WPH)546i*;2$??lIH4iSn^|O*kXdW~Z%2d*P0xN4i9Mdmw_`2v5CMi04xuWP& z!vdVgcgw9WdVHQHs7khyfE7g_kLg8U@97C9B|3h&rszSzB&OXFn)?8gl&_@u1Xk93 ze>kSoT&{QY1e4SpyAlAS;<`zu%hVWF}>*P9X-LMM8_}J6y1B~ zLf}XAbma|Gdmm}MC@_JQMIVmowO0Ewk}ETE6c-kFonbf{)J- zhxjOaJP`rt@sIts5*9MPbdu)ZhpAc)vkDDkeFr%*FfuqYHIsCT)CV~-FfuqYHM38P zN(DnhGd4IvIWa*sHa9UaLPJJ2F-AEwGDbx?F+?>%L^3o!AUs1eHaJ2#F+nvpH!(0m ZLq;|+MmaPxMnyR>L^VM~GBlIikhoyCU4;Mu delta 1263 zcmVY@oMmaX}e@(+=EY zEi=afd*(KX@}QX~h{sG8a?g;7Z@?xF>K7yWqB^q_hJK-JdDP5P#-k<+xkH_J_8^3# z)EUs1)xjyO7)q8ek|vK=!BAjJ@02{wQ6~HaOBoIt`i^m{o-(1*f2M+7zs^-Q3$n>p z7U|DI4#wi-s<9O46HzNz%P~D<8t6+B&65~gUNsMb>yJplSiHN9sj9M@+59>rD{IW#z zB-T0+ku>({Jm?;uRxI9ee2_pr`ied{g}w)AUe+f|8M|~Aa)(I^$FvGZ$uq()>oZSc z5J(p1F(PZ^(?rxA5?RaQqZUU=G{CP&G)rP-9?Mfk`Vb*Ee=n7XWp=zO65qvZ-%@#8 zvnOcfox*rfZ!aR4wVgtOO70Z!>sRd*>d?PT1&j1&A$$5ts?`aoK%a=ZmHxPdu0sE^ z9$%zC4>?RO+^y{b3iPR{o9Pe6T!sB;K zkXK=KR-oBae^EEnw*q|ISE4_FtB4^caSvWEV(ERPGP+8;npVR zf;xG~3R}8kf}u;L`B`RrIYbV>%$}(;8!G?B{3{)WqE$jlE(9U z9(3#SMsv-)yT*+dmNz5VGW&VRaamvNAViL6`X-|8Sl$@Tczj^~m<}?+uShgYVr6-g zr;PL=e?s2X{G(qw1ZJf}?}-urI+-xcc&BFX9WgbdKW;UF6q?I__G^?O9_nrXG@{g^ zdxoMvV!42yPGG^D%MK^Har_D*eLBhhd#%;j_VU}aX#V)&bQeFGDz}AFI?Znj-Emi_ zkrLpW;F-~K-%X(dR6Aki_k`kb%N;jME$y~>f3V78$G4;ql6V|uzt}=s2HVv-YA0Yt zxyNHVy&?M*#S=(Ma{O{l&4Y_?{jB5>ng`8pGeSc+H8n#-MMaa`khoN5Q)>VK diff --git a/results/combined/plots/tools/heatmap.pgf b/results/combined/plots/tools/heatmap.pgf index 3e62671c34..4f42e341cb 100644 --- a/results/combined/plots/tools/heatmap.pgf +++ b/results/combined/plots/tools/heatmap.pgf @@ -1600,19 +1600,19 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.081501in,y=3.910505in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1129}}% +\pgftext[x=2.081501in,y=3.910505in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1128}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.688712in,y=3.910505in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1691}}% +\pgftext[x=2.688712in,y=3.910505in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1690}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.295922in,y=3.910505in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1136}}% +\pgftext[x=3.295922in,y=3.910505in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1135}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% @@ -1624,19 +1624,19 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.081501in,y=3.356364in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1157}}% +\pgftext[x=2.081501in,y=3.356364in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1156}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.688712in,y=3.356364in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1672}}% +\pgftext[x=2.688712in,y=3.356364in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1671}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.295922in,y=3.356364in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1165}}% +\pgftext[x=3.295922in,y=3.356364in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1164}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% @@ -1672,13 +1672,13 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.903132in,y=2.802222in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1401}}% +\pgftext[x=3.903132in,y=2.802222in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1400}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.510343in,y=2.802222in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1425}}% +\pgftext[x=4.510343in,y=2.802222in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1424}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% @@ -1750,13 +1750,13 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.903132in,y=1.693940in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1137}}% +\pgftext[x=3.903132in,y=1.693940in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1136}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.510343in,y=1.693940in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1166}}% +\pgftext[x=4.510343in,y=1.693940in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1165}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% diff --git a/results/combined/result.csv b/results/combined/result.csv index 9897cfa91b..a31b34f4fb 100644 --- a/results/combined/result.csv +++ b/results/combined/result.csv @@ -130,7 +130,7 @@ idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,left_tree_fingerprint, 569-4,569,4,refs/heads/master,6460eed46a2343e156dcb3a6f13b286a75f81667,da1628c7396149475825220594931c207eb15862,96b17fef2e11ceccd9692d47656462c019bbf72e,,859d798bf3f7727b6e254cd7787aab1bf9d5c15dfd8823498c954250295b78cb,Tests_passed,97230600688253da51b6eee31a61603fc85734989eef81ea6fa8f7fba9bd0a94,Tests_passed,True,True,True,True,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,0412aebef45f173e7cabaa7cdb28aa40e9e502b30955fca48da2de65c4354c45,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,50de32c8a89deef4ad71d0273d3a7dfe1d9af6cbb5f03f08550ab78e57dbe5b2,Merge_failed,50de32c8a89deef4ad71d0273d3a7dfe1d9af6cbb5f03f08550ab78e57dbe5b2,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Merge_failed,5f2aac754f68731b822189a0d739205635b5471eb776963240379b1294c99ff0,trung/inmemoryjavacompiler 582-5,582,5,refs/heads/master,8796ed51f2727a30b1ccff02c8aeaa6331ec318c,c8179fedabe4dc5feea6a566503f3cccda960c4c,9a5ec234ce7670842376e81bca25dd7cdabb9d34,,1458569d8764a7e02a17b4d489479d50594ccaef09beb9f574335db3b54f1afe,Tests_passed,def300512b18c9960f9b8d8f3bd7d2661dfbfc43c0406b648973b6a989483aa2,Tests_passed,True,True,True,True,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,conveyal/osm-lib 622-1,622,1,refs/heads/master,266500d1c5d5131664a1538b03399f313936af99,81dcb38041bd12ef136f07a1c11ea8bdcb235237,f0900a36160502da9867e48db990874982c6b9f9,,d29d2b8551e236512b506f5943599f542cb65078548070e621ac7ff4b042ecdd,Tests_passed,ddbaa818eff33f73c7f8f10a1700ef22d0c6db83f1453ef78ca38e9df73b61ab,Tests_passed,True,True,True,True,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,jexp/neo4j-rdbms-import -680-26,680,26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,Tests_passed,True,True,True,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_failed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_failed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,openhft/chronicle-bytes +680-26,680,26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,Tests_passed,True,True,True,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,openhft/chronicle-bytes 680-40,680,40,refs/heads/ea,e3ac571d253f5fcf85f24e64833bb488092d58d9,2caddfea71d4a3291923e5932bf994076318b9cb,4d42f73c641704d7902aa284121ab19e3c082243,,84cc90e53681ca3be51813ccd0fa6573ecfbb2a76a204b32822d33bfe371e839,Tests_passed,6f35fce28168ab0482ac3702347930cba2f1ae10e297ec926ccfaa2640fbffa6,Tests_passed,True,True,True,True,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,669e8909cd3af663789ae3721ce7470622bfd7e35e02b6ba67792cbf4a05e35e,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,669e8909cd3af663789ae3721ce7470622bfd7e35e02b6ba67792cbf4a05e35e,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,7c916f37092b8f8e24ef8b0d0d4bde7a7b61889978632c3b37c70c682a9ae457,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,68a3032d06a0e2e05bcb37f26d8e6fa5488db90109e274d87274e5673a31a7f9,Merge_failed,68a3032d06a0e2e05bcb37f26d8e6fa5488db90109e274d87274e5673a31a7f9,Merge_failed,97e8829c4ccc4e632b02f3c721993aad8935741eaad61b2dc60b1374c05643b1,Tests_passed,b422e8d651ec939af5d4cba19f1cbb4a5d56bd0b9f0893f467bf9a39ca0a2731,Merge_failed,022708a8eae12696937384aa613a4c172d517cbf70b26da11a604faf03ec550d,openhft/chronicle-bytes 680-50,680,50,refs/heads/ea,5bad7e86eaeaf961867ab32657bf3d9c5f4a55af,420ea2a65d88fc2661a898a5bd25ff7b4efb1a27,b92648cfac1e07a32364e98ae1214fae8ec44e56,,13f16a5d7750798b50b36cdcb3dccf80f54be2b171e306ea170267eb35982dcf,Tests_passed,e580028e81c720573643b18b671b25df9c1403f37853e8779af7b034a3f3cd9f,Tests_passed,True,True,True,True,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,33c74e6748d06bdf0d9ea6570181c9c74abebd7035d281e3e450de9189ecc918,Tests_failed,33c74e6748d06bdf0d9ea6570181c9c74abebd7035d281e3e450de9189ecc918,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,d8a4b9e85d89abab6949ac9da5e88efcabebe884f9cdd6709966ee6cd1c38ef5,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,openhft/chronicle-bytes 680-91,680,91,refs/heads/ea,8790063989f100d1dbbef74c717017c707fcc895,1a104fdabcbdd83df23ed505a50b02d7358e42ed,c75795b6aed917f3ae8b15a092782236c2e2adfa,,a445cf16d3b4fd38273ca6b618133f2c432c4bcd5e270c372cfb7b68f5b7102f,Tests_passed,8516c95a7fc650a1ddd17d11a0ff4be05a773dd0a6c036c0d964d1413e1b13a5,Tests_passed,True,True,True,True,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,59453f7d172684b48db0f1f474379714e4943012b38afe6c6c953d64ff1a5c68,Tests_passed,59453f7d172684b48db0f1f474379714e4943012b38afe6c6c953d64ff1a5c68,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,85a9013e772b863ce7ecba58000331f2c87483bc55471da8e770a0d6b0ca24cf,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,openhft/chronicle-bytes @@ -241,7 +241,7 @@ idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,left_tree_fingerprint, 1215-2567,1215,2567,refs/remotes/origin/Issue3112,89c83f2cda338e57d5b0d6339c76acfd159b1a15,4b45bdb4b613e8e9e68640f387019c479b595927,0e768bfe7fb1b96ef4a1e32f5a369170e18a1efa,,03884b955ad72befbc339e0612a8345f7c1cf3baadafbd32ba13238b01c971bc,Tests_passed,5c4a1ab696a07b85c75a55d5f1319256ec5bbde562adb60cc045fbeaca8eef9d,Tests_passed,True,True,True,True,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,3b80ec0b193c678a17e3368637f901cacfccd7185e67171da5af934d01a3daa5,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,baa9567c0099a9cbf8daf621184addc80dfc5844f73bd0de99f9049585a0ac0d,Merge_failed,baa9567c0099a9cbf8daf621184addc80dfc5844f73bd0de99f9049585a0ac0d,Merge_failed,ab2b2b5da9aec43e70f88377c45e9bc0d5ce6800733ba86d809ccadc3ddf70ce,Tests_passed,72c3913c8b7a1928e223ca41cb04f22a11d3f2a7931e60d54fd9483f02909bf9,Merge_failed,08c65e2f8ba36a17742b3d8f2d055a9eb7f4b8a5fbdbfaee286020a46112aab1,javaparser/javaparser 1215-2575,1215,2575,refs/remotes/origin/Issue3112,92a17baadf0066a1d326744b8c47478f2f67b69a,2229ec2e8d0d7fe4306ea0dcc4624f01ee9c2d91,1b6d2d11e2ba79c6299470b4842ebe04ae619e93,,877af0a05be6f21e510466261a02115cd0ca7be557ff36a9966650facd84f642,Tests_passed,902acb76e5b1c99646187c4f8662a1b91ebfa49132e9471a7ed79926a69d9661,Tests_passed,True,True,True,True,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,1deb92fa0cbd8b762a85dd11639483246e5975551a8d85393b346933d13c8cb6,Tests_passed,1deb92fa0cbd8b762a85dd11639483246e5975551a8d85393b346933d13c8cb6,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,0f9cb7dd770b295f4b739fa19c27c7e6e8d5b9126fce435400baff564e20d6a4,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,javaparser/javaparser 1215-2633,1215,2633,refs/remotes/origin/Issue3112,31cf9e1365d59cade0bce29bd22eb58d0cf2c113,2ec600c5eb514e35d3c0c24986f192d1397639ee,8045627142e190a41767094c91d3328781452d1f,,83c57eb44fc8d80edf63ec5e0d8d1f71fe5a1dbaf7691cbf60fd0e4f53a9eafc,Tests_passed,61c3a01148b5a74972541e76bbf3a92b74c3b5bfeebbeee083b33d67e364479d,Tests_passed,True,True,True,True,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,ddeec205fa871d40e89e391990d1e14030e136e40373fb3c3e9029c8d98f48cf,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Tests_passed,dfd36a0f7cb1c7b4c79848e8bf8155719f40c4c39989ae62fdfaa133ce1b9cbf,Tests_passed,dfd36a0f7cb1c7b4c79848e8bf8155719f40c4c39989ae62fdfaa133ce1b9cbf,Merge_failed,f6bcef92175c2fc36aba054a28460060adaee31555888d69ea46a740f3934d7f,Tests_passed,d62b38bebd95c5c556d3e1ae6ee5ceb178cfdf2c2af28c594c3e30a53185a1dd,Merge_failed,163c3df56fd8d3987004c45b764b74142b7f546630cf209bd609fe4d6df9ed7c,javaparser/javaparser -1215-2647,1215,2647,refs/remotes/origin/Issue3112,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,javaparser/javaparser +1215-2647,1215,2647,refs/remotes/origin/Issue3112,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,javaparser/javaparser 1215-2651,1215,2651,refs/remotes/origin/Issue3112,fda4e4c52ee61a099533aa4d489f899591769d02,e0d5efee2e83c5bb1ecbaf60e00458dc384f04ad,ea5c9c1d7da1d88ad23c32af2de3db2daa279aee,,d0d4278ac4883ca82c6b63413a63f19397da1c861e86fd6ae0514ee602218bf9,Tests_passed,6901a58e8cd212b196c2979654a29631952db6dd94d43171ce82fb23b3cb9c52,Tests_passed,True,True,True,True,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8fdef3410d848e7de9e0e50c50d174e5088bdbfc8d992cf1fd966609dfd6b297,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8fdef3410d848e7de9e0e50c50d174e5088bdbfc8d992cf1fd966609dfd6b297,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8ac62bbf3033821ac2c44f497579449a0df6d3fa6dfcddef022cfc15d79be54d,Tests_passed,8ac62bbf3033821ac2c44f497579449a0df6d3fa6dfcddef022cfc15d79be54d,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Merge_failed,01775427a382a22204d0d9d86940603b94cb268f3d1beb6f6fc25d514c42df86,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,javaparser/javaparser 1215-2663,1215,2663,refs/remotes/origin/Issue3183,226365c30ea42f7a9bb83f1d0fe7fe23d75774a7,1339ae280956354b765d779f509b0dab89c5f57c,8e88daa7ca1019bb9337b1e10440d2fd03aaf391,,018e850fec6a361fa48e8d76d496fb4fad16a057023646bb75cd713f02a78904,Tests_passed,b7452039838e155eb9cc26be933af2b5bc807655daa46a64d6f75626ea16cf9c,Tests_passed,True,True,True,True,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,2e78f00365f1e97a17448c66490866a4b36da6c0b27c12265d6491aa67a5c9a9,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,javaparser/javaparser 1215-2720,1215,2720,refs/remotes/origin/Issue3183,19d15f4dbed959fe2c837532f0155a3e41ed0456,155768b66aca4e5dc4c2b575e52f386dbf2508d8,1aad07e18f628eb6c2bebd53e16917b2c02576f7,,2966711f6291f8687a588cffb3bf51b913b5e2c8c7bf7d1ab520d51f6afd42ce,Tests_passed,d359343cc6555eb19a8f7194bea5267d70b48760473189e06f5b910a435fbaee,Tests_passed,True,True,True,True,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,f3f2c08172bf7f832dfbe36d91439cdc77e3ba002b5bdbcfe0e767823d1167a1,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,f3f2c08172bf7f832dfbe36d91439cdc77e3ba002b5bdbcfe0e767823d1167a1,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,803b513c2d5869402b2535a742025450a6bbb7ca1692e2dcd1a28a5a4b72a762,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,7b212de88dbb77166ab64490eca38228d87754e24f4984cf4937579701b3aedc,Merge_failed,47ca2c30a9e0e4fabc490d048e7020c48a36c5291184014eed6994913dd90fc9,Merge_failed,181c9c26f9835ce2689a2cb4009a9070266b4c10cbb27c189c38bda63900595f,Merge_failed,5f803467858708e557d495bf8565b913adaeaa667fc9e071afe7cc18ee292ec8,Merge_failed,71f6077791eee222e9824b531aba9c5afef1fb8456d3f0fcea8c6229a482a337,javaparser/javaparser @@ -3825,7 +3825,7 @@ idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,left_tree_fingerprint, 22862-3,22862,3,refs/heads/master,f70a6b8de7f5bbe434fa3bd241c9604158c53697,e4030f9ee15b2e31c519b15bd9edd686b10d50a7,82a326c36d6a1bf4786ea022b52430ade8eed5d9,,2603c7889b7b6e3e51f0c13518ba764d41d640891ef2f65db65f36f258ac8b04,Tests_passed,a6126ab6a880662be87d0115e3dc9c2edff7165314ce51a666aed16a3d362382,Tests_passed,True,True,True,True,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,87f954a3d7c35d54c79244519c332bcb501b09090129f6c32f471148f6aa7240,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,fasterxml/aalto-xml 22862-10,22862,10,refs/heads/master,54a12f2108b75732fa22fa0cfaa5853a3ee2e014,31da778078ca3624abe46673529e50b4d41c327c,f93f3ccfa0cfc2e96c41a451acbcf17f16d28ec9,,7cc2fe66c6b2aca9da8f23877d414c4bea43bfdab3b32338988fc0cda4cf2e40,Tests_passed,bbc497b7aaaccb351a2bdced2042511ab13ed08e55de4a299c157df7300d5436,Tests_passed,True,True,True,True,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,fasterxml/aalto-xml 22865-3,22865,3,refs/heads/master,e398d0480f4f1fabbebfdbec5990cdee3303866a,55e5a5540aa2b35578bd70272c329b9c978a5aae,ce8b6a104566423401985a00c7041961ca9f0dcd,,efad14fdcecb1e4a104275a4a1035afd319eee8590b6c6e04295cc80af0d6a11,Tests_passed,bbd3dc0356dcf23a2f909ea69509ad62a83a1a1c9671c60fb312bdb28fad1ca0,Tests_passed,True,True,True,True,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,577b0005227e78aa5baeee384586ff5e450bbbabe9d4a4c3b8ba857fe75479d9,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,88ddee3ae0de5382e12c23512b4d35bd84656c2032380707bca310a57d9b75a2,Merge_failed,88ddee3ae0de5382e12c23512b4d35bd84656c2032380707bca310a57d9b75a2,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Merge_failed,805b6a08438444f1ffa4f7bba6cfe1d1ab63a2937c879098260fb32595b4d424,sgoeschl/jmeter-sla-report -22931-4,22931,4,refs/heads/master,c58791723cc93e49d7430e51478ccd3d5fab8637,1d8fa627276dc4c63522d2f60c391c84211bd56a,71a4889710cfa96ee4ed356a696dbdb8a0d66615,,a39565f84f2a26d90542eb2e3307687bee2c087103959451775aad51bc28a3a9,Tests_passed,536c26a1583c10b4025b47c8100288487b96bd9627c59801d5ff3dd254d2bfa7,Tests_passed,True,True,True,True,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,1c54b3e59e72297131cc947f9783814f7ba61cde2db09d3b3e692aa6c21cc891,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Tests_passed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Tests_passed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,e2b41d2fd42a72d2b26d94a4a316239554cfc5ca32a5327e04d1f86e0deb346d,jenkinsci/deploy-plugin +22931-4,22931,4,refs/heads/master,c58791723cc93e49d7430e51478ccd3d5fab8637,1d8fa627276dc4c63522d2f60c391c84211bd56a,71a4889710cfa96ee4ed356a696dbdb8a0d66615,,a39565f84f2a26d90542eb2e3307687bee2c087103959451775aad51bc28a3a9,Tests_passed,536c26a1583c10b4025b47c8100288487b96bd9627c59801d5ff3dd254d2bfa7,Tests_passed,True,True,True,True,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,1c54b3e59e72297131cc947f9783814f7ba61cde2db09d3b3e692aa6c21cc891,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Tests_failed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Tests_failed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,e2b41d2fd42a72d2b26d94a4a316239554cfc5ca32a5327e04d1f86e0deb346d,jenkinsci/deploy-plugin 22931-23,22931,23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,Tests_passed,True,True,True,True,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,a72cf44162f0c612e3c2220cd90af30e204218d8cc10e876b683990ed7bbe02b,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,2b0123ac923208bb3ae6c43a0834a3477d86ecd62d49df8043cea31b4c12055a,Merge_failed,75ebaeaf049491c6e9f3978f4f2ccee3b7788e8b316855ffd1f6f997ab37bd8e,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0,jenkinsci/deploy-plugin 22935-6,22935,6,refs/remotes/origin/pull/8,9f4e8c6f1edd9ad3116ca992b5e530bf16334716,75b5e700533904b1dd44024425e96e1b4a03f4fa,bc7c2090c0f18b962b4ef84b77001749a50e1d53,,27d1dcc005566892b9f568d440e6b95ed5cc4888bf10b67928cbb6fcc10f8485,Tests_passed,22be67c4b2255616e85093565c79c180d005403203f7ee1ebc60510eb0e48891,Tests_passed,True,True,True,True,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b5c3ad1b67706b4f1942a96fc71de86a65c700c9b9c1b7138cd5b725f666885b,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b3e209819a370c12cfc7072dc24f05e52edfccb4f08102280d318fcf2ef2deeb,Merge_failed,b3e209819a370c12cfc7072dc24f05e52edfccb4f08102280d318fcf2ef2deeb,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Merge_failed,158d85d92749ba2c044f882222f7d558be213c77a79cec93fbcb5090e346012a,codedance/silken 22936-9,22936,9,refs/heads/master,ec150f8c4420dbd9d177e880e96f09dca7f35f30,7013ac26f4e59640d2a1b1a56b0f03fd24bc86e2,3c3d01351f4149a749f8278423ca5d8112b18102,,833a91462a1542ca9c479413d57c31bd9012625e7f9c8ea1506ad968ebda264f,Tests_passed,f7dffb843a3421008bf85a098c2b6ae72c7cbc511a41086a51a21a1e9493ae66,Tests_passed,True,True,True,True,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,2eb744e157f3b798acf692b63364a4f63b2638945ca9c769dcc6460235e5abc7,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,85419bef4e822622640f7fea65de72d8cd8957639627475740f189ab230d58ea,Merge_failed,85419bef4e822622640f7fea65de72d8cd8957639627475740f189ab230d58ea,Merge_failed,3f70addfe526a403d8ab4914440513ac294cd04a8844e2785d3159ba2bb1a4e7,Tests_passed,44d02e20800f7d05d904989c32e840c9d18400053678a11e6d5cb9dbe7fb6f92,Merge_failed,505d3e96a238d37ad6dad65e53c5f41130d1530a987795a8602ca72e5fec2098,alexruiz/fest-util @@ -3994,7 +3994,7 @@ idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,left_tree_fingerprint, 23310-79,23310,79,refs/heads/master,345afd6ec12dea70d76c5bd5bb47b7ce742b3e1c,be0a79db1d2a22eae390e8b9de685de251970f65,753ab4ad68ea6256efccca4075ba57321bf30910,,71ce7951bb39ced4bb3f30bdf89f50521ff542c0df66e6a89a674e22f424a579,Tests_passed,22149e14a0166579cf98af7fd170c4ff6925112f8c755421c9dd2ce4952e53d2,Tests_passed,True,True,True,True,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,c66222be93f2389a23bc2c014ae0e122fcde8bf49863b5950fa011fc145e16dd,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,c66222be93f2389a23bc2c014ae0e122fcde8bf49863b5950fa011fc145e16dd,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,34fa7f56cdca66b3a47e6fd0c5dd14d357a765fcb4b820128c0b66de63552372,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,helun/ektorp 23310-103,23310,103,refs/heads/master,f4c9132355bd663e323801f480281ed66c565cb1,cd8065680a19dcb75651905522822b45ea91664c,baa5d0f934fa7fd8123ff223b3ef93eb0903c1c7,,6090d4fa7c35aec0605f8f65af89032e3f995574164ab0ebb7435560e42e6d1b,Tests_passed,c87eca59a16a18a51455034dfcad5eb2f6ea182c51b818be95383134f4c0d7dc,Tests_passed,True,True,True,True,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_failed,d719badd1fe3a0684b54618594a0232e8cc3a357343b8f28c7b727db1fcc5d6b,Tests_failed,d719badd1fe3a0684b54618594a0232e8cc3a357343b8f28c7b727db1fcc5d6b,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,eac9be4b009dfc52188b17030ae381745697c291368291a2ee160e5475075a38,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,helun/ektorp 23310-113,23310,113,refs/heads/master,65e477cb21c8ace53b8b4322b93330ca2584b949,d6692417c338767f81a78f7a4fe261d5be0244a7,5a10854ce7f0a14a7bec61777ee00d17bd065d5e,,be2b757c77fb954520b734234af794f7a3b2062c5041449eadcaff76688037ab,Tests_passed,c7f37351eb8bafa66689e6624d79248f7a61119f19e61bf9a9be1b7d1c6750eb,Tests_passed,True,True,True,True,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,2713b0ed640932408ef941e1e596e0e8bec2e19180913c25056c16c7f094ff1e,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,2713b0ed640932408ef941e1e596e0e8bec2e19180913c25056c16c7f094ff1e,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,5753f220134d656ae68bcaf9c42a791962ed4225113ee98a52263c69ed8610ab,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,helun/ektorp -23310-128,23310,128,refs/heads/master,be831799cf7bb0f27c544e77e2db6caa6e5e9a2b,9ac133542c7e534d818926bc92efb2370b312184,cc4724ae4c52b7006c0d9e69ad7edf9de4f6bb98,,edbf1d9cfc94046f2969b2d6822cfe0a2161b781e73d83487f051166a616aede,Tests_passed,bf3bf4ddcaea9f690e00daedc5b86f6ba5546bbe69ea2f69477fe09d5b2b52ea,Tests_passed,True,True,True,True,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_failed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_failed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,be9fde368a3b74bdfe6f43a21e7d3ad479804c22a95cd3d91c30eecde1c6f07d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,helun/ektorp +23310-128,23310,128,refs/heads/master,be831799cf7bb0f27c544e77e2db6caa6e5e9a2b,9ac133542c7e534d818926bc92efb2370b312184,cc4724ae4c52b7006c0d9e69ad7edf9de4f6bb98,,edbf1d9cfc94046f2969b2d6822cfe0a2161b781e73d83487f051166a616aede,Tests_passed,bf3bf4ddcaea9f690e00daedc5b86f6ba5546bbe69ea2f69477fe09d5b2b52ea,Tests_passed,True,True,True,True,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_passed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,be9fde368a3b74bdfe6f43a21e7d3ad479804c22a95cd3d91c30eecde1c6f07d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,helun/ektorp 23310-132,23310,132,refs/heads/master,ecc17e03e4b4879293d2d8ef55ff5d29e7c11735,4b7c1f352ce1b2d7de36f4f4bd37528c5f9c4ea2,262208f7a653371ac353b3f23d48511f4439cf56,,c45385779fc92e8ef90f37afc7e945b3d66555a33ed8696f6f9b9c46ba2d7cfb,Tests_passed,6046b3ea6b58bb8fe0968d093fd31950bffa784ef405d8fbd75e7dd55e021f0d,Tests_passed,True,True,True,True,Merge_failed,35e90c8aebf4080d4c9b4d3a4c4dd6036a522ff392a61d8f303a353ff816ebe7,Merge_failed,9a54eabeced0180dd25de9b5bec50e7914c9d4495fb8844a45689073e6c50cf9,Merge_failed,35e90c8aebf4080d4c9b4d3a4c4dd6036a522ff392a61d8f303a353ff816ebe7,Merge_failed,5b55708567e80aedb0e8469b89ec88ec148f3ad41ba58cd7004bd4971e029e60,Merge_failed,4da4d71896c3b2ab23ef0cb9af290100a91fa8079ee214eb7432138628f8016c,Merge_failed,4da4d71896c3b2ab23ef0cb9af290100a91fa8079ee214eb7432138628f8016c,Merge_failed,4da4d71896c3b2ab23ef0cb9af290100a91fa8079ee214eb7432138628f8016c,Merge_failed,b74189b36742854668bcec6ee36610a8b8616ac7c541ae928a897fe669f5a4ec,Merge_failed,35e90c8aebf4080d4c9b4d3a4c4dd6036a522ff392a61d8f303a353ff816ebe7,Merge_failed,a505e485b62f46eaac402a6831c80412003609d4f55b6c60539f99ebba8c26c1,Merge_failed,a505e485b62f46eaac402a6831c80412003609d4f55b6c60539f99ebba8c26c1,Merge_failed,c3b81acfb62744378b333ce39c7f57e744e0666e77e32bc82a2f0cf21bd81398,Tests_passed,df29a5fe8e21567655554c4e5b1dd03f910341e0536cbd6677c3a7e9580096c5,Merge_failed,91aef1095eef616108742fce499c9e18721a61357ac1a855fa7c7388857f4676,helun/ektorp 23310-143,23310,143,refs/remotes/origin/pull/271,3f8848a9133da7fad3bb55fb4f0c7cafbf8103d8,36cea424db31c1292a1c985469e2c5e1e5367f53,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,,bc68d33bc1dd7e94779577ac88d2302bb7dcd54d72e3e764472a02c972aee266,Tests_passed,8cead63e6744d51c52f2ac338b27733a0b752fb76b7bf25c4660c3dbfe99ff19,Tests_passed,True,True,True,True,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Tests_passed,bc68d33bc1dd7e94779577ac88d2302bb7dcd54d72e3e764472a02c972aee266,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Tests_passed,bc68d33bc1dd7e94779577ac88d2302bb7dcd54d72e3e764472a02c972aee266,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Merge_failed,dbf53a9d0e7b12edf31610e6f249e51620237b2ead360d45671dcbc6aebbb1e9,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Tests_passed,269a67b9199bb0fae191fcfd6a94bbead6884779a812859c21bad5fa9b16a7ef,Tests_passed,269a67b9199bb0fae191fcfd6a94bbead6884779a812859c21bad5fa9b16a7ef,Merge_failed,9ffa90396bb51477b4f2cf3e9429a8b464c99c41c85053eaf7c85056ddca3bd8,Tests_passed,1f42a2d4e0f6a8bef6353208c2ac8c35f0bcd6b71849a6a47636cef828d00fe8,Merge_failed,da263ddec94b9078f9f481e546499af1cc8592e534939680db00f38b396c3c43,helun/ektorp 23310-144,23310,144,refs/remotes/origin/pull/271,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,147a38fd89a5f2cf0d6bc54fc538f1cb95031ee5,66abcdc152ce8f4d61d882958e42c88b59ade06b,,442a9475b54cf8061d09c0d8ccce1cabbcc7709f559ebe3245b88194b34dde0d,Tests_passed,a55529ee7282f95d271c336ef0f35cd28cdaa358af48b5db6c5f664e9cac166f,Tests_passed,True,True,True,True,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2bd91ebab9d163dc9aa1146aa65e5e3ff9a5e1030880d4fc9be5abb1f7a3b8c2,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,bed19c3d97b2a25ae8e90d14b25fd5b97227d02d1e884e76c4221a1a892282d1,Merge_failed,e5a66a2d365954acfc6791d6a8c124b6470db8f83e543d2eeee76cf46ce6fa91,helun/ektorp diff --git a/results/combined/tables/all/table_feature_main_summary.tex b/results/combined/tables/all/table_feature_main_summary.tex index 0a8978a339..e4443eb9e2 100644 --- a/results/combined/tables/all/table_feature_main_summary.tex +++ b/results/combined/tables/all/table_feature_main_summary.tex @@ -22,8 +22,8 @@ Gitmerge-recursive-patience & 1894 & 53\% & 882 & 36\% & 1574 & 44\% & 1550 & 62\% & 89 & 3\% & 51 & 2\% \\ Gitmerge-resolve & 1858 & 52\% & 870 & 35\% & 1611 & 45\% & 1562 & 63\% & 88 & 2\% & 51 & 2\% \\ Adjacent+ort & 1909 & 54\% & 894 & 36\% & 1550 & 44\% & 1506 & 61\% & 98 & 3\% & 83 & 3\% \\ - Imports+ort & 1893 & 53\% & 902 & 36\% & 1434 & 40\% & 1431 & 58\% & 230 & 6\% & 150 & 6\% \\ - Imports+ort-ignorespace & 1899 & 53\% & 907 & 37\% & 1424 & 40\% & 1425 & 57\% & 234 & 7\% & 151 & 6\% \\ + Imports+ort & 1893 & 53\% & 904 & 36\% & 1434 & 40\% & 1431 & 58\% & 230 & 6\% & 148 & 6\% \\ + Imports+ort-ignorespace & 1899 & 53\% & 909 & 37\% & 1424 & 40\% & 1425 & 57\% & 234 & 7\% & 149 & 6\% \\ Hires-Merge & 2037 & 57\% & 1030 & 41\% & 1405 & 39\% & 1371 & 55\% & 115 & 3\% & 82 & 3\% \\ Spork & 2191 & 62\% & 1100 & 44\% & 1002 & 28\% & 1121 & 45\% & 364 & 10\% & 262 & 11\% \\ IntelliMerge & 1898 & 53\% & 871 & 35\% & 1562 & 44\% & 1530 & 62\% & 97 & 3\% & 82 & 3\% \\ diff --git a/results/combined/tables/all/table_run_time.tex b/results/combined/tables/all/table_run_time.tex index 1cdcc93ad1..071ad91ec7 100644 --- a/results/combined/tables/all/table_run_time.tex +++ b/results/combined/tables/all/table_run_time.tex @@ -12,8 +12,8 @@ Gitmerge-recursive-patience & 0.05 & 0.04 & 3.05 \\ Gitmerge-resolve & 0.24 & 0.17 & 5.02 \\ Adjacent+ort & 0.06 & 0.05 & 1.78 \\ - Imports+ort & 0.34 & 0.17 & 36.5 \\ - Imports+ort-ignorespace & 0.34 & 0.17 & 36.3 \\ + Imports+ort & 0.33 & 0.17 & 35.8 \\ + Imports+ort-ignorespace & 0.33 & 0.17 & 35.8 \\ Hires-Merge & 0.23 & 0.13 & 17.3 \\ Spork & 2.56 & 1.06 & 653 \\ IntelliMerge & 0.35 & 0.22 & 23.1 \\ diff --git a/results/combined/tables/all/table_summary.tex b/results/combined/tables/all/table_summary.tex index 04b418dcb4..210dd070d4 100644 --- a/results/combined/tables/all/table_summary.tex +++ b/results/combined/tables/all/table_summary.tex @@ -15,8 +15,8 @@ Gitmerge-recursive-patience & 2776 & 46\% & 3124 & 52\% & 140 & 2\% \\ Gitmerge-resolve & 2728 & 45\% & 3173 & 53\% & 139 & 2\% \\ Adjacent+ort & 2803 & 46\% & 3056 & 51\% & 181 & 3\% \\ -Imports+ort & 2795 & 46\% & 2865 & 47\% & 380 & 6\% \\ -Imports+ort-ignorespace & 2806 & 46\% & 2849 & 47\% & 385 & 6\% \\ +Imports+ort & 2797 & 46\% & 2865 & 47\% & 378 & 6\% \\ +Imports+ort-ignorespace & 2808 & 46\% & 2849 & 47\% & 383 & 6\% \\ Hires-Merge & 3067 & 51\% & 2776 & 46\% & 197 & 3\% \\ Spork & 3291 & 54\% & 2123 & 35\% & 626 & 10\% \\ IntelliMerge & 2769 & 46\% & 3092 & 51\% & 179 & 3\% \\ diff --git a/results/combined/tables/tools/table_feature_main_summary.tex b/results/combined/tables/tools/table_feature_main_summary.tex index f7b7203739..34ab2f690d 100644 --- a/results/combined/tables/tools/table_feature_main_summary.tex +++ b/results/combined/tables/tools/table_feature_main_summary.tex @@ -16,8 +16,8 @@ Gitmerge-ort & 1892 & 53\% & 881 & 35\% & 1577 & 44\% & 1551 & 62\% & 88 & 2\% & 51 & 2\% \\ Gitmerge-ort-ignorespace & 1986 & 56\% & 934 & 38\% & 1477 & 42\% & 1485 & 60\% & 94 & 3\% & 64 & 3\% \\ Adjacent+ort & 1909 & 54\% & 894 & 36\% & 1550 & 44\% & 1506 & 61\% & 98 & 3\% & 83 & 3\% \\ - Imports+ort & 1893 & 53\% & 902 & 36\% & 1434 & 40\% & 1431 & 58\% & 230 & 6\% & 150 & 6\% \\ - Imports+ort-ignorespace & 1899 & 53\% & 907 & 37\% & 1424 & 40\% & 1425 & 57\% & 234 & 7\% & 151 & 6\% \\ + Imports+ort & 1893 & 53\% & 904 & 36\% & 1434 & 40\% & 1431 & 58\% & 230 & 6\% & 148 & 6\% \\ + Imports+ort-ignorespace & 1899 & 53\% & 909 & 37\% & 1424 & 40\% & 1425 & 57\% & 234 & 7\% & 149 & 6\% \\ Hires-Merge & 2037 & 57\% & 1030 & 41\% & 1405 & 39\% & 1371 & 55\% & 115 & 3\% & 82 & 3\% \\ Spork & 2191 & 62\% & 1100 & 44\% & 1002 & 28\% & 1121 & 45\% & 364 & 10\% & 262 & 11\% \\ IntelliMerge & 1898 & 53\% & 871 & 35\% & 1562 & 44\% & 1530 & 62\% & 97 & 3\% & 82 & 3\% \\ diff --git a/results/combined/tables/tools/table_run_time.tex b/results/combined/tables/tools/table_run_time.tex index f8cdc090a2..5711833f06 100644 --- a/results/combined/tables/tools/table_run_time.tex +++ b/results/combined/tables/tools/table_run_time.tex @@ -6,8 +6,8 @@ Gitmerge-ort & 0.04 & 0.04 & 1.19 \\ Gitmerge-ort-ignorespace & 0.04 & 0.04 & 1.22 \\ Adjacent+ort & 0.06 & 0.05 & 1.78 \\ - Imports+ort & 0.34 & 0.17 & 36.5 \\ - Imports+ort-ignorespace & 0.34 & 0.17 & 36.3 \\ + Imports+ort & 0.33 & 0.17 & 35.8 \\ + Imports+ort-ignorespace & 0.33 & 0.17 & 35.8 \\ Hires-Merge & 0.23 & 0.13 & 17.3 \\ Spork & 2.56 & 1.06 & 653 \\ IntelliMerge & 0.35 & 0.22 & 23.1 \\ diff --git a/results/combined/tables/tools/table_summary.tex b/results/combined/tables/tools/table_summary.tex index d9983cd3db..ee71716d4a 100644 --- a/results/combined/tables/tools/table_summary.tex +++ b/results/combined/tables/tools/table_summary.tex @@ -9,8 +9,8 @@ Gitmerge-ort & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\ Gitmerge-ort-ignorespace & 2920 & 48\% & 2962 & 49\% & 158 & 3\% \\ Adjacent+ort & 2803 & 46\% & 3056 & 51\% & 181 & 3\% \\ -Imports+ort & 2795 & 46\% & 2865 & 47\% & 380 & 6\% \\ -Imports+ort-ignorespace & 2806 & 46\% & 2849 & 47\% & 385 & 6\% \\ +Imports+ort & 2797 & 46\% & 2865 & 47\% & 378 & 6\% \\ +Imports+ort-ignorespace & 2808 & 46\% & 2849 & 47\% & 383 & 6\% \\ Hires-Merge & 3067 & 51\% & 2776 & 46\% & 197 & 3\% \\ Spork & 3291 & 54\% & 2123 & 35\% & 626 & 10\% \\ IntelliMerge & 2769 & 46\% & 3092 & 51\% & 179 & 3\% \\ diff --git a/results/greatest_hits/merges_analyzer_histograms.pdf b/results/greatest_hits/merges_analyzer_histograms.pdf index 9e525db74bfe13226d90cda3f08093ae532c7473..a72aecdf9539deb51e1276c7fdb84a04a6babe7b 100644 GIT binary patch delta 22 dcmey@$@H(2X@g5WyQPtVk)@&8X7BpVtN>`B2rmEt delta 22 dcmey@$@H(2X@g5WyQ!gxp`n4rX7BpVtN>_92qpjk diff --git a/results/greatest_hits/merges_tested/javaparser/javaparser.csv b/results/greatest_hits/merges_tested/javaparser/javaparser.csv index 01aa600c5b..b7193fb16c 100644 --- a/results/greatest_hits/merges_tested/javaparser/javaparser.csv +++ b/results/greatest_hits/merges_tested/javaparser/javaparser.csv @@ -35,7 +35,7 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_t 2567,refs/remotes/origin/Issue3112,89c83f2cda338e57d5b0d6339c76acfd159b1a15,4b45bdb4b613e8e9e68640f387019c479b595927,0e768bfe7fb1b96ef4a1e32f5a369170e18a1efa,,True,True,03884b955ad72befbc339e0612a8345f7c1cf3baadafbd32ba13238b01c971bc,Tests_passed,5c4a1ab696a07b85c75a55d5f1319256ec5bbde562adb60cc045fbeaca8eef9d,Tests_passed,True,True,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,3b80ec0b193c678a17e3368637f901cacfccd7185e67171da5af934d01a3daa5,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,baa9567c0099a9cbf8daf621184addc80dfc5844f73bd0de99f9049585a0ac0d,Merge_failed,baa9567c0099a9cbf8daf621184addc80dfc5844f73bd0de99f9049585a0ac0d,Merge_failed,ab2b2b5da9aec43e70f88377c45e9bc0d5ce6800733ba86d809ccadc3ddf70ce,Tests_passed,72c3913c8b7a1928e223ca41cb04f22a11d3f2a7931e60d54fd9483f02909bf9,Merge_failed,08c65e2f8ba36a17742b3d8f2d055a9eb7f4b8a5fbdbfaee286020a46112aab1 2575,refs/remotes/origin/Issue3112,92a17baadf0066a1d326744b8c47478f2f67b69a,2229ec2e8d0d7fe4306ea0dcc4624f01ee9c2d91,1b6d2d11e2ba79c6299470b4842ebe04ae619e93,,True,True,877af0a05be6f21e510466261a02115cd0ca7be557ff36a9966650facd84f642,Tests_passed,902acb76e5b1c99646187c4f8662a1b91ebfa49132e9471a7ed79926a69d9661,Tests_passed,True,True,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,1deb92fa0cbd8b762a85dd11639483246e5975551a8d85393b346933d13c8cb6,Tests_passed,1deb92fa0cbd8b762a85dd11639483246e5975551a8d85393b346933d13c8cb6,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,0f9cb7dd770b295f4b739fa19c27c7e6e8d5b9126fce435400baff564e20d6a4,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322 2633,refs/remotes/origin/Issue3112,31cf9e1365d59cade0bce29bd22eb58d0cf2c113,2ec600c5eb514e35d3c0c24986f192d1397639ee,8045627142e190a41767094c91d3328781452d1f,,True,True,83c57eb44fc8d80edf63ec5e0d8d1f71fe5a1dbaf7691cbf60fd0e4f53a9eafc,Tests_passed,61c3a01148b5a74972541e76bbf3a92b74c3b5bfeebbeee083b33d67e364479d,Tests_passed,True,True,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,ddeec205fa871d40e89e391990d1e14030e136e40373fb3c3e9029c8d98f48cf,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Tests_passed,dfd36a0f7cb1c7b4c79848e8bf8155719f40c4c39989ae62fdfaa133ce1b9cbf,Tests_passed,dfd36a0f7cb1c7b4c79848e8bf8155719f40c4c39989ae62fdfaa133ce1b9cbf,Merge_failed,f6bcef92175c2fc36aba054a28460060adaee31555888d69ea46a740f3934d7f,Tests_passed,d62b38bebd95c5c556d3e1ae6ee5ceb178cfdf2c2af28c594c3e30a53185a1dd,Merge_failed,163c3df56fd8d3987004c45b764b74142b7f546630cf209bd609fe4d6df9ed7c -2647,refs/remotes/origin/Issue3112,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,True,True,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b +2647,refs/remotes/origin/Issue3112,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,True,True,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b 2651,refs/remotes/origin/Issue3112,fda4e4c52ee61a099533aa4d489f899591769d02,e0d5efee2e83c5bb1ecbaf60e00458dc384f04ad,ea5c9c1d7da1d88ad23c32af2de3db2daa279aee,,True,True,d0d4278ac4883ca82c6b63413a63f19397da1c861e86fd6ae0514ee602218bf9,Tests_passed,6901a58e8cd212b196c2979654a29631952db6dd94d43171ce82fb23b3cb9c52,Tests_passed,True,True,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8fdef3410d848e7de9e0e50c50d174e5088bdbfc8d992cf1fd966609dfd6b297,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8fdef3410d848e7de9e0e50c50d174e5088bdbfc8d992cf1fd966609dfd6b297,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8ac62bbf3033821ac2c44f497579449a0df6d3fa6dfcddef022cfc15d79be54d,Tests_passed,8ac62bbf3033821ac2c44f497579449a0df6d3fa6dfcddef022cfc15d79be54d,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Merge_failed,01775427a382a22204d0d9d86940603b94cb268f3d1beb6f6fc25d514c42df86,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c 2663,refs/remotes/origin/Issue3183,226365c30ea42f7a9bb83f1d0fe7fe23d75774a7,1339ae280956354b765d779f509b0dab89c5f57c,8e88daa7ca1019bb9337b1e10440d2fd03aaf391,,True,True,018e850fec6a361fa48e8d76d496fb4fad16a057023646bb75cd713f02a78904,Tests_passed,b7452039838e155eb9cc26be933af2b5bc807655daa46a64d6f75626ea16cf9c,Tests_passed,True,True,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,2e78f00365f1e97a17448c66490866a4b36da6c0b27c12265d6491aa67a5c9a9,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134 2720,refs/remotes/origin/Issue3183,19d15f4dbed959fe2c837532f0155a3e41ed0456,155768b66aca4e5dc4c2b575e52f386dbf2508d8,1aad07e18f628eb6c2bebd53e16917b2c02576f7,,True,True,2966711f6291f8687a588cffb3bf51b913b5e2c8c7bf7d1ab520d51f6afd42ce,Tests_passed,d359343cc6555eb19a8f7194bea5267d70b48760473189e06f5b910a435fbaee,Tests_passed,True,True,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,f3f2c08172bf7f832dfbe36d91439cdc77e3ba002b5bdbcfe0e767823d1167a1,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,f3f2c08172bf7f832dfbe36d91439cdc77e3ba002b5bdbcfe0e767823d1167a1,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,803b513c2d5869402b2535a742025450a6bbb7ca1692e2dcd1a28a5a4b72a762,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,7b212de88dbb77166ab64490eca38228d87754e24f4984cf4937579701b3aedc,Merge_failed,47ca2c30a9e0e4fabc490d048e7020c48a36c5291184014eed6994913dd90fc9,Merge_failed,181c9c26f9835ce2689a2cb4009a9070266b4c10cbb27c189c38bda63900595f,Merge_failed,5f803467858708e557d495bf8565b913adaeaa667fc9e071afe7cc18ee292ec8,Merge_failed,71f6077791eee222e9824b531aba9c5afef1fb8456d3f0fcea8c6229a482a337 diff --git a/results/greatest_hits/merges_timed/addthis/stream-lib.csv b/results/greatest_hits/merges_timed/addthis/stream-lib.csv index 2e83c19f0c..61bef4321f 100644 --- a/results/greatest_hits/merges_timed/addthis/stream-lib.csv +++ b/results/greatest_hits/merges_timed/addthis/stream-lib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -83,refs/remotes/origin/pull/3,efd2e9109fb28ab7c4439d0cbd544de31b14c370,cbf6ced5ab8f1d937bd9b71d703a3aed92ed3bcc,87a0cde639eb0d7bd288942cec23e03ca05193ba,,True,True,2bdcd30693dbabdd1e8f9a98ebfc1a15ef63ae2275ff13d908e1660fd45e70b1,Tests_passed,6e3ab9557e76c728b79fd80513b734157b3fc184dc20163a195072574e828540,Tests_passed,True,True,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,dd545ad348a544e026549182ee1de212a350ea65639875c65fc05648b6bda39c,Merge_failed,dd545ad348a544e026549182ee1de212a350ea65639875c65fc05648b6bda39c,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,555f4683d4101904ed9ad425f9da055d43ecfd1cd733e4d148bb736109be10a1,0.04139542579650879,0.03820514678955078,0.0413060188293457,0.041778564453125,0.0441133975982666,0.03551530838012695,0.05505013465881348,0.1272902488708496,0.06768059730529785,0.08187294006347656,0.08181381225585938,0.11559677124023438,0.6391665935516357,0.21042990684509277 +83,refs/remotes/origin/pull/3,efd2e9109fb28ab7c4439d0cbd544de31b14c370,cbf6ced5ab8f1d937bd9b71d703a3aed92ed3bcc,87a0cde639eb0d7bd288942cec23e03ca05193ba,,True,True,2bdcd30693dbabdd1e8f9a98ebfc1a15ef63ae2275ff13d908e1660fd45e70b1,Tests_passed,6e3ab9557e76c728b79fd80513b734157b3fc184dc20163a195072574e828540,Tests_passed,True,True,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,c922a971bd9ca28fac00c5e77b1e4d4054e2f6c95445de7e666a35a3dde01a45,Merge_failed,dd545ad348a544e026549182ee1de212a350ea65639875c65fc05648b6bda39c,Merge_failed,dd545ad348a544e026549182ee1de212a350ea65639875c65fc05648b6bda39c,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,555f4683d4101904ed9ad425f9da055d43ecfd1cd733e4d148bb736109be10a1,0.04139542579650879,0.03820514678955078,0.0413060188293457,0.041778564453125,0.0441133975982666,0.03551530838012695,0.05505013465881348,0.1272902488708496,0.06768059730529785,0.08134913444519043,0.08172154426574707,0.11559677124023438,0.6391665935516357,0.21042990684509277 diff --git a/results/greatest_hits/merges_timed/alibaba/canal.csv b/results/greatest_hits/merges_timed/alibaba/canal.csv index 21b46dfd26..848d228584 100644 --- a/results/greatest_hits/merges_timed/alibaba/canal.csv +++ b/results/greatest_hits/merges_timed/alibaba/canal.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -327,refs/heads/master,69a7e6d08380bf36b1c4d3e2febb91a9f87e9b55,a5d6c3b7478c882e24d3f891b006113685f75c9e,96454d4387695459236ed988c88a453c61334e5b,,True,True,f1cddea9b809e8a8ed10df98f6997908631f8c89f548ac352c6e120638056645,Tests_passed,4fc2d7db2d9c3dbf2779cf476ad6158e653bad23cb5e4f67511c1d63b4319840,Tests_passed,True,True,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_passed,2bc54fa15a0bb061bae245d46f5d9265fceca1a2d416ab852ee99ef569940995,Tests_passed,2bc54fa15a0bb061bae245d46f5d9265fceca1a2d416ab852ee99ef569940995,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_passed,1901c47c282dd3b1d6f6e42478ae1725f742a152778504b3a1048efba3588dde,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,0.04437422752380371,0.04248237609863281,0.04226970672607422,0.0442352294921875,0.015264749526977539,0.037465810775756836,0.015923261642456055,0.18293309211730957,0.04769611358642578,0.1702122688293457,0.18413400650024414,0.12026858329772949,1.124190330505371,0.2623295783996582 +327,refs/heads/master,69a7e6d08380bf36b1c4d3e2febb91a9f87e9b55,a5d6c3b7478c882e24d3f891b006113685f75c9e,96454d4387695459236ed988c88a453c61334e5b,,True,True,f1cddea9b809e8a8ed10df98f6997908631f8c89f548ac352c6e120638056645,Tests_passed,4fc2d7db2d9c3dbf2779cf476ad6158e653bad23cb5e4f67511c1d63b4319840,Tests_passed,True,True,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_passed,2bc54fa15a0bb061bae245d46f5d9265fceca1a2d416ab852ee99ef569940995,Tests_passed,2bc54fa15a0bb061bae245d46f5d9265fceca1a2d416ab852ee99ef569940995,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,Tests_passed,1901c47c282dd3b1d6f6e42478ae1725f742a152778504b3a1048efba3588dde,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,0.04437422752380371,0.04248237609863281,0.04226970672607422,0.0442352294921875,0.015264749526977539,0.037465810775756836,0.015923261642456055,0.18293309211730957,0.04769611358642578,0.18039226531982422,0.16637635231018066,0.12026858329772949,1.124190330505371,0.2623295783996582 diff --git a/results/greatest_hits/merges_timed/alibaba/easyexcel.csv b/results/greatest_hits/merges_timed/alibaba/easyexcel.csv index 0d85e0007d..50f3d326fa 100644 --- a/results/greatest_hits/merges_timed/alibaba/easyexcel.csv +++ b/results/greatest_hits/merges_timed/alibaba/easyexcel.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -285,refs/remotes/origin/pull/3015,832839a0296ee45e265ad920c48a5cbca050282c,ccdc73f2329cfe9c71f271b1f6bd6a99277bb658,4766634105fd11b03905f7efff7fc0aea53e7df4,,True,True,97a7c8257ac7a0bc1e482f3dca29f5167778b894d6163fd26ae2d246a459f77b,Tests_passed,843c01cf35ba0377f974bacb5c413c8130b8493964435454f382bd1d3da34e3e,Tests_passed,True,True,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,9d44d947a727dc1bb6874f63bf1115fafe54a2d02941f81914c079f408a022fa,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,bff0b86910ec1970b3110bf2c1548bb562a323620c4d235d9c9e97f4de8e72ab,Merge_failed,bff0b86910ec1970b3110bf2c1548bb562a323620c4d235d9c9e97f4de8e72ab,Merge_failed,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Tests_passed,9238bd70ab886821a38275085f4acb97986138471f58c0ead9723a72d6440dfa,Merge_failed,e59bf13469ff7b17ad570bd7283b6e4be19bba20ffe06029548c73c87395919c,0.025098800659179688,0.024544477462768555,0.026726245880126953,0.026868343353271484,0.027071714401245117,0.026689529418945312,0.027362346649169922,0.0856165885925293,0.060959577560424805,0.1029047966003418,0.10305118560791016,0.08147931098937988,1.1937737464904785,0.5900821685791016 +285,refs/remotes/origin/pull/3015,832839a0296ee45e265ad920c48a5cbca050282c,ccdc73f2329cfe9c71f271b1f6bd6a99277bb658,4766634105fd11b03905f7efff7fc0aea53e7df4,,True,True,97a7c8257ac7a0bc1e482f3dca29f5167778b894d6163fd26ae2d246a459f77b,Tests_passed,843c01cf35ba0377f974bacb5c413c8130b8493964435454f382bd1d3da34e3e,Tests_passed,True,True,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,9d44d947a727dc1bb6874f63bf1115fafe54a2d02941f81914c079f408a022fa,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,bff0b86910ec1970b3110bf2c1548bb562a323620c4d235d9c9e97f4de8e72ab,Merge_failed,bff0b86910ec1970b3110bf2c1548bb562a323620c4d235d9c9e97f4de8e72ab,Merge_failed,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Tests_passed,9238bd70ab886821a38275085f4acb97986138471f58c0ead9723a72d6440dfa,Merge_failed,e59bf13469ff7b17ad570bd7283b6e4be19bba20ffe06029548c73c87395919c,0.025098800659179688,0.024544477462768555,0.026726245880126953,0.026868343353271484,0.027071714401245117,0.026689529418945312,0.027362346649169922,0.0856165885925293,0.060959577560424805,0.10370755195617676,0.10469722747802734,0.08147931098937988,1.1937737464904785,0.5900821685791016 diff --git a/results/greatest_hits/merges_timed/antlr/grammars-v4.csv b/results/greatest_hits/merges_timed/antlr/grammars-v4.csv index 0e4a7b5f33..16a4864ab5 100644 --- a/results/greatest_hits/merges_timed/antlr/grammars-v4.csv +++ b/results/greatest_hits/merges_timed/antlr/grammars-v4.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -45,refs/heads/master,5212cd6321d56712c4eb42eccc72f751c9213171,9ee31e3908dcb06559b6178643c0d412f3516e09,3fabd952aa101b5211dbed3c60af17e8a8ea6968,,True,True,027d0f560b7f7c275eafb6a62c1a7db137c964fd116410112dfd2a1c638b4df4,Tests_passed,2813b7fa35905d6dc9b8e31130447f9a31785e93d3f57a217a8379c43374f92b,Tests_passed,True,True,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,0.06370854377746582,0.07728075981140137,0.09058952331542969,0.08777666091918945,0.07585310935974121,0.09036922454833984,0.06801939010620117,0.24136710166931152,0.07813191413879395,0.17477107048034668,0.17484354972839355,0.20019221305847168,0.06107497215270996,0.4077873229980469 +45,refs/heads/master,5212cd6321d56712c4eb42eccc72f751c9213171,9ee31e3908dcb06559b6178643c0d412f3516e09,3fabd952aa101b5211dbed3c60af17e8a8ea6968,,True,True,027d0f560b7f7c275eafb6a62c1a7db137c964fd116410112dfd2a1c638b4df4,Tests_passed,2813b7fa35905d6dc9b8e31130447f9a31785e93d3f57a217a8379c43374f92b,Tests_passed,True,True,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,0.06370854377746582,0.07728075981140137,0.09058952331542969,0.08777666091918945,0.07585310935974121,0.09036922454833984,0.06801939010620117,0.24136710166931152,0.07813191413879395,0.17360353469848633,0.17362236976623535,0.20019221305847168,0.06107497215270996,0.4077873229980469 diff --git a/results/greatest_hits/merges_timed/apache/commons-beanutils.csv b/results/greatest_hits/merges_timed/apache/commons-beanutils.csv index 01f845ad5e..cd7910467a 100644 --- a/results/greatest_hits/merges_timed/apache/commons-beanutils.csv +++ b/results/greatest_hits/merges_timed/apache/commons-beanutils.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,True,True,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,Tests_passed,True,True,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,e2677df89c318a2f8ad3d61c52c09dfa8d6a7a7b89cf2499609d392b4345121a,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,a7c9f22ca59dafacef10834a0cb86e1e5ca868b8dc707f2e73abf028db9dc2da,Merge_failed,a7c9f22ca59dafacef10834a0cb86e1e5ca868b8dc707f2e73abf028db9dc2da,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,0.04119420051574707,0.038867950439453125,0.05074286460876465,0.048506975173950195,0.061835289001464844,0.05843353271484375,0.04860401153564453,0.17496037483215332,0.06635451316833496,0.10192465782165527,0.1019432544708252,0.10025286674499512,1.359971046447754,0.5116639137268066 +17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,True,True,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,Tests_passed,True,True,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,e2677df89c318a2f8ad3d61c52c09dfa8d6a7a7b89cf2499609d392b4345121a,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,a7c9f22ca59dafacef10834a0cb86e1e5ca868b8dc707f2e73abf028db9dc2da,Merge_failed,a7c9f22ca59dafacef10834a0cb86e1e5ca868b8dc707f2e73abf028db9dc2da,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,0.04119420051574707,0.038867950439453125,0.05074286460876465,0.048506975173950195,0.061835289001464844,0.05843353271484375,0.04860401153564453,0.17496037483215332,0.06635451316833496,0.10295796394348145,0.10009312629699707,0.10025286674499512,1.359971046447754,0.5116639137268066 diff --git a/results/greatest_hits/merges_timed/apache/commons-codec.csv b/results/greatest_hits/merges_timed/apache/commons-codec.csv index 4d4e11e51e..1db5fddb23 100644 --- a/results/greatest_hits/merges_timed/apache/commons-codec.csv +++ b/results/greatest_hits/merges_timed/apache/commons-codec.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,True,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,Tests_passed,True,True,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,0.011223793029785156,0.05660247802734375,0.07021260261535645,0.06999087333679199,0.07027578353881836,0.07046747207641602,0.0693049430847168,0.0973362922668457,0.05755352973937988,0.2334730625152588,0.18708300590515137,0.11384201049804688,0.02704334259033203,0.2145400047302246 +26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,True,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,Tests_passed,True,True,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,0.011223793029785156,0.05660247802734375,0.07021260261535645,0.06999087333679199,0.07027578353881836,0.07046747207641602,0.0693049430847168,0.0973362922668457,0.05755352973937988,0.23027753829956055,0.23080730438232422,0.11384201049804688,0.02704334259033203,0.2145400047302246 diff --git a/results/greatest_hits/merges_timed/apache/commons-collections.csv b/results/greatest_hits/merges_timed/apache/commons-collections.csv index 8a2c21cc18..924dc3a04c 100644 --- a/results/greatest_hits/merges_timed/apache/commons-collections.csv +++ b/results/greatest_hits/merges_timed/apache/commons-collections.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,Tests_passed,True,True,True,True,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,0.047721147537231445,0.059247493743896484,0.021946191787719727,0.018861055374145508,0.057532548904418945,0.04597210884094238,0.032208919525146484,0.1586017608642578,0.019196033477783203,0.17276263236999512,0.1705031394958496,0.09604549407958984,0.7446160316467285,0.3463258743286133 +8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,Tests_passed,True,True,True,True,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,0.047721147537231445,0.059247493743896484,0.021946191787719727,0.018861055374145508,0.057532548904418945,0.04597210884094238,0.032208919525146484,0.1586017608642578,0.019196033477783203,0.16158270835876465,0.16003799438476562,0.09604549407958984,0.7446160316467285,0.3463258743286133 diff --git a/results/greatest_hits/merges_timed/apache/commons-dbcp.csv b/results/greatest_hits/merges_timed/apache/commons-dbcp.csv index 4ff56466eb..8a63f9cd50 100644 --- a/results/greatest_hits/merges_timed/apache/commons-dbcp.csv +++ b/results/greatest_hits/merges_timed/apache/commons-dbcp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,True,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,0.03132486343383789,0.030832529067993164,0.037041664123535156,0.037801504135131836,0.038179636001586914,0.03787517547607422,0.03798103332519531,0.07374691963195801,0.0305635929107666,0.17935466766357422,0.17950987815856934,0.0892486572265625,1.0309994220733643,0.25501060485839844 +5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,True,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,0.03132486343383789,0.030832529067993164,0.037041664123535156,0.037801504135131836,0.038179636001586914,0.03787517547607422,0.03798103332519531,0.07374691963195801,0.0305635929107666,0.1773829460144043,0.1688539981842041,0.0892486572265625,1.0309994220733643,0.25501060485839844 diff --git a/results/greatest_hits/merges_timed/apache/commons-io.csv b/results/greatest_hits/merges_timed/apache/commons-io.csv index 4e299e4711..5b5bac02c0 100644 --- a/results/greatest_hits/merges_timed/apache/commons-io.csv +++ b/results/greatest_hits/merges_timed/apache/commons-io.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -87,refs/remotes/origin/pull/377,2d0ad5c65cce8775c486edf607726612b856d2c8,081e43c49bd6377b731b2fe7ad45a4cf8940254b,c8e7b467794a0173409752933085ae20e15bf1ef,,True,True,59b84830ef201b2c480ac6d9889976664fa5efb36a9a5142c86748edc15e689e,Tests_passed,417b73bf6549d5a143b9d13842ccf8333cda6a1cfdaa3c6f3cdc0e0dc1516004,Tests_passed,True,True,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,0.047354698181152344,0.02198958396911621,0.03225851058959961,0.04009127616882324,0.04873847961425781,0.021117448806762695,0.023444652557373047,0.12804293632507324,0.026005983352661133,0.2263946533203125,0.22678899765014648,0.09441828727722168,0.045067787170410156,0.243316650390625 +87,refs/remotes/origin/pull/377,2d0ad5c65cce8775c486edf607726612b856d2c8,081e43c49bd6377b731b2fe7ad45a4cf8940254b,c8e7b467794a0173409752933085ae20e15bf1ef,,True,True,59b84830ef201b2c480ac6d9889976664fa5efb36a9a5142c86748edc15e689e,Tests_passed,417b73bf6549d5a143b9d13842ccf8333cda6a1cfdaa3c6f3cdc0e0dc1516004,Tests_passed,True,True,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,0.047354698181152344,0.02198958396911621,0.03225851058959961,0.04009127616882324,0.04873847961425781,0.021117448806762695,0.023444652557373047,0.12804293632507324,0.026005983352661133,0.23812007904052734,0.20760607719421387,0.09441828727722168,0.045067787170410156,0.243316650390625 diff --git a/results/greatest_hits/merges_timed/apache/commons-lang.csv b/results/greatest_hits/merges_timed/apache/commons-lang.csv index eb3b5f5677..9b2bd50dfc 100644 --- a/results/greatest_hits/merges_timed/apache/commons-lang.csv +++ b/results/greatest_hits/merges_timed/apache/commons-lang.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -265,refs/remotes/origin/pull/533,62f744a7f25bc456354f23fb3e1b7455a4c53f7a,7efeb41b0af70d104e6431c48e74bf9557b65945,3d4ed4a8ac63db1e51601ffc31fed44dccbb276c,,True,True,0d08e2a4f5e5e921e2ad0ad6b1b80feeecbb8b0e20d68e69945b4b9188bf71e6,Tests_passed,e63b0db615d9362451c87441119d9c191de3ec3274fbb1cad823e6fe85e78665,Tests_passed,True,True,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,1cc72622ca9d77ddb424a96ec2eca55983fdad79946761fcd7e4d686e0d8fd0f,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,1dd768934b96b7a48f7ceb3594e8028335e14043b7238047b8e8a04f8f612b1d,Merge_failed,1dd768934b96b7a48f7ceb3594e8028335e14043b7238047b8e8a04f8f612b1d,Merge_failed,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,0.03367948532104492,0.0354154109954834,0.06110715866088867,0.051660776138305664,0.04875802993774414,0.03947019577026367,0.05798006057739258,0.23211932182312012,0.06293272972106934,0.24850988388061523,0.24681472778320312,0.16912579536437988,0.05789828300476074,0.4196500778198242 +265,refs/remotes/origin/pull/533,62f744a7f25bc456354f23fb3e1b7455a4c53f7a,7efeb41b0af70d104e6431c48e74bf9557b65945,3d4ed4a8ac63db1e51601ffc31fed44dccbb276c,,True,True,0d08e2a4f5e5e921e2ad0ad6b1b80feeecbb8b0e20d68e69945b4b9188bf71e6,Tests_passed,e63b0db615d9362451c87441119d9c191de3ec3274fbb1cad823e6fe85e78665,Tests_passed,True,True,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,1cc72622ca9d77ddb424a96ec2eca55983fdad79946761fcd7e4d686e0d8fd0f,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,1dd768934b96b7a48f7ceb3594e8028335e14043b7238047b8e8a04f8f612b1d,Merge_failed,1dd768934b96b7a48f7ceb3594e8028335e14043b7238047b8e8a04f8f612b1d,Merge_failed,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,0.03367948532104492,0.0354154109954834,0.06110715866088867,0.051660776138305664,0.04875802993774414,0.03947019577026367,0.05798006057739258,0.23211932182312012,0.06293272972106934,0.24442577362060547,0.24461936950683594,0.16912579536437988,0.05789828300476074,0.4196500778198242 diff --git a/results/greatest_hits/merges_timed/apache/shiro.csv b/results/greatest_hits/merges_timed/apache/shiro.csv index ca548495f2..f62623c959 100644 --- a/results/greatest_hits/merges_timed/apache/shiro.csv +++ b/results/greatest_hits/merges_timed/apache/shiro.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,Tests_passed,True,True,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,0.06206202507019043,0.04825615882873535,0.06627464294433594,0.06613874435424805,0.06657147407531738,0.06125378608703613,0.06211209297180176,0.16224884986877441,0.05630850791931152,0.17105388641357422,0.17084097862243652,0.12031435966491699,0.795459508895874,0.3329942226409912 +439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,Tests_passed,True,True,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,0.06206202507019043,0.04825615882873535,0.06627464294433594,0.06613874435424805,0.06657147407531738,0.06125378608703613,0.06211209297180176,0.16224884986877441,0.05630850791931152,0.16827678680419922,0.16873383522033691,0.12031435966491699,0.795459508895874,0.3329942226409912 diff --git a/results/greatest_hits/merges_timed/apache/tomcat-maven-plugin.csv b/results/greatest_hits/merges_timed/apache/tomcat-maven-plugin.csv index 3833249820..c4b5797369 100644 --- a/results/greatest_hits/merges_timed/apache/tomcat-maven-plugin.csv +++ b/results/greatest_hits/merges_timed/apache/tomcat-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,Tests_passed,True,True,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,0.04308342933654785,0.043390512466430664,0.05500459671020508,0.05586647987365723,0.05513334274291992,0.05595898628234863,0.05487871170043945,0.10307192802429199,0.04319477081298828,0.3303372859954834,0.35357069969177246,0.15503835678100586,2.104686975479126,0.2927074432373047 +4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,Tests_passed,True,True,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,0.04308342933654785,0.043390512466430664,0.05500459671020508,0.05586647987365723,0.05513334274291992,0.05595898628234863,0.05487871170043945,0.10307192802429199,0.04319477081298828,0.34964632987976074,0.35091614723205566,0.15503835678100586,2.104686975479126,0.2927074432373047 diff --git a/results/greatest_hits/merges_timed/ata4/disunity.csv b/results/greatest_hits/merges_timed/ata4/disunity.csv index 783f108026..f9441f9f57 100644 --- a/results/greatest_hits/merges_timed/ata4/disunity.csv +++ b/results/greatest_hits/merges_timed/ata4/disunity.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,Tests_passed,True,True,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,9fbe906d812c5973cc7445327bbe2d58cfa28b84503895fd2891582dd500598a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,9fbe906d812c5973cc7445327bbe2d58cfa28b84503895fd2891582dd500598a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,3f0f63394add0726664a5d7fdc21be93cbe657fd1ba4ab5fbf13ca4121792461,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,13c85d4a949ecc4839c1e4d29d761375a4c0c6eb74bb2294d79b464541f5077d,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,0.1039888858795166,0.10417532920837402,0.18209600448608398,0.09692573547363281,0.1815509796142578,0.09480071067810059,0.18160700798034668,0.23134541511535645,0.12489891052246094,0.10325884819030762,0.10377192497253418,0.21884918212890625,0.10659098625183105,0.41564035415649414 +3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,Tests_passed,True,True,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,9fbe906d812c5973cc7445327bbe2d58cfa28b84503895fd2891582dd500598a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,9fbe906d812c5973cc7445327bbe2d58cfa28b84503895fd2891582dd500598a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,3f0f63394add0726664a5d7fdc21be93cbe657fd1ba4ab5fbf13ca4121792461,Merge_failed,18feb315eb68ef94fff9f37c8031584691604d06e63bcb44fb02347d65b2dc4a,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,13c85d4a949ecc4839c1e4d29d761375a4c0c6eb74bb2294d79b464541f5077d,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,0.1039888858795166,0.10417532920837402,0.18209600448608398,0.09692573547363281,0.1815509796142578,0.09480071067810059,0.18160700798034668,0.23134541511535645,0.12489891052246094,0.1015617847442627,0.10219430923461914,0.21884918212890625,0.10659098625183105,0.41564035415649414 diff --git a/results/greatest_hits/merges_timed/athou/commafeed.csv b/results/greatest_hits/merges_timed/athou/commafeed.csv index d67a9b8a71..67926a2aec 100644 --- a/results/greatest_hits/merges_timed/athou/commafeed.csv +++ b/results/greatest_hits/merges_timed/athou/commafeed.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -211,refs/heads/master,41344e08f72ae44e694fe561330385c1462709bb,0de19a2d182bca10623b9adf5787ba364edc210e,6f35491ec6a85e76235fdb284932f911163e2b9c,,True,True,eb9f8f4ba0180c5d5314a3dbc04d89eb7e2b135a7cd3116304718afc28ef54c1,Tests_passed,e702bf1a920651a390908ab6f06ccbd4c02dd157f03d71096892f10645d98c3e,Tests_passed,True,True,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,0.04391169548034668,0.02853107452392578,0.05548214912414551,0.03167438507080078,0.05568099021911621,0.03195905685424805,0.05533170700073242,0.15135836601257324,0.0481414794921875,0.1734776496887207,0.15895438194274902,0.0884239673614502,1.131885051727295,0.260056734085083 +211,refs/heads/master,41344e08f72ae44e694fe561330385c1462709bb,0de19a2d182bca10623b9adf5787ba364edc210e,6f35491ec6a85e76235fdb284932f911163e2b9c,,True,True,eb9f8f4ba0180c5d5314a3dbc04d89eb7e2b135a7cd3116304718afc28ef54c1,Tests_passed,e702bf1a920651a390908ab6f06ccbd4c02dd157f03d71096892f10645d98c3e,Tests_passed,True,True,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,0.04391169548034668,0.02853107452392578,0.05548214912414551,0.03167438507080078,0.05568099021911621,0.03195905685424805,0.05533170700073242,0.15135836601257324,0.0481414794921875,0.17188477516174316,0.17274880409240723,0.0884239673614502,1.131885051727295,0.260056734085083 diff --git a/results/greatest_hits/merges_timed/auth0/java-jwt.csv b/results/greatest_hits/merges_timed/auth0/java-jwt.csv index 8c60803bb5..fbf048985f 100644 --- a/results/greatest_hits/merges_timed/auth0/java-jwt.csv +++ b/results/greatest_hits/merges_timed/auth0/java-jwt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -219,refs/remotes/origin/pull/564,75ee6a33c14697af6c1b18b10c6a3603f0f8d121,9955599c1fb3db9927ab438356f5ae18118631ae,0333526d9a3d2893b9abb506cc38cc83de091776,,3955085f8aeba2e69102f70a2bd22de2474b68479b470fff8270ca3c1a3ce25c,Tests_passed,010f6c9866cba61a18d308d217f4881f4886852e000e6c76fb6d878a3d9679c0,Tests_passed,True,True,True,True,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,e03fc569b3ce845319eda3807bd63c3d69973e6c7ff1bb7a708f33025805643c,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,b5c206235b1cacccc3b01436cbb3d045c1f21cf88bd91d90695e8df1930b3af0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,b5fd2404497b663b447c40663f38832aa80a7fc78b0bf0ee6811cf3c29bb7f1b,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,3dd3a6ab7aeb1959d1e66c50faf4e20a13e895ce5dae0ad50b0e214680fff4e3,Merge_failed,3dd3a6ab7aeb1959d1e66c50faf4e20a13e895ce5dae0ad50b0e214680fff4e3,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,7696f16f686d7f3c1205c7746ca0a5c243d8436072339a4d59164c5dc5aebb23,0.06605100631713867,0.04931831359863281,0.050232887268066406,0.056230783462524414,0.048090219497680664,0.0627899169921875,0.05784153938293457,0.6624741554260254,0.08639764785766602,1.0270538330078125,1.036566972732544,0.5039567947387695,7.294728994369507,0.2705724239349365 +219,refs/remotes/origin/pull/564,75ee6a33c14697af6c1b18b10c6a3603f0f8d121,9955599c1fb3db9927ab438356f5ae18118631ae,0333526d9a3d2893b9abb506cc38cc83de091776,,3955085f8aeba2e69102f70a2bd22de2474b68479b470fff8270ca3c1a3ce25c,Tests_passed,010f6c9866cba61a18d308d217f4881f4886852e000e6c76fb6d878a3d9679c0,Tests_passed,True,True,True,True,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,e03fc569b3ce845319eda3807bd63c3d69973e6c7ff1bb7a708f33025805643c,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,b5c206235b1cacccc3b01436cbb3d045c1f21cf88bd91d90695e8df1930b3af0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,b5fd2404497b663b447c40663f38832aa80a7fc78b0bf0ee6811cf3c29bb7f1b,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,3dd3a6ab7aeb1959d1e66c50faf4e20a13e895ce5dae0ad50b0e214680fff4e3,Merge_failed,3dd3a6ab7aeb1959d1e66c50faf4e20a13e895ce5dae0ad50b0e214680fff4e3,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,7696f16f686d7f3c1205c7746ca0a5c243d8436072339a4d59164c5dc5aebb23,0.06605100631713867,0.04931831359863281,0.050232887268066406,0.056230783462524414,0.048090219497680664,0.0627899169921875,0.05784153938293457,0.6624741554260254,0.08639764785766602,1.0305755138397217,1.036090612411499,0.5039567947387695,7.294728994369507,0.2705724239349365 diff --git a/results/greatest_hits/merges_timed/awaitility/awaitility.csv b/results/greatest_hits/merges_timed/awaitility/awaitility.csv index 05e5bb80ac..e35e5eee8d 100644 --- a/results/greatest_hits/merges_timed/awaitility/awaitility.csv +++ b/results/greatest_hits/merges_timed/awaitility/awaitility.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,Tests_passed,True,True,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,5da5841c61b69626dca41611c5683ff7b3dea7a55d846b93a4171f681ef24d0c,Merge_failed,033d23b19ffce5b7c38e57ed620929bf493b677fbcaeb4d285f6fdc19defe797,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,0.03825807571411133,0.026620864868164062,0.047556161880493164,0.01991438865661621,0.02585744857788086,0.05531501770019531,0.04225420951843262,0.22882771492004395,0.06444644927978516,0.24308466911315918,0.2410893440246582,0.17362451553344727,1.2263951301574707,0.19228124618530273 +45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,Tests_passed,True,True,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,c067731ec2458d4ad8b808739b074a897a08377ba65941439b155ed93574bcfb,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,5da5841c61b69626dca41611c5683ff7b3dea7a55d846b93a4171f681ef24d0c,Merge_failed,033d23b19ffce5b7c38e57ed620929bf493b677fbcaeb4d285f6fdc19defe797,Merge_failed,94feb77489fc6ec88773718666737d1798e6785ce4058b65cc9e9ed516f6640e,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,a09bb7b5ea99e8547bd4d157c65fea2d3704ba6bd215d2b403bb7234d04fbef7,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,0.03825807571411133,0.026620864868164062,0.047556161880493164,0.01991438865661621,0.02585744857788086,0.05531501770019531,0.04225420951843262,0.22882771492004395,0.06444644927978516,0.24039864540100098,0.23975920677185059,0.17362451553344727,1.2263951301574707,0.19228124618530273 diff --git a/results/greatest_hits/merges_timed/bastillion-io/bastillion.csv b/results/greatest_hits/merges_timed/bastillion-io/bastillion.csv index 404cb99819..61819779af 100644 --- a/results/greatest_hits/merges_timed/bastillion-io/bastillion.csv +++ b/results/greatest_hits/merges_timed/bastillion-io/bastillion.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -98,refs/heads/master,551ae81d94b8f29f3486edf9ad1ec1be6fcfce9a,7e750d65b7f1c02c4ef6385771f2f6e5e2b81435,f3905553e7070af1bf784b42768c5b17851f260d,,True,True,bca3bc493b1a6821783af8694930392bae15267ef01ad6054af27ac16f3bd91b,Tests_passed,c33868eaa3a409f8b45e70e249c9d46d0e51a545dc44530e7241c3e25fa78c01,Tests_passed,True,True,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,0.040569305419921875,0.020774126052856445,0.040750741958618164,0.031053781509399414,0.0456082820892334,0.07231497764587402,0.021005868911743164,0.13183975219726562,0.0232546329498291,0.1616971492767334,0.17140507698059082,0.12875866889953613,1.1734318733215332,0.2192704677581787 +98,refs/heads/master,551ae81d94b8f29f3486edf9ad1ec1be6fcfce9a,7e750d65b7f1c02c4ef6385771f2f6e5e2b81435,f3905553e7070af1bf784b42768c5b17851f260d,,True,True,bca3bc493b1a6821783af8694930392bae15267ef01ad6054af27ac16f3bd91b,Tests_passed,c33868eaa3a409f8b45e70e249c9d46d0e51a545dc44530e7241c3e25fa78c01,Tests_passed,True,True,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,0.040569305419921875,0.020774126052856445,0.040750741958618164,0.031053781509399414,0.0456082820892334,0.07231497764587402,0.021005868911743164,0.13183975219726562,0.0232546329498291,0.1643075942993164,0.16906285285949707,0.12875866889953613,1.1734318733215332,0.2192704677581787 diff --git a/results/greatest_hits/merges_timed/biezhi/30-seconds-of-java8.csv b/results/greatest_hits/merges_timed/biezhi/30-seconds-of-java8.csv index 0ee991a2eb..edfe5c85cb 100644 --- a/results/greatest_hits/merges_timed/biezhi/30-seconds-of-java8.csv +++ b/results/greatest_hits/merges_timed/biezhi/30-seconds-of-java8.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/remotes/origin/pull/7,6b515ec5c78bdea3f3175bc443ad871d41a8eccf,d05e3e39138170814f8a101fd86262cb733095ba,598ae2a3ef829753d509b68e862eeb3a2f19ccff,,83a2f4ff2e6006ae3321d232c58910d1406919bd0173b4d99a2844d1386d13db,Tests_passed,cf2784b3400dd3de9b1f1f17422b4c7679bff904c41e0cc9748f03bd1f37d695,Tests_passed,True,True,True,True,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,aecc17bc717623a21984d3b3e27ed054c58492c0002ecbfb4b744d531573194d,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,57a2703de4d410b84f8440e1ccb99ae48e8c62587b1db175dd0e8c466be80b7f,Merge_failed,57a2703de4d410b84f8440e1ccb99ae48e8c62587b1db175dd0e8c466be80b7f,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Merge_failed,e5a7d2fb1d2c8912db8c839061974303a03845a5d691428e6a93f8e7a5227a89,0.04017519950866699,0.0380709171295166,0.039852142333984375,0.03662991523742676,0.0381929874420166,0.03687429428100586,0.037882089614868164,0.16466546058654785,0.060738325119018555,0.07364797592163086,0.06412029266357422,0.11150431632995605,1.436072587966919,0.17769217491149902 +1,refs/remotes/origin/pull/7,6b515ec5c78bdea3f3175bc443ad871d41a8eccf,d05e3e39138170814f8a101fd86262cb733095ba,598ae2a3ef829753d509b68e862eeb3a2f19ccff,,83a2f4ff2e6006ae3321d232c58910d1406919bd0173b4d99a2844d1386d13db,Tests_passed,cf2784b3400dd3de9b1f1f17422b4c7679bff904c41e0cc9748f03bd1f37d695,Tests_passed,True,True,True,True,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,aecc17bc717623a21984d3b3e27ed054c58492c0002ecbfb4b744d531573194d,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,57a2703de4d410b84f8440e1ccb99ae48e8c62587b1db175dd0e8c466be80b7f,Merge_failed,57a2703de4d410b84f8440e1ccb99ae48e8c62587b1db175dd0e8c466be80b7f,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Merge_failed,e5a7d2fb1d2c8912db8c839061974303a03845a5d691428e6a93f8e7a5227a89,0.04017519950866699,0.0380709171295166,0.039852142333984375,0.03662991523742676,0.0381929874420166,0.03687429428100586,0.037882089614868164,0.16466546058654785,0.060738325119018555,0.06453299522399902,0.07380485534667969,0.11150431632995605,1.436072587966919,0.17769217491149902 diff --git a/results/greatest_hits/merges_timed/bytedeco/javacpp.csv b/results/greatest_hits/merges_timed/bytedeco/javacpp.csv index 33fb40980d..dd17df2e5a 100644 --- a/results/greatest_hits/merges_timed/bytedeco/javacpp.csv +++ b/results/greatest_hits/merges_timed/bytedeco/javacpp.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -43,refs/remotes/origin/pull/658,d0d81140d1557312cd24f331fdc54cfbe4af33e5,c78695feb6c380b5dd72151eb85e7da8e9926925,7a72aacb313e6b2bc488147a4cb2e89ef5eecac8,,True,True,c5064432e6d1e38a608b3c04be7522852ff5a60987081cc89301526816f2e8cc,Tests_passed,4e2250bff77ced11abbd1dfd94c7843c9d4e25870d0c40b7d11d101f9ebaf73d,Tests_passed,True,True,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,ba9e08f0cd722cee8f813a075241adbbe82a51631dce1da94f734489b3683577,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,6196388f618e9ffc399ba48244afabfb8f7d2af8bb61d1af20eea3c54ba8818e,Merge_failed,6196388f618e9ffc399ba48244afabfb8f7d2af8bb61d1af20eea3c54ba8818e,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Tests_passed,3e5b13892ff7a6f9e8489fe9702280df931bc211d589fed82befd7e4baf89566,Merge_failed,4bb6de901575a635c0b7311e0c0addeda481b6ca450f066a2e78dcb852acca98,0.04938936233520508,0.048209190368652344,0.04940032958984375,0.03403615951538086,0.053556203842163086,0.059857845306396484,0.03450894355773926,0.1909186840057373,0.07374334335327148,0.09711217880249023,0.09765958786010742,0.1036531925201416,5.2480409145355225,0.2519819736480713 +43,refs/remotes/origin/pull/658,d0d81140d1557312cd24f331fdc54cfbe4af33e5,c78695feb6c380b5dd72151eb85e7da8e9926925,7a72aacb313e6b2bc488147a4cb2e89ef5eecac8,,True,True,c5064432e6d1e38a608b3c04be7522852ff5a60987081cc89301526816f2e8cc,Tests_passed,4e2250bff77ced11abbd1dfd94c7843c9d4e25870d0c40b7d11d101f9ebaf73d,Tests_passed,True,True,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,ba9e08f0cd722cee8f813a075241adbbe82a51631dce1da94f734489b3683577,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,6196388f618e9ffc399ba48244afabfb8f7d2af8bb61d1af20eea3c54ba8818e,Merge_failed,6196388f618e9ffc399ba48244afabfb8f7d2af8bb61d1af20eea3c54ba8818e,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Tests_passed,3e5b13892ff7a6f9e8489fe9702280df931bc211d589fed82befd7e4baf89566,Merge_failed,4bb6de901575a635c0b7311e0c0addeda481b6ca450f066a2e78dcb852acca98,0.04938936233520508,0.048209190368652344,0.04940032958984375,0.03403615951538086,0.053556203842163086,0.059857845306396484,0.03450894355773926,0.1909186840057373,0.07374334335327148,0.08566093444824219,0.09581875801086426,0.1036531925201416,5.2480409145355225,0.2519819736480713 diff --git a/results/greatest_hits/merges_timed/cglib/cglib.csv b/results/greatest_hits/merges_timed/cglib/cglib.csv index 4ba0f5fc9a..1869008f74 100644 --- a/results/greatest_hits/merges_timed/cglib/cglib.csv +++ b/results/greatest_hits/merges_timed/cglib/cglib.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,Tests_passed,True,True,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,0.03728628158569336,0.04141545295715332,0.012869834899902344,0.03226780891418457,0.01594996452331543,0.04367542266845703,0.03709769248962402,0.13685393333435059,0.03406095504760742,0.16551589965820312,0.16433238983154297,0.08227705955505371,0.03081512451171875,0.1733090877532959 +42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,Tests_passed,True,True,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,0.03728628158569336,0.04141545295715332,0.012869834899902344,0.03226780891418457,0.01594996452331543,0.04367542266845703,0.03709769248962402,0.13685393333435059,0.03406095504760742,0.1633930206298828,0.16275787353515625,0.08227705955505371,0.03081512451171875,0.1733090877532959 diff --git a/results/greatest_hits/merges_timed/clojure/clojure.csv b/results/greatest_hits/merges_timed/clojure/clojure.csv index 57babc88fd..4b09220837 100644 --- a/results/greatest_hits/merges_timed/clojure/clojure.csv +++ b/results/greatest_hits/merges_timed/clojure/clojure.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -60,refs/remotes/origin/dev-array-type-syms,a7286b3ceeddd30571a61bd079d5f0fd1aad5933,c462337da43258aa5dfed0853c696b95786014c3,ffbb09b5ef55b9dfa88d16aedd44319a4b33b666,,True,True,a38b58682530874a2c3b5be2ef8041248658f6b8981aef78ccc2529ee1692bde,Tests_passed,69607893e301ad982908fb580124f0199d386f3a3bfddaae8a81d4c27745597a,Tests_passed,True,True,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_passed,0b4a45c5f38d9027723fc668b55784284b41f593ffbd6ee69385fe4f07c57998,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,0.06612181663513184,0.07367110252380371,0.03695869445800781,0.027616500854492188,0.029742717742919922,0.03697681427001953,0.058371543884277344,0.21283864974975586,0.06045794486999512,0.25936198234558105,0.28259778022766113,0.11454176902770996,12.79997181892395,0.2529881000518799 +60,refs/remotes/origin/dev-array-type-syms,a7286b3ceeddd30571a61bd079d5f0fd1aad5933,c462337da43258aa5dfed0853c696b95786014c3,ffbb09b5ef55b9dfa88d16aedd44319a4b33b666,,True,True,a38b58682530874a2c3b5be2ef8041248658f6b8981aef78ccc2529ee1692bde,Tests_passed,69607893e301ad982908fb580124f0199d386f3a3bfddaae8a81d4c27745597a,Tests_passed,True,True,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,Tests_passed,0b4a45c5f38d9027723fc668b55784284b41f593ffbd6ee69385fe4f07c57998,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,0.06612181663513184,0.07367110252380371,0.03695869445800781,0.027616500854492188,0.029742717742919922,0.03697681427001953,0.058371543884277344,0.21283864974975586,0.06045794486999512,0.26729393005371094,0.26877689361572266,0.11454176902770996,12.79997181892395,0.2529881000518799 diff --git a/results/greatest_hits/merges_timed/code4craft/webmagic.csv b/results/greatest_hits/merges_timed/code4craft/webmagic.csv index 644919bc62..51709fd42f 100644 --- a/results/greatest_hits/merges_timed/code4craft/webmagic.csv +++ b/results/greatest_hits/merges_timed/code4craft/webmagic.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,Tests_passed,True,True,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,bb58cb2f36045cc51631e1922e9634dd1cde0346ddfae3f00517c61aad84c2f2,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,4237c3a468cf71c72268a741121339c39877131a6b45fc64c64caa63a9fe9d76,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,e9ed831755b848e8e802ce123d403f6c1b347973bdd76c03db28d64c799f911d,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,e455ac71e25911ba12dba928ffc88ec0134120b5644d3d876bfad13fa5aec65e,Merge_failed,e455ac71e25911ba12dba928ffc88ec0134120b5644d3d876bfad13fa5aec65e,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,0.06307768821716309,0.07529497146606445,0.08739137649536133,0.08552837371826172,0.07785582542419434,0.08044767379760742,0.07998180389404297,0.9370880126953125,0.16465234756469727,0.8287713527679443,0.8234767913818359,0.7516984939575195,4.715071201324463,0.3627636432647705 +163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,Tests_passed,True,True,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,bb58cb2f36045cc51631e1922e9634dd1cde0346ddfae3f00517c61aad84c2f2,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,4237c3a468cf71c72268a741121339c39877131a6b45fc64c64caa63a9fe9d76,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,e9ed831755b848e8e802ce123d403f6c1b347973bdd76c03db28d64c799f911d,Merge_failed,db93d4869e5be5e53af5986752b615cb5daf6b15685cf435b5256e8e308e7164,Merge_failed,e455ac71e25911ba12dba928ffc88ec0134120b5644d3d876bfad13fa5aec65e,Merge_failed,e455ac71e25911ba12dba928ffc88ec0134120b5644d3d876bfad13fa5aec65e,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,0.06307768821716309,0.07529497146606445,0.08739137649536133,0.08552837371826172,0.07785582542419434,0.08044767379760742,0.07998180389404297,0.9370880126953125,0.16465234756469727,0.8138673305511475,0.8152871131896973,0.7516984939575195,4.715071201324463,0.3627636432647705 diff --git a/results/greatest_hits/merges_timed/deathmarine/luyten.csv b/results/greatest_hits/merges_timed/deathmarine/luyten.csv index 52af04f010..52fdbb1575 100644 --- a/results/greatest_hits/merges_timed/deathmarine/luyten.csv +++ b/results/greatest_hits/merges_timed/deathmarine/luyten.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/remotes/origin/pull/130,fc86bc1229c69966e56c737e4d56f8c1fdcc4fd4,6d255bec8b137886ac3be3305f775b1467fc412e,ba68ee10ef017cc92bcffdb3c7a33c64397e84bb,,True,True,d0121556342394f04dccc77d4d3bdbdabdafe867113e5a48cc9eba0ae39e129f,Tests_passed,308ec2594da2ff02fc40e524921ddecfd669215d339f40d5f715c93982396738,Tests_passed,True,True,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,f99aa30790233e62f9a2f7b0640846a01cff0f66770282c9bb36ac007334ee77,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,6e6b9c5f4cdc4072edecdec46506c96fda5e377390e785ad74806d20483a2f77,Merge_failed,6e6b9c5f4cdc4072edecdec46506c96fda5e377390e785ad74806d20483a2f77,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,806e28e79a3287ea3bb63d592aa5e00a804c3dac66594ea387c8080e474ded27,0.050156354904174805,0.04946017265319824,0.04407072067260742,0.03726649284362793,0.05259966850280762,0.03802061080932617,0.04709768295288086,0.4507267475128174,0.05830740928649902,0.5374207496643066,0.5349500179290771,0.32177090644836426,5.275756359100342,0.20791983604431152 +19,refs/remotes/origin/pull/130,fc86bc1229c69966e56c737e4d56f8c1fdcc4fd4,6d255bec8b137886ac3be3305f775b1467fc412e,ba68ee10ef017cc92bcffdb3c7a33c64397e84bb,,True,True,d0121556342394f04dccc77d4d3bdbdabdafe867113e5a48cc9eba0ae39e129f,Tests_passed,308ec2594da2ff02fc40e524921ddecfd669215d339f40d5f715c93982396738,Tests_passed,True,True,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,f99aa30790233e62f9a2f7b0640846a01cff0f66770282c9bb36ac007334ee77,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,6e6b9c5f4cdc4072edecdec46506c96fda5e377390e785ad74806d20483a2f77,Merge_failed,6e6b9c5f4cdc4072edecdec46506c96fda5e377390e785ad74806d20483a2f77,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,806e28e79a3287ea3bb63d592aa5e00a804c3dac66594ea387c8080e474ded27,0.050156354904174805,0.04946017265319824,0.04407072067260742,0.03726649284362793,0.05259966850280762,0.03802061080932617,0.04709768295288086,0.4507267475128174,0.05830740928649902,0.5289928913116455,0.5335562229156494,0.32177090644836426,5.275756359100342,0.20791983604431152 diff --git a/results/greatest_hits/merges_timed/deemopen/zkui.csv b/results/greatest_hits/merges_timed/deemopen/zkui.csv index fd1972b3f9..297835249d 100644 --- a/results/greatest_hits/merges_timed/deemopen/zkui.csv +++ b/results/greatest_hits/merges_timed/deemopen/zkui.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,Tests_passed,True,True,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,109bcc155f93f4c7318760ac764d0a2a4cbd44b5bf7871f2c6be98c40704e0f4,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Tests_failed,f53c56861ccd9b65b83423fea7f02c2e29908bebecebabeda5480ca394cfc569,Tests_failed,f53c56861ccd9b65b83423fea7f02c2e29908bebecebabeda5480ca394cfc569,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Merge_failed,c84901af3d21ebeb9fd081ad375c66f8bd2960f41d9d3d58ee3954849f3a2ba0,0.014339923858642578,0.014275550842285156,0.015705108642578125,0.015341520309448242,0.015495538711547852,0.015753507614135742,0.015804529190063477,0.05568671226501465,0.018767595291137695,0.30706214904785156,0.30794215202331543,0.12610960006713867,1.2856645584106445,0.18334245681762695 +16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,Tests_passed,True,True,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,109bcc155f93f4c7318760ac764d0a2a4cbd44b5bf7871f2c6be98c40704e0f4,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Tests_failed,f53c56861ccd9b65b83423fea7f02c2e29908bebecebabeda5480ca394cfc569,Tests_failed,f53c56861ccd9b65b83423fea7f02c2e29908bebecebabeda5480ca394cfc569,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Merge_failed,c84901af3d21ebeb9fd081ad375c66f8bd2960f41d9d3d58ee3954849f3a2ba0,0.014339923858642578,0.014275550842285156,0.015705108642578125,0.015341520309448242,0.015495538711547852,0.015753507614135742,0.015804529190063477,0.05568671226501465,0.018767595291137695,0.304640531539917,0.30428433418273926,0.12610960006713867,1.2856645584106445,0.18334245681762695 diff --git a/results/greatest_hits/merges_timed/dius/java-faker.csv b/results/greatest_hits/merges_timed/dius/java-faker.csv index d4eb1830be..250d910eb9 100644 --- a/results/greatest_hits/merges_timed/dius/java-faker.csv +++ b/results/greatest_hits/merges_timed/dius/java-faker.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -64,refs/heads/master,54149209be7428d6580269758b5a0a01d945bd11,0e4a4b8af5968a26b6354e1f7d4de2922d63835c,1ebdf4f9dbdaae373c3a070069bf70f4616fd30a,,True,True,b7197dbe7403115f908c3895f1943fe99770750c393ff4636ca558a46062b0c3,Tests_passed,7d3950bff925778dd860dbfe7205e033b2d13114bcb4225e3e777d1a449869b5,Tests_passed,True,True,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,51fe7b78f9a2d231bdcb400219e0989a32977a51408451ec77184b6e1c18a520,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,51fe7b78f9a2d231bdcb400219e0989a32977a51408451ec77184b6e1c18a520,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,471fa4781ca012476051516c3a02e6f5207755fb033e73f28caa3c6012013edf,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,68cccd0c7212de388c2811c26d1e0d723732d27b4107c6b3628b40b0858fabcb,Merge_failed,68cccd0c7212de388c2811c26d1e0d723732d27b4107c6b3628b40b0858fabcb,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Merge_failed,1dccb2b71fd99689484662610acc7d3d49c9e6ba6c73b3a0d5170b6d48f453d6,0.029715538024902344,0.05209827423095703,0.04571127891540527,0.04636192321777344,0.03383326530456543,0.03962063789367676,0.048421621322631836,0.3156876564025879,0.06786370277404785,0.1330249309539795,0.13341426849365234,0.2385845184326172,1.9065899848937988,0.26624298095703125 +64,refs/heads/master,54149209be7428d6580269758b5a0a01d945bd11,0e4a4b8af5968a26b6354e1f7d4de2922d63835c,1ebdf4f9dbdaae373c3a070069bf70f4616fd30a,,True,True,b7197dbe7403115f908c3895f1943fe99770750c393ff4636ca558a46062b0c3,Tests_passed,7d3950bff925778dd860dbfe7205e033b2d13114bcb4225e3e777d1a449869b5,Tests_passed,True,True,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,51fe7b78f9a2d231bdcb400219e0989a32977a51408451ec77184b6e1c18a520,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,51fe7b78f9a2d231bdcb400219e0989a32977a51408451ec77184b6e1c18a520,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,471fa4781ca012476051516c3a02e6f5207755fb033e73f28caa3c6012013edf,Merge_failed,94767950043d980079ae257bfbd327a98c861d0ee0b706d2468ef9954d5700aa,Merge_failed,68cccd0c7212de388c2811c26d1e0d723732d27b4107c6b3628b40b0858fabcb,Merge_failed,68cccd0c7212de388c2811c26d1e0d723732d27b4107c6b3628b40b0858fabcb,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Merge_failed,1dccb2b71fd99689484662610acc7d3d49c9e6ba6c73b3a0d5170b6d48f453d6,0.029715538024902344,0.05209827423095703,0.04571127891540527,0.04636192321777344,0.03383326530456543,0.03962063789367676,0.048421621322631836,0.3156876564025879,0.06786370277404785,0.1340639591217041,0.15976357460021973,0.2385845184326172,1.9065899848937988,0.26624298095703125 diff --git a/results/greatest_hits/merges_timed/eirslett/frontend-maven-plugin.csv b/results/greatest_hits/merges_timed/eirslett/frontend-maven-plugin.csv index 5580980751..dbea7a333d 100644 --- a/results/greatest_hits/merges_timed/eirslett/frontend-maven-plugin.csv +++ b/results/greatest_hits/merges_timed/eirslett/frontend-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -205,refs/remotes/origin/pull/553,16d0b92ccb95873464210ae627841b4891b78dbd,f353ca49b4893c7ec32bc95bf4ea54e7217cf8e2,7c7f71ea0a5bdea86e94a09d5ae684fcb59a9921,,85a6775a000c9ec94d2fdd1a3e003b44a03c4f7a74b0b20460b8124333982313,Tests_passed,070989b4b3a6b016bdbb4368e41adabb95b3a99e22ad1380c7c9a7887838e262,Tests_passed,True,True,True,True,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,cc5b84d1a170944705c42e3118b59f13fc54de897f70297d6162b7ce2586ac54,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,cc5b84d1a170944705c42e3118b59f13fc54de897f70297d6162b7ce2586ac54,Merge_failed,f22f4304afbb36719b23559ba2d6236f63bdbd727c626d0f815db3ad3d13c9d5,Merge_failed,f22f4304afbb36719b23559ba2d6236f63bdbd727c626d0f815db3ad3d13c9d5,Merge_failed,c369168b0b58b4db03c35b484678ffccdfd97b1ccde439990d2512269656146e,Merge_failed,4a238e7fcda0763d65e1cdeb1df25bc2217434622fce9e7a66f6cfe0bcbabd1f,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,d88bf703e791a25d58f7f951dd07644c2735bc6dc3c8cc809ea70572fbdb76c7,Merge_failed,95851fb994002e79b33f49469ca4e126e6dd35de36ede06f22782e762fa40765,Merge_failed,0a657adc0f119bb4474de150a3eaa09e1ad83bc9b1479b981623b8d02548da54,Merge_failed,7cefebbea769c9d816cfdb58a64a0dbc185b67dfb0191a4e6ab97f3e61c3791b,Merge_failed,679d76747806737201dd0eb0f4fb77c0af95eda8d23ef711a46f15520c3bde73,0.050534725189208984,0.057645320892333984,0.05497908592224121,0.04358100891113281,0.03913569450378418,0.04951119422912598,0.05612611770629883,0.5427734851837158,0.1367630958557129,0.2513916492462158,0.24916672706604004,0.4687974452972412,1.1047439575195312,0.22354769706726074 +205,refs/remotes/origin/pull/553,16d0b92ccb95873464210ae627841b4891b78dbd,f353ca49b4893c7ec32bc95bf4ea54e7217cf8e2,7c7f71ea0a5bdea86e94a09d5ae684fcb59a9921,,85a6775a000c9ec94d2fdd1a3e003b44a03c4f7a74b0b20460b8124333982313,Tests_passed,070989b4b3a6b016bdbb4368e41adabb95b3a99e22ad1380c7c9a7887838e262,Tests_passed,True,True,True,True,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,cc5b84d1a170944705c42e3118b59f13fc54de897f70297d6162b7ce2586ac54,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,cc5b84d1a170944705c42e3118b59f13fc54de897f70297d6162b7ce2586ac54,Merge_failed,f22f4304afbb36719b23559ba2d6236f63bdbd727c626d0f815db3ad3d13c9d5,Merge_failed,f22f4304afbb36719b23559ba2d6236f63bdbd727c626d0f815db3ad3d13c9d5,Merge_failed,c369168b0b58b4db03c35b484678ffccdfd97b1ccde439990d2512269656146e,Merge_failed,4a238e7fcda0763d65e1cdeb1df25bc2217434622fce9e7a66f6cfe0bcbabd1f,Merge_failed,ccea871f4dc64436328d0fef51c7647752998e1a5f98ad1f1908ac80b59650bf,Merge_failed,d88bf703e791a25d58f7f951dd07644c2735bc6dc3c8cc809ea70572fbdb76c7,Merge_failed,95851fb994002e79b33f49469ca4e126e6dd35de36ede06f22782e762fa40765,Merge_failed,0a657adc0f119bb4474de150a3eaa09e1ad83bc9b1479b981623b8d02548da54,Merge_failed,7cefebbea769c9d816cfdb58a64a0dbc185b67dfb0191a4e6ab97f3e61c3791b,Merge_failed,679d76747806737201dd0eb0f4fb77c0af95eda8d23ef711a46f15520c3bde73,0.050534725189208984,0.057645320892333984,0.05497908592224121,0.04358100891113281,0.03913569450378418,0.04951119422912598,0.05612611770629883,0.5427734851837158,0.1367630958557129,0.24812579154968262,0.2503700256347656,0.4687974452972412,1.1047439575195312,0.22354769706726074 diff --git a/results/greatest_hits/merges_timed/elasticjob/elastic-job-lite.csv b/results/greatest_hits/merges_timed/elasticjob/elastic-job-lite.csv index 719f83d57a..cdea83879b 100644 --- a/results/greatest_hits/merges_timed/elasticjob/elastic-job-lite.csv +++ b/results/greatest_hits/merges_timed/elasticjob/elastic-job-lite.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -196,refs/heads/master,ca929e12875190c9739c66d0586d76bfbf52be0e,b0f86b549a9a946f890d49fc14ec55b46cac745f,7bde7e573a551418194fd49e2a95f16007cf2647,,322f5399ded6e36bed80726b35b5f2dc9147a4ee86b6d898286aec454295e85e,Tests_passed,4bd834c1265abdb6cf7330fd34017a14e34c393d56d7cdc3a92e9eecba41b010,Tests_passed,True,True,True,True,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,1f675039b382eec1212139f222f0e05025433f6693183481528f0d9299cac0e6,Tests_passed,1f675039b382eec1212139f222f0e05025433f6693183481528f0d9299cac0e6,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,0.05277061462402344,0.051134347915649414,0.06899714469909668,0.05671429634094238,0.06684231758117676,0.049898386001586914,0.04941964149475098,0.1657397747039795,0.056996822357177734,0.1675269603729248,0.16875219345092773,0.1069793701171875,1.0078010559082031,0.36532068252563477 +196,refs/heads/master,ca929e12875190c9739c66d0586d76bfbf52be0e,b0f86b549a9a946f890d49fc14ec55b46cac745f,7bde7e573a551418194fd49e2a95f16007cf2647,,322f5399ded6e36bed80726b35b5f2dc9147a4ee86b6d898286aec454295e85e,Tests_passed,4bd834c1265abdb6cf7330fd34017a14e34c393d56d7cdc3a92e9eecba41b010,Tests_passed,True,True,True,True,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,1f675039b382eec1212139f222f0e05025433f6693183481528f0d9299cac0e6,Tests_passed,1f675039b382eec1212139f222f0e05025433f6693183481528f0d9299cac0e6,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,0.05277061462402344,0.051134347915649414,0.06899714469909668,0.05671429634094238,0.06684231758117676,0.049898386001586914,0.04941964149475098,0.1657397747039795,0.056996822357177734,0.16846919059753418,0.1644432544708252,0.1069793701171875,1.0078010559082031,0.36532068252563477 diff --git a/results/greatest_hits/merges_timed/elunez/eladmin.csv b/results/greatest_hits/merges_timed/elunez/eladmin.csv index b820d722e4..2a93d5cf2a 100644 --- a/results/greatest_hits/merges_timed/elunez/eladmin.csv +++ b/results/greatest_hits/merges_timed/elunez/eladmin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/master,5959c3fc62add874df2562d95d24dcaa569d3453,68608b28e34ffa73d12df74555e9dc7d63bfc532,837f23080b0cb1d2f055229e040b355fab53e3e5,,True,True,3b5be13efb0ae2990606734c9b61bc3962a231a443e3f7e2fbc18fc2a439cb2b,Tests_passed,49cce913d7e69d8b8d6fe6e75171664ec02ac761d31eda9160efbe132cb2b937,Tests_passed,True,True,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,fd1ca2df337a47240b9a5bc601b47b31d53946c97a2c304993c435a546b4df85,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,0.03778386116027832,0.043836116790771484,0.05174088478088379,0.03505659103393555,0.048101186752319336,0.05415701866149902,0.04845237731933594,0.266085147857666,0.10584115982055664,0.016210317611694336,0.01575303077697754,0.17467880249023438,0.04268646240234375,0.31183457374572754 +2,refs/heads/master,5959c3fc62add874df2562d95d24dcaa569d3453,68608b28e34ffa73d12df74555e9dc7d63bfc532,837f23080b0cb1d2f055229e040b355fab53e3e5,,True,True,3b5be13efb0ae2990606734c9b61bc3962a231a443e3f7e2fbc18fc2a439cb2b,Tests_passed,49cce913d7e69d8b8d6fe6e75171664ec02ac761d31eda9160efbe132cb2b937,Tests_passed,True,True,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,fd1ca2df337a47240b9a5bc601b47b31d53946c97a2c304993c435a546b4df85,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,0.03778386116027832,0.043836116790771484,0.05174088478088379,0.03505659103393555,0.048101186752319336,0.05415701866149902,0.04845237731933594,0.266085147857666,0.10584115982055664,0.00984334945678711,0.015622138977050781,0.17467880249023438,0.04268646240234375,0.31183457374572754 diff --git a/results/greatest_hits/merges_timed/esotericsoftware/kryo.csv b/results/greatest_hits/merges_timed/esotericsoftware/kryo.csv index 5e190b52d7..6d4e4c6761 100644 --- a/results/greatest_hits/merges_timed/esotericsoftware/kryo.csv +++ b/results/greatest_hits/merges_timed/esotericsoftware/kryo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/heads/master,36b366102c717919d4d4b91451daa2e81f7416e9,cd0da250d97a7d1b0207db6df16d740fc6d3f70f,c2a94b46ff658505a1ecdd047a22bef4886573c5,,d8491a3920b0a3df8e37b0d86af3d60ad3ef4b4b54f103d5e50c5a2c943fbc63,Tests_passed,8d64f424f4f3be82660510152c07e5b182a15f60686232daa2a341adb9ddc8eb,Tests_passed,True,True,True,True,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,0.04732084274291992,0.05895113945007324,0.014632940292358398,0.0582273006439209,0.032381296157836914,0.014791727066040039,0.06124591827392578,0.2399277687072754,0.0408024787902832,0.4017980098724365,0.41942906379699707,0.14506936073303223,3.589958667755127,0.2883291244506836 +19,refs/heads/master,36b366102c717919d4d4b91451daa2e81f7416e9,cd0da250d97a7d1b0207db6df16d740fc6d3f70f,c2a94b46ff658505a1ecdd047a22bef4886573c5,,d8491a3920b0a3df8e37b0d86af3d60ad3ef4b4b54f103d5e50c5a2c943fbc63,Tests_passed,8d64f424f4f3be82660510152c07e5b182a15f60686232daa2a341adb9ddc8eb,Tests_passed,True,True,True,True,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,0.04732084274291992,0.05895113945007324,0.014632940292358398,0.0582273006439209,0.032381296157836914,0.014791727066040039,0.06124591827392578,0.2399277687072754,0.0408024787902832,0.4168100357055664,0.40471792221069336,0.14506936073303223,3.589958667755127,0.2883291244506836 diff --git a/results/greatest_hits/merges_timed/fasterxml/jackson-annotations.csv b/results/greatest_hits/merges_timed/fasterxml/jackson-annotations.csv index 371a5e0c81..af1e2c103d 100644 --- a/results/greatest_hits/merges_timed/fasterxml/jackson-annotations.csv +++ b/results/greatest_hits/merges_timed/fasterxml/jackson-annotations.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,Tests_passed,True,True,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,f38c2638018aabb2313ad76237ab33586d29878ff9f7322495cf9eac4bac5302,Tests_passed,f38c2638018aabb2313ad76237ab33586d29878ff9f7322495cf9eac4bac5302,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,0.010640382766723633,0.01096796989440918,0.011872529983520508,0.011841773986816406,0.011618614196777344,0.011550426483154297,0.011851072311401367,0.05150318145751953,0.010612010955810547,0.31362438201904297,0.3139193058013916,0.1224527359008789,1.7738518714904785,0.17120075225830078 +58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,Tests_passed,True,True,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,f38c2638018aabb2313ad76237ab33586d29878ff9f7322495cf9eac4bac5302,Tests_passed,f38c2638018aabb2313ad76237ab33586d29878ff9f7322495cf9eac4bac5302,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,0.010640382766723633,0.01096796989440918,0.011872529983520508,0.011841773986816406,0.011618614196777344,0.011550426483154297,0.011851072311401367,0.05150318145751953,0.010612010955810547,0.30911946296691895,0.3113229274749756,0.1224527359008789,1.7738518714904785,0.17120075225830078 diff --git a/results/greatest_hits/merges_timed/fasterxml/jackson-core.csv b/results/greatest_hits/merges_timed/fasterxml/jackson-core.csv index 65727f48c5..c688418e84 100644 --- a/results/greatest_hits/merges_timed/fasterxml/jackson-core.csv +++ b/results/greatest_hits/merges_timed/fasterxml/jackson-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -473,refs/remotes/origin/master,5b91c61a84864ef5e54e6143503fd85dad25a794,36dc9e8e50a91a37252dba924a1524a9bfee7418,d5673d2e9ffa1357bad7bc3665051245447a47ce,,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Tests_passed,f77dd6121cd4fed9400db3247faa88a8d0ba19bee20f21e1387950cf257deab9,Tests_passed,True,True,True,True,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Tests_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Tests_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,0.05623579025268555,0.0497894287109375,0.11711692810058594,0.12558984756469727,0.1167449951171875,0.12534213066101074,0.11791825294494629,0.09070348739624023,0.07138204574584961,0.05381345748901367,0.04724860191345215,0.05678963661193848,0.060007333755493164,0.5344605445861816 +473,refs/remotes/origin/master,5b91c61a84864ef5e54e6143503fd85dad25a794,36dc9e8e50a91a37252dba924a1524a9bfee7418,d5673d2e9ffa1357bad7bc3665051245447a47ce,,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Tests_passed,f77dd6121cd4fed9400db3247faa88a8d0ba19bee20f21e1387950cf257deab9,Tests_passed,True,True,True,True,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Tests_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Tests_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,0.05623579025268555,0.0497894287109375,0.11711692810058594,0.12558984756469727,0.1167449951171875,0.12534213066101074,0.11791825294494629,0.09070348739624023,0.07138204574584961,0.04696083068847656,0.05385446548461914,0.05678963661193848,0.060007333755493164,0.5344605445861816 diff --git a/results/greatest_hits/merges_timed/ffay/lanproxy.csv b/results/greatest_hits/merges_timed/ffay/lanproxy.csv index 61fbf499d8..c6eb31daa8 100644 --- a/results/greatest_hits/merges_timed/ffay/lanproxy.csv +++ b/results/greatest_hits/merges_timed/ffay/lanproxy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/for-io2c-cloud,1e0cfe7542abf06498662d5723d547188e65c673,2b43c685e954366252e425dc2c2b8ae0b3cfa0d2,a680a6565eac57e0eb0aa27b25bd2d39efdd47ee,,5bd2bf681e8ed090661d84df1a6e27ee4915ff23f6892fb45b79edb90c160edd,Tests_passed,317a9186ececed2938492e561ae7eba1ee1032306ed77032e7292a433cadf922,Tests_passed,True,True,True,True,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a4ffd56c32fd83e35aab0adf73bb0055ded766f6ee4fe16fa000a4983ceebc6d,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a0ced77ecea7fc0b9fbfb70908a794cf6fa947ba2b61be97827b5537078b0388,Merge_failed,a0ced77ecea7fc0b9fbfb70908a794cf6fa947ba2b61be97827b5537078b0388,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,a0495a43c69692b217e772421a97186127d5407c87363caaa326d6ecf233ea31,0.03339529037475586,0.008914470672607422,0.0300753116607666,0.009929895401000977,0.030555248260498047,0.028418302536010742,0.028081893920898438,0.12920570373535156,0.026842355728149414,0.11442184448242188,0.0756981372833252,0.11230325698852539,0.6508784294128418,0.21948027610778809 +4,refs/remotes/origin/for-io2c-cloud,1e0cfe7542abf06498662d5723d547188e65c673,2b43c685e954366252e425dc2c2b8ae0b3cfa0d2,a680a6565eac57e0eb0aa27b25bd2d39efdd47ee,,5bd2bf681e8ed090661d84df1a6e27ee4915ff23f6892fb45b79edb90c160edd,Tests_passed,317a9186ececed2938492e561ae7eba1ee1032306ed77032e7292a433cadf922,Tests_passed,True,True,True,True,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a4ffd56c32fd83e35aab0adf73bb0055ded766f6ee4fe16fa000a4983ceebc6d,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a0ced77ecea7fc0b9fbfb70908a794cf6fa947ba2b61be97827b5537078b0388,Merge_failed,a0ced77ecea7fc0b9fbfb70908a794cf6fa947ba2b61be97827b5537078b0388,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,a0495a43c69692b217e772421a97186127d5407c87363caaa326d6ecf233ea31,0.03339529037475586,0.008914470672607422,0.0300753116607666,0.009929895401000977,0.030555248260498047,0.028418302536010742,0.028081893920898438,0.12920570373535156,0.026842355728149414,0.09456658363342285,0.11248111724853516,0.11230325698852539,0.6508784294128418,0.21948027610778809 diff --git a/results/greatest_hits/merges_timed/gephi/gephi.csv b/results/greatest_hits/merges_timed/gephi/gephi.csv index bb1aa79ca1..e2fd2cc73c 100644 --- a/results/greatest_hits/merges_timed/gephi/gephi.csv +++ b/results/greatest_hits/merges_timed/gephi/gephi.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,True,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,Tests_passed,True,True,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,7406cbe09eb9cc018f282cc44d729f249a17dd3e5086290ce4370918c33ded0d,Tests_passed,7406cbe09eb9cc018f282cc44d729f249a17dd3e5086290ce4370918c33ded0d,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,0.06739616394042969,0.08657193183898926,0.06635451316833496,0.08040285110473633,0.07421159744262695,0.07885622978210449,0.07919144630432129,0.2551453113555908,0.0712900161743164,0.3543822765350342,0.3567981719970703,0.22736668586730957,1.7211782932281494,1.9990110397338867 +665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,True,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,Tests_passed,True,True,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,7406cbe09eb9cc018f282cc44d729f249a17dd3e5086290ce4370918c33ded0d,Tests_passed,7406cbe09eb9cc018f282cc44d729f249a17dd3e5086290ce4370918c33ded0d,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,0.06739616394042969,0.08657193183898926,0.06635451316833496,0.08040285110473633,0.07421159744262695,0.07885622978210449,0.07919144630432129,0.2551453113555908,0.0712900161743164,0.3477144241333008,0.35315513610839844,0.22736668586730957,1.7211782932281494,1.9990110397338867 diff --git a/results/greatest_hits/merges_timed/google/google-java-format.csv b/results/greatest_hits/merges_timed/google/google-java-format.csv index 1e3d2c676b..60d5e13bbb 100644 --- a/results/greatest_hits/merges_timed/google/google-java-format.csv +++ b/results/greatest_hits/merges_timed/google/google-java-format.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/remotes/origin/pull/195,48316cdcafbef41ab52e86d0a530324cf5384310,b9cdd825f7f1b1c42965e7662b8193a7c6c822d2,c48ee99f0240e0e51af842b3cf17793a83508bd4,,True,True,414989cdb218b577e803c4ef6dd7f76a6558a95dbe15c5dff230056d11c6673f,Tests_passed,5c22244fd9653b2585d8fce8d65743b10260cfa86595f6c77b72b4d2ac2d88ea,Tests_passed,True,True,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,a2bf12c51e1298751cec7a732cb1040197b20263453e1380caa519e96100d774,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,ce4aade0aaa85a78b18b41d90b48341483a9ec1c82daad3ea6e164bfc441f4c1,Merge_failed,ce4aade0aaa85a78b18b41d90b48341483a9ec1c82daad3ea6e164bfc441f4c1,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Merge_failed,ce57512c67612f9fa7fff8afe7fcf19c7e54a81fd0bc41670cf95a853b24b638,0.039758920669555664,0.044445037841796875,0.03286886215209961,0.0421757698059082,0.04684877395629883,0.04092741012573242,0.042246103286743164,0.25055360794067383,0.06353497505187988,0.2269442081451416,0.22425270080566406,0.15688300132751465,1.8062303066253662,0.24623751640319824 +4,refs/remotes/origin/pull/195,48316cdcafbef41ab52e86d0a530324cf5384310,b9cdd825f7f1b1c42965e7662b8193a7c6c822d2,c48ee99f0240e0e51af842b3cf17793a83508bd4,,True,True,414989cdb218b577e803c4ef6dd7f76a6558a95dbe15c5dff230056d11c6673f,Tests_passed,5c22244fd9653b2585d8fce8d65743b10260cfa86595f6c77b72b4d2ac2d88ea,Tests_passed,True,True,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,a2bf12c51e1298751cec7a732cb1040197b20263453e1380caa519e96100d774,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,ce4aade0aaa85a78b18b41d90b48341483a9ec1c82daad3ea6e164bfc441f4c1,Merge_failed,ce4aade0aaa85a78b18b41d90b48341483a9ec1c82daad3ea6e164bfc441f4c1,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Merge_failed,ce57512c67612f9fa7fff8afe7fcf19c7e54a81fd0bc41670cf95a853b24b638,0.039758920669555664,0.044445037841796875,0.03286886215209961,0.0421757698059082,0.04684877395629883,0.04092741012573242,0.042246103286743164,0.25055360794067383,0.06353497505187988,0.21629643440246582,0.22287464141845703,0.15688300132751465,1.8062303066253662,0.24623751640319824 diff --git a/results/greatest_hits/merges_timed/google/guice.csv b/results/greatest_hits/merges_timed/google/guice.csv index a3555bd41c..95caf19f35 100644 --- a/results/greatest_hits/merges_timed/google/guice.csv +++ b/results/greatest_hits/merges_timed/google/guice.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -108,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,Tests_passed,True,True,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,92a6ec2c93e7eb7ff1291d0937bd42e03503dd42a83a11e0e671f51067c23aa3,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,0e3ca04cd06b25b923f632f4cadcec0cf63d6d80f475cc4ba805f7dc1480b756,Merge_failed,0e3ca04cd06b25b923f632f4cadcec0cf63d6d80f475cc4ba805f7dc1480b756,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,0.05345892906188965,0.056970834732055664,0.05604887008666992,0.07629680633544922,0.06354379653930664,0.028115510940551758,0.03088545799255371,0.35352015495300293,0.13332247734069824,0.1765120029449463,0.1791071891784668,0.15186333656311035,0.06041073799133301,0.5200583934783936 +108,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,Tests_passed,True,True,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,92a6ec2c93e7eb7ff1291d0937bd42e03503dd42a83a11e0e671f51067c23aa3,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,0e3ca04cd06b25b923f632f4cadcec0cf63d6d80f475cc4ba805f7dc1480b756,Merge_failed,0e3ca04cd06b25b923f632f4cadcec0cf63d6d80f475cc4ba805f7dc1480b756,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,0.05345892906188965,0.056970834732055664,0.05604887008666992,0.07629680633544922,0.06354379653930664,0.028115510940551758,0.03088545799255371,0.35352015495300293,0.13332247734069824,0.17613840103149414,0.17796540260314941,0.15186333656311035,0.06041073799133301,0.5200583934783936 diff --git a/results/greatest_hits/merges_timed/google/truth.csv b/results/greatest_hits/merges_timed/google/truth.csv index 0e38b268aa..fb41bd3c15 100644 --- a/results/greatest_hits/merges_timed/google/truth.csv +++ b/results/greatest_hits/merges_timed/google/truth.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -110,refs/heads/master,9289ed34ae5c0561c9e33dbb7b7b7c6750e4a410,2bb82cafdf685242cf1cb0b915800f0bd2d6b0cc,2bd108d91dc1f0cdda8ef5767b0a10af40af7f57,,65e865e9e9ccd9dccc0cdf0150df3b34a406dd47e8cf3b06dc5380009ea54141,Tests_passed,7f1db2e138c97832484c628f6bbb8a789bb7bb9e2232377758334faab73bf20f,Tests_passed,True,True,True,True,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,300c676505f72e7428b3c7f0e7194f14b182f80c35afeae42fadf52311f0d32d,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,7f51c8fa7ec9b9cea1fb1ed1d0c62c266244a10274c291443ef3fcfd586fc05e,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,3521afc8116147d85468d1cdc24b30160fdba1a4ce7f69c31ddce3135f273c3a,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,87b272964b969e8f6161516fcc5739028435d9cf54e712598c21083d00ccd1a7,Merge_failed,87b272964b969e8f6161516fcc5739028435d9cf54e712598c21083d00ccd1a7,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,cc247b80711a9a16f4b8a637dad8342f2f066db25b5c8f0e577e9025a5906f09,Merge_failed,e3d7506501f26070d043f65d789b0653dfed02c6a8cc18afbd49233347fd1166,0.010350465774536133,0.00928187370300293,0.009069681167602539,0.009403705596923828,0.009437322616577148,0.009463787078857422,0.009218692779541016,0.06131410598754883,0.03188896179199219,0.224837064743042,0.22593355178833008,0.12194585800170898,1.2289559841156006,0.20983028411865234 +110,refs/heads/master,9289ed34ae5c0561c9e33dbb7b7b7c6750e4a410,2bb82cafdf685242cf1cb0b915800f0bd2d6b0cc,2bd108d91dc1f0cdda8ef5767b0a10af40af7f57,,65e865e9e9ccd9dccc0cdf0150df3b34a406dd47e8cf3b06dc5380009ea54141,Tests_passed,7f1db2e138c97832484c628f6bbb8a789bb7bb9e2232377758334faab73bf20f,Tests_passed,True,True,True,True,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,300c676505f72e7428b3c7f0e7194f14b182f80c35afeae42fadf52311f0d32d,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,7f51c8fa7ec9b9cea1fb1ed1d0c62c266244a10274c291443ef3fcfd586fc05e,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,aaa60027a5d090a9bac87838ed33c9d3f100ffd292442edc31f28b8b3b765483,Merge_failed,3521afc8116147d85468d1cdc24b30160fdba1a4ce7f69c31ddce3135f273c3a,Merge_failed,1b26548c3b513010fbfefb5d0ce91c31bd8c3ce87f7ef843fdccbc3d76b12d78,Merge_failed,87b272964b969e8f6161516fcc5739028435d9cf54e712598c21083d00ccd1a7,Merge_failed,87b272964b969e8f6161516fcc5739028435d9cf54e712598c21083d00ccd1a7,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,cc247b80711a9a16f4b8a637dad8342f2f066db25b5c8f0e577e9025a5906f09,Merge_failed,e3d7506501f26070d043f65d789b0653dfed02c6a8cc18afbd49233347fd1166,0.010350465774536133,0.00928187370300293,0.009069681167602539,0.009403705596923828,0.009437322616577148,0.009463787078857422,0.009218692779541016,0.06131410598754883,0.03188896179199219,0.22419095039367676,0.22481107711791992,0.12194585800170898,1.2289559841156006,0.20983028411865234 diff --git a/results/greatest_hits/merges_timed/hdrhistogram/hdrhistogram.csv b/results/greatest_hits/merges_timed/hdrhistogram/hdrhistogram.csv index 71ec7709d2..ad33395617 100644 --- a/results/greatest_hits/merges_timed/hdrhistogram/hdrhistogram.csv +++ b/results/greatest_hits/merges_timed/hdrhistogram/hdrhistogram.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -56,refs/heads/master,127046e0c90ca79a98b818067ca1d47c66e2745b,89c43df4fbd64c0deda228b3721eabb235eeeb6a,f6fa7fdfcebffbdecbc94dc5b858f53fc49226de,,True,True,fc92a264f353c9873cd991a7a4dcd9a1c317cad777364f71242b8ee72c44516f,Tests_passed,92399ca42febcac70dd802560350ef996dfe9ca2551e1255e8f4bd97ddc7bec4,Tests_passed,True,True,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Merge_failed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Merge_failed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,c7e4ca3391f01dbb3e54cedcda92330bc0b163981a27cfb44f63f6ebfe3a7d8e,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,0.02932906150817871,0.0518956184387207,0.0480799674987793,0.028234004974365234,0.028704404830932617,0.03468632698059082,0.051006317138671875,0.11425399780273438,0.02374100685119629,0.10125494003295898,0.09706878662109375,0.08771491050720215,0.6546108722686768,0.24954509735107422 +56,refs/heads/master,127046e0c90ca79a98b818067ca1d47c66e2745b,89c43df4fbd64c0deda228b3721eabb235eeeb6a,f6fa7fdfcebffbdecbc94dc5b858f53fc49226de,,True,True,fc92a264f353c9873cd991a7a4dcd9a1c317cad777364f71242b8ee72c44516f,Tests_passed,92399ca42febcac70dd802560350ef996dfe9ca2551e1255e8f4bd97ddc7bec4,Tests_passed,True,True,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Merge_failed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Merge_failed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,c7e4ca3391f01dbb3e54cedcda92330bc0b163981a27cfb44f63f6ebfe3a7d8e,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,0.02932906150817871,0.0518956184387207,0.0480799674987793,0.028234004974365234,0.028704404830932617,0.03468632698059082,0.051006317138671875,0.11425399780273438,0.02374100685119629,0.10065913200378418,0.100616455078125,0.08771491050720215,0.6546108722686768,0.24954509735107422 diff --git a/results/greatest_hits/merges_timed/j-easy/easy-rules.csv b/results/greatest_hits/merges_timed/j-easy/easy-rules.csv index 9a9cbc8dea..88f7ad159a 100644 --- a/results/greatest_hits/merges_timed/j-easy/easy-rules.csv +++ b/results/greatest_hits/merges_timed/j-easy/easy-rules.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -21,refs/heads/master,7f8d311fd6f8fabcc4e6b54a9e3cdcda47bdbb8c,3bb001c6fcc8f95feb87b41de52e464d27dd693e,1bff470adc5760132d3dc4ea3b37e54157eb2f7e,,True,True,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,3a596a60caacba76a1ed8e3ecc71ba49a39194bc5a380cd6ce129dd218753922,Tests_passed,True,True,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,6a31947704b16db5de5496d1eb68abfc5059c42bce6e59909d244fb328eb8258,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Tests_failed,b267da1e32313d5826ecf2a88b8be21e909e3a0eec2cd9773bce90edc29058ab,Tests_failed,b267da1e32313d5826ecf2a88b8be21e909e3a0eec2cd9773bce90edc29058ab,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,1379ab73a0d8e0a852faf7b545a8547a9c08b1efe48e474da7436213b2acf09c,0.034018754959106445,0.03992199897766113,0.04615473747253418,0.013575553894042969,0.04868292808532715,0.03273153305053711,0.040290117263793945,0.3376729488372803,0.0665435791015625,0.2927114963531494,0.2925701141357422,0.28250789642333984,0.9429569244384766,0.21246576309204102 +21,refs/heads/master,7f8d311fd6f8fabcc4e6b54a9e3cdcda47bdbb8c,3bb001c6fcc8f95feb87b41de52e464d27dd693e,1bff470adc5760132d3dc4ea3b37e54157eb2f7e,,True,True,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,3a596a60caacba76a1ed8e3ecc71ba49a39194bc5a380cd6ce129dd218753922,Tests_passed,True,True,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Merge_failed,6a31947704b16db5de5496d1eb68abfc5059c42bce6e59909d244fb328eb8258,Merge_failed,2273ce64897a58618c21517c3a242ad67acde16b27455ed58a1f06951d026935,Tests_failed,b267da1e32313d5826ecf2a88b8be21e909e3a0eec2cd9773bce90edc29058ab,Tests_failed,b267da1e32313d5826ecf2a88b8be21e909e3a0eec2cd9773bce90edc29058ab,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,1379ab73a0d8e0a852faf7b545a8547a9c08b1efe48e474da7436213b2acf09c,0.034018754959106445,0.03992199897766113,0.04615473747253418,0.013575553894042969,0.04868292808532715,0.03273153305053711,0.040290117263793945,0.3376729488372803,0.0665435791015625,0.2883744239807129,0.2889385223388672,0.28250789642333984,0.9429569244384766,0.21246576309204102 diff --git a/results/greatest_hits/merges_timed/jakewharton/disklrucache.csv b/results/greatest_hits/merges_timed/jakewharton/disklrucache.csv index 7b4d329267..c8db3ea205 100644 --- a/results/greatest_hits/merges_timed/jakewharton/disklrucache.csv +++ b/results/greatest_hits/merges_timed/jakewharton/disklrucache.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,True,True,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,Tests_passed,True,True,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,0.008766889572143555,0.009540319442749023,0.009119033813476562,0.009754657745361328,0.00928354263305664,0.009067296981811523,0.009298324584960938,0.03270697593688965,0.009126901626586914,0.17034196853637695,0.17006802558898926,0.06444120407104492,1.2582242488861084,0.16182875633239746 +16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,True,True,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,Tests_passed,True,True,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,0.008766889572143555,0.009540319442749023,0.009119033813476562,0.009754657745361328,0.00928354263305664,0.009067296981811523,0.009298324584960938,0.03270697593688965,0.009126901626586914,0.16715097427368164,0.16822552680969238,0.06444120407104492,1.2582242488861084,0.16182875633239746 diff --git a/results/greatest_hits/merges_timed/javaparser/javaparser.csv b/results/greatest_hits/merges_timed/javaparser/javaparser.csv index bb7f377f7a..adcd2a8571 100644 --- a/results/greatest_hits/merges_timed/javaparser/javaparser.csv +++ b/results/greatest_hits/merges_timed/javaparser/javaparser.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3206,refs/remotes/origin/pull/3114,9037e57c930136b82fb779e21beaabfaf0a9f124,d2894b00357c4cf196c4868a71ee76ac74e08569,008452082678aa5e21593eb4c2fccd745f610efb,,True,True,129e930cc5d38fe894a1482585e8ba0b8de2b09dd08541cc4d08e767fe3b2525,Tests_passed,d2f8ead59255eb4042cf87c3cb8b172e0f195f3663e92d194d2f4ca53cc3ad1c,Tests_passed,True,True,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,041231272b5215e3fc9ce62c7be072d77218dae718b46e45890c9e4da4381bf8,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,2648e11ad0ea1d139e732686a09f189e581503452508b612eb10fdca0c201035,Merge_failed,2648e11ad0ea1d139e732686a09f189e581503452508b612eb10fdca0c201035,Merge_failed,a1b45e333d9ad5de16539956e3035fa704a1cad26d0f82bd5600028a92ff5670,Tests_passed,0648e6bdae51b980a44c431c6f2585e75d133aaa7fb58f3696eabdb4506bd78c,Merge_failed,1dd80cdba78b67b5b8f08bc1bd9e7f608a2e18ea2884401542fe62ec8ce235e8,0.059625864028930664,0.05851316452026367,0.06464624404907227,0.06537628173828125,0.06514167785644531,0.06690311431884766,0.0647580623626709,0.15731453895568848,0.1068732738494873,0.2748398780822754,0.27492833137512207,0.1680011749267578,1.9098291397094727,2.444018840789795 +3206,refs/remotes/origin/pull/3114,9037e57c930136b82fb779e21beaabfaf0a9f124,d2894b00357c4cf196c4868a71ee76ac74e08569,008452082678aa5e21593eb4c2fccd745f610efb,,True,True,129e930cc5d38fe894a1482585e8ba0b8de2b09dd08541cc4d08e767fe3b2525,Tests_passed,d2f8ead59255eb4042cf87c3cb8b172e0f195f3663e92d194d2f4ca53cc3ad1c,Tests_passed,True,True,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,041231272b5215e3fc9ce62c7be072d77218dae718b46e45890c9e4da4381bf8,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,2648e11ad0ea1d139e732686a09f189e581503452508b612eb10fdca0c201035,Merge_failed,2648e11ad0ea1d139e732686a09f189e581503452508b612eb10fdca0c201035,Merge_failed,a1b45e333d9ad5de16539956e3035fa704a1cad26d0f82bd5600028a92ff5670,Tests_passed,0648e6bdae51b980a44c431c6f2585e75d133aaa7fb58f3696eabdb4506bd78c,Merge_failed,1dd80cdba78b67b5b8f08bc1bd9e7f608a2e18ea2884401542fe62ec8ce235e8,0.059625864028930664,0.05851316452026367,0.06464624404907227,0.06537628173828125,0.06514167785644531,0.06690311431884766,0.0647580623626709,0.15731453895568848,0.1068732738494873,0.27483177185058594,0.2767040729522705,0.1680011749267578,1.9098291397094727,2.444018840789795 diff --git a/results/greatest_hits/merges_timed/javen205/ijpay.csv b/results/greatest_hits/merges_timed/javen205/ijpay.csv index 61c14dbc13..61945d90c4 100644 --- a/results/greatest_hits/merges_timed/javen205/ijpay.csv +++ b/results/greatest_hits/merges_timed/javen205/ijpay.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/dev,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,4d3acc222dce6df268df4e99930030e8a0031437,d051efa031ab0d5280925e575b430ee627086c32,,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,223b1bed8874c3797177407e6f82537ecfc5c3ddd73679957f9e0618fa446ae7,Tests_passed,True,True,True,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,0.06819415092468262,0.0421595573425293,0.05865836143493652,0.06672334671020508,0.07776737213134766,0.05490732192993164,0.07175993919372559,0.19119572639465332,0.04072237014770508,0.17919921875,0.20560193061828613,0.0994865894317627,0.9691572189331055,0.35503101348876953 +2,refs/heads/dev,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,4d3acc222dce6df268df4e99930030e8a0031437,d051efa031ab0d5280925e575b430ee627086c32,,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,223b1bed8874c3797177407e6f82537ecfc5c3ddd73679957f9e0618fa446ae7,Tests_passed,True,True,True,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,0.06819415092468262,0.0421595573425293,0.05865836143493652,0.06672334671020508,0.07776737213134766,0.05490732192993164,0.07175993919372559,0.19119572639465332,0.04072237014770508,0.17694377899169922,0.1761152744293213,0.0994865894317627,0.9691572189331055,0.35503101348876953 diff --git a/results/greatest_hits/merges_timed/jfinal/jfinal.csv b/results/greatest_hits/merges_timed/jfinal/jfinal.csv index 1000dfa90f..2ad92d6387 100644 --- a/results/greatest_hits/merges_timed/jfinal/jfinal.csv +++ b/results/greatest_hits/merges_timed/jfinal/jfinal.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -59,refs/remotes/origin/jfinal-java8,0c6e8ea6cab44a710a87e6168ef10784130e9a7d,e5587b08619f7800a99cde0b8d54b47413009b1d,bf183262ac9b54efd32a258c3263810e9f2c397d,,True,True,7e29d89d38eb0e7b9324c586b3e47a519614e7f739f5d98ae10f670159cf6439,Tests_passed,a20f75e73c999c4d5fa53174f6e9d82fc2f3990dda28e94bd755013db5034ed7,Tests_passed,True,True,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,5db17abe963840df8e61d2a93c1226fafc18fd4541cbbeaf5acba55e23d0f3a9,Tests_passed,5db17abe963840df8e61d2a93c1226fafc18fd4541cbbeaf5acba55e23d0f3a9,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,6f9185baa7138bf9d37bb64f01aa93022a67c9eec3cc036b3ea699f009b7ae2c,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,0.029575109481811523,0.029511213302612305,0.026318788528442383,0.034606218338012695,0.0353085994720459,0.03537702560424805,0.03512930870056152,0.08303642272949219,0.02487945556640625,0.1783137321472168,0.18346095085144043,0.13912129402160645,0.7708566188812256,0.36817479133605957 +59,refs/remotes/origin/jfinal-java8,0c6e8ea6cab44a710a87e6168ef10784130e9a7d,e5587b08619f7800a99cde0b8d54b47413009b1d,bf183262ac9b54efd32a258c3263810e9f2c397d,,True,True,7e29d89d38eb0e7b9324c586b3e47a519614e7f739f5d98ae10f670159cf6439,Tests_passed,a20f75e73c999c4d5fa53174f6e9d82fc2f3990dda28e94bd755013db5034ed7,Tests_passed,True,True,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,5db17abe963840df8e61d2a93c1226fafc18fd4541cbbeaf5acba55e23d0f3a9,Tests_passed,5db17abe963840df8e61d2a93c1226fafc18fd4541cbbeaf5acba55e23d0f3a9,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,6f9185baa7138bf9d37bb64f01aa93022a67c9eec3cc036b3ea699f009b7ae2c,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,0.029575109481811523,0.029511213302612305,0.026318788528442383,0.034606218338012695,0.0353085994720459,0.03537702560424805,0.03512930870056152,0.08303642272949219,0.02487945556640625,0.1759490966796875,0.1710796356201172,0.13912129402160645,0.7708566188812256,0.36817479133605957 diff --git a/results/greatest_hits/merges_timed/jgrapht/jgrapht.csv b/results/greatest_hits/merges_timed/jgrapht/jgrapht.csv index 2cc0493af7..18556cb70a 100644 --- a/results/greatest_hits/merges_timed/jgrapht/jgrapht.csv +++ b/results/greatest_hits/merges_timed/jgrapht/jgrapht.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -61,refs/heads/master,8f3dfa07cf62a9032f18a22f8022b3480dfbf1c7,bb5bf7b4680787e3f4ce8f19a19576c53a5a3427,e76f73409146e565f36021cef9a755d4d12c0f53,,True,True,7f5790db42cf8cea7e23583e65dac8b823fba71eb4ce07c8e61bbe3b34fd874a,Tests_passed,d0c851fb09c381d0ba8c9b1bde8ad65746a1bb0c6d7b28777de882ff2223d16a,Tests_passed,True,True,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,5b278d288790dabdcda38335ffe09597050b8dc3abf261cf8e8db71c58a9be37,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,5b278d288790dabdcda38335ffe09597050b8dc3abf261cf8e8db71c58a9be37,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,14980d9e070bde4e288a3c02e4f7c0866b3aea36f21e57c9ea44ac0c769f806d,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,abf22f61ec929f147e9a7a556efe04f6908dcb57214fbad9936eeae0713e7e35,Merge_failed,abf22f61ec929f147e9a7a556efe04f6908dcb57214fbad9936eeae0713e7e35,Merge_failed,655af229e325403c961cedf07b7da92f8245ae46360717dcddaec516668929a7,Merge_failed,9eb2f48f8a51ffb3e75a8106c31abe2204176f344d2095e923d7a59a793a0358,Merge_failed,b5a2e1882b0064dcfa738acca270357c8d5486b9c024ebf6c9786b25eb61afad,0.08601260185241699,0.09016299247741699,0.09491539001464844,0.09223270416259766,0.09329414367675781,0.09366631507873535,0.09295320510864258,0.6092128753662109,0.22285199165344238,0.9831106662750244,0.9739291667938232,0.5247592926025391,4.734174489974976,1.5197994709014893 +61,refs/heads/master,8f3dfa07cf62a9032f18a22f8022b3480dfbf1c7,bb5bf7b4680787e3f4ce8f19a19576c53a5a3427,e76f73409146e565f36021cef9a755d4d12c0f53,,True,True,7f5790db42cf8cea7e23583e65dac8b823fba71eb4ce07c8e61bbe3b34fd874a,Tests_passed,d0c851fb09c381d0ba8c9b1bde8ad65746a1bb0c6d7b28777de882ff2223d16a,Tests_passed,True,True,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,5b278d288790dabdcda38335ffe09597050b8dc3abf261cf8e8db71c58a9be37,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,5b278d288790dabdcda38335ffe09597050b8dc3abf261cf8e8db71c58a9be37,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,14980d9e070bde4e288a3c02e4f7c0866b3aea36f21e57c9ea44ac0c769f806d,Merge_failed,6106d6a1df37b0c22c14d355480be9825ba4d5fcd7bc466bc9ae8415d7a87427,Merge_failed,abf22f61ec929f147e9a7a556efe04f6908dcb57214fbad9936eeae0713e7e35,Merge_failed,abf22f61ec929f147e9a7a556efe04f6908dcb57214fbad9936eeae0713e7e35,Merge_failed,655af229e325403c961cedf07b7da92f8245ae46360717dcddaec516668929a7,Merge_failed,9eb2f48f8a51ffb3e75a8106c31abe2204176f344d2095e923d7a59a793a0358,Merge_failed,b5a2e1882b0064dcfa738acca270357c8d5486b9c024ebf6c9786b25eb61afad,0.08601260185241699,0.09016299247741699,0.09491539001464844,0.09223270416259766,0.09329414367675781,0.09366631507873535,0.09295320510864258,0.6092128753662109,0.22285199165344238,0.9760353565216064,0.9645118713378906,0.5247592926025391,4.734174489974976,1.5197994709014893 diff --git a/results/greatest_hits/merges_timed/jhalterman/failsafe.csv b/results/greatest_hits/merges_timed/jhalterman/failsafe.csv index a7f424b27d..a5d029cc3c 100644 --- a/results/greatest_hits/merges_timed/jhalterman/failsafe.csv +++ b/results/greatest_hits/merges_timed/jhalterman/failsafe.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -15,refs/heads/master,b15e3bd52f2d6cfe3d2b456766847691694fcd72,947589141b1290c6eb3bbfdf67c55a62b4972dbf,ea1bb689ad2a75ef6a89843ab31dc881926d603a,,True,True,5366623e94bc3b3f96f8892568e6f864aae6e5e21aee1a9c1d06497323fd4dce,Tests_passed,db05e5da5c5daca74e35a9ceabc60a9bdf34ec2f7b1e5fb96532a76f604a53ad,Tests_passed,True,True,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,0.03919172286987305,0.03924965858459473,0.047580718994140625,0.03768420219421387,0.03964662551879883,0.04326152801513672,0.04137730598449707,0.22632622718811035,0.040305137634277344,0.15376925468444824,0.15454554557800293,0.1583564281463623,0.656266450881958,0.1982097625732422 +15,refs/heads/master,b15e3bd52f2d6cfe3d2b456766847691694fcd72,947589141b1290c6eb3bbfdf67c55a62b4972dbf,ea1bb689ad2a75ef6a89843ab31dc881926d603a,,True,True,5366623e94bc3b3f96f8892568e6f864aae6e5e21aee1a9c1d06497323fd4dce,Tests_passed,db05e5da5c5daca74e35a9ceabc60a9bdf34ec2f7b1e5fb96532a76f604a53ad,Tests_passed,True,True,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,0.03919172286987305,0.03924965858459473,0.047580718994140625,0.03768420219421387,0.03964662551879883,0.04326152801513672,0.04137730598449707,0.22632622718811035,0.040305137634277344,0.15377378463745117,0.15107131004333496,0.1583564281463623,0.656266450881958,0.1982097625732422 diff --git a/results/greatest_hits/merges_timed/joel-costigliola/assertj-core.csv b/results/greatest_hits/merges_timed/joel-costigliola/assertj-core.csv index ced85d8711..1e251e6345 100644 --- a/results/greatest_hits/merges_timed/joel-costigliola/assertj-core.csv +++ b/results/greatest_hits/merges_timed/joel-costigliola/assertj-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -52,refs/heads/main,01799c8c9011d8695ba0a97ff7b659e5ce879d11,5f77a95ba5277ac3648f805f96d4692edd6ac9f3,9bf86bc554b5cf3bd9ff5f541fbee4adf2a811cf,,32455f4c599a798753c1eefb3c0e1720ae98d051ea16b5b61b2d759cd672c1fc,Tests_passed,a79bef6baf9c3bc084de56d80c1bf0b5835a1d9983e635878e0792174aaa0cbb,Tests_passed,True,True,True,True,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Merge_failed,d6255fd2cf7a2918146a697bdc2b891589bc58d472e904fed9f90d3960905ef0,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_failed,d10c219404ceb738a840d84216038f6cca67d3cbfe30d8ea7a093774b888bebe,Tests_failed,d10c219404ceb738a840d84216038f6cca67d3cbfe30d8ea7a093774b888bebe,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_failed,5965f9e98f97f528237051135b3681518a4707330ce837e8588f14f7db43e4ad,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,0.07190561294555664,0.07251882553100586,0.08411836624145508,0.08067631721496582,0.08944988250732422,0.08176183700561523,0.0756533145904541,0.6391732692718506,0.07225513458251953,1.3705615997314453,1.37605619430542,0.5138726234436035,7.798923969268799,2.374288558959961 +52,refs/heads/main,01799c8c9011d8695ba0a97ff7b659e5ce879d11,5f77a95ba5277ac3648f805f96d4692edd6ac9f3,9bf86bc554b5cf3bd9ff5f541fbee4adf2a811cf,,32455f4c599a798753c1eefb3c0e1720ae98d051ea16b5b61b2d759cd672c1fc,Tests_passed,a79bef6baf9c3bc084de56d80c1bf0b5835a1d9983e635878e0792174aaa0cbb,Tests_passed,True,True,True,True,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Merge_failed,d6255fd2cf7a2918146a697bdc2b891589bc58d472e904fed9f90d3960905ef0,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_failed,d10c219404ceb738a840d84216038f6cca67d3cbfe30d8ea7a093774b888bebe,Tests_failed,d10c219404ceb738a840d84216038f6cca67d3cbfe30d8ea7a093774b888bebe,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_failed,5965f9e98f97f528237051135b3681518a4707330ce837e8588f14f7db43e4ad,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,0.07190561294555664,0.07251882553100586,0.08411836624145508,0.08067631721496582,0.08944988250732422,0.08176183700561523,0.0756533145904541,0.6391732692718506,0.07225513458251953,1.3402841091156006,1.3485734462738037,0.5138726234436035,7.798923969268799,2.374288558959961 diff --git a/results/greatest_hits/merges_timed/johncarl81/parceler.csv b/results/greatest_hits/merges_timed/johncarl81/parceler.csv index f84ea211d6..226cd802a4 100644 --- a/results/greatest_hits/merges_timed/johncarl81/parceler.csv +++ b/results/greatest_hits/merges_timed/johncarl81/parceler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,Tests_passed,True,True,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,0.01697397232055664,0.017736434936523438,0.022325515747070312,0.022197484970092773,0.02158522605895996,0.022143125534057617,0.02219414710998535,0.05076146125793457,0.017192840576171875,0.16641926765441895,0.1591663360595703,0.07213878631591797,1.0636169910430908,0.181929349899292 +36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,Tests_passed,True,True,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,0.01697397232055664,0.017736434936523438,0.022325515747070312,0.022197484970092773,0.02158522605895996,0.022143125534057617,0.02219414710998535,0.05076146125793457,0.017192840576171875,0.1654038429260254,0.16548871994018555,0.07213878631591797,1.0636169910430908,0.181929349899292 diff --git a/results/greatest_hits/merges_timed/jooq/jooq.csv b/results/greatest_hits/merges_timed/jooq/jooq.csv index 4130f66ddb..1be45d736e 100644 --- a/results/greatest_hits/merges_timed/jooq/jooq.csv +++ b/results/greatest_hits/merges_timed/jooq/jooq.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,Tests_passed,True,True,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,0.05702948570251465,0.05356884002685547,0.0689246654510498,0.0749216079711914,0.0643165111541748,0.07329773902893066,0.05992484092712402,0.2512493133544922,0.057192325592041016,0.3103508949279785,0.314190149307251,0.17312407493591309,8.96409797668457,1.450141191482544 +26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,Tests_passed,True,True,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,0.05702948570251465,0.05356884002685547,0.0689246654510498,0.0749216079711914,0.0643165111541748,0.07329773902893066,0.05992484092712402,0.2512493133544922,0.057192325592041016,0.29502010345458984,0.3017463684082031,0.17312407493591309,8.96409797668457,1.450141191482544 diff --git a/results/greatest_hits/merges_timed/jtablesaw/tablesaw.csv b/results/greatest_hits/merges_timed/jtablesaw/tablesaw.csv index 151aed57ab..fcbc660f3d 100644 --- a/results/greatest_hits/merges_timed/jtablesaw/tablesaw.csv +++ b/results/greatest_hits/merges_timed/jtablesaw/tablesaw.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,Tests_passed,True,True,True,True,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,e71ab0b0cd1205338e1c0b3f892be18db428cb5bd54cb32a3be5042f210d8b0d,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,0.047406911849975586,0.04673051834106445,0.059993743896484375,0.04569530487060547,0.05324506759643555,0.041567325592041016,0.046312570571899414,0.28206706047058105,0.12215828895568848,0.08227348327636719,0.08185386657714844,0.18375468254089355,1.5412635803222656,0.4355466365814209 +1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,Tests_passed,True,True,True,True,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,e71ab0b0cd1205338e1c0b3f892be18db428cb5bd54cb32a3be5042f210d8b0d,Merge_failed,68428b6a8626997b81a0c264090b475fc30d4ad337f5644dc85a3ceee4560214,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,4f98670d713a47ee360c195e9b8933e5b4555d442152c7d7496ef5cf94da5e45,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,0.047406911849975586,0.04673051834106445,0.059993743896484375,0.04569530487060547,0.05324506759643555,0.041567325592041016,0.046312570571899414,0.28206706047058105,0.12215828895568848,0.08300328254699707,0.08201885223388672,0.18375468254089355,1.5412635803222656,0.4355466365814209 diff --git a/results/greatest_hits/merges_timed/junit-team/junit4.csv b/results/greatest_hits/merges_timed/junit-team/junit4.csv index ea0aa442e1..7b705d7c71 100644 --- a/results/greatest_hits/merges_timed/junit-team/junit4.csv +++ b/results/greatest_hits/merges_timed/junit-team/junit4.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -420,refs/remotes/origin/pull/1130,6e38776326e9a68beb47e8ea491eef4761be511f,8390bc7383758ba04c35477b8bff540d9a2880ca,c85c6147ada5ad1afdd3be10769670d309730132,,True,True,d3d2adef032447722ac12f07f92c3767ca561adb93c61d0211416357a9400b32,Tests_passed,2825855b413abffc23aefafbd4c1d047e7b3034d6513be71af4cd6168acf35e3,Tests_passed,True,True,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,580f0af905537304534237c259d7a9430e823490d63c21b57f497035286a86c2,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,4b82f3e0c95fa0a4e66e1b8ca0214ae0c9299f16cb2a61090fdbf34bae6a8113,Merge_failed,4b82f3e0c95fa0a4e66e1b8ca0214ae0c9299f16cb2a61090fdbf34bae6a8113,Merge_failed,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,0.04582786560058594,0.05977988243103027,0.05821967124938965,0.0646817684173584,0.058869361877441406,0.0662686824798584,0.06243443489074707,0.41800689697265625,0.09454846382141113,0.6368873119354248,0.6298058032989502,0.3407559394836426,0.05164170265197754,0.5256710052490234 +420,refs/remotes/origin/pull/1130,6e38776326e9a68beb47e8ea491eef4761be511f,8390bc7383758ba04c35477b8bff540d9a2880ca,c85c6147ada5ad1afdd3be10769670d309730132,,True,True,d3d2adef032447722ac12f07f92c3767ca561adb93c61d0211416357a9400b32,Tests_passed,2825855b413abffc23aefafbd4c1d047e7b3034d6513be71af4cd6168acf35e3,Tests_passed,True,True,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,580f0af905537304534237c259d7a9430e823490d63c21b57f497035286a86c2,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,4b82f3e0c95fa0a4e66e1b8ca0214ae0c9299f16cb2a61090fdbf34bae6a8113,Merge_failed,4b82f3e0c95fa0a4e66e1b8ca0214ae0c9299f16cb2a61090fdbf34bae6a8113,Merge_failed,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,0.04582786560058594,0.05977988243103027,0.05821967124938965,0.0646817684173584,0.058869361877441406,0.0662686824798584,0.06243443489074707,0.41800689697265625,0.09454846382141113,0.6146814823150635,0.6285340785980225,0.3407559394836426,0.05164170265197754,0.5256710052490234 diff --git a/results/greatest_hits/merges_timed/jvm-profiling-tools/async-profiler.csv b/results/greatest_hits/merges_timed/jvm-profiling-tools/async-profiler.csv index d32ff52993..fffe558a39 100644 --- a/results/greatest_hits/merges_timed/jvm-profiling-tools/async-profiler.csv +++ b/results/greatest_hits/merges_timed/jvm-profiling-tools/async-profiler.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -69,refs/remotes/origin/pull/485,aebeed5d99ee31497e59c84bfc3d312487391c19,f604f6f4dd3228016571d3fbea4e178372270e1e,4af6b652681d628da7411b55209e887a7247282c,,True,True,488108c8f6a87ca1d91ef5af0dbc08d53ea00f8320b19b7c0414515980f75895,Tests_passed,e1b0769ed10fd9fd33ca334cd32756556f98ad72cc6271b58045c13800641533,Tests_passed,True,True,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,8ddbcc49be31a669686a507c73d8af1cbf9185f76e2798a8941c1f98fd97df01,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,d46d07b04afdfdc4793e6aea4abe49721c4d53f305aa53b6b08e63bc4301a2ea,Merge_failed,d46d07b04afdfdc4793e6aea4abe49721c4d53f305aa53b6b08e63bc4301a2ea,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,0.054670095443725586,0.07010650634765625,0.041452646255493164,0.07022666931152344,0.04964423179626465,0.044382572174072266,0.07164216041564941,0.228529691696167,0.06241774559020996,0.22788381576538086,0.22243332862854004,0.19338178634643555,0.07060837745666504,0.2282416820526123 +69,refs/remotes/origin/pull/485,aebeed5d99ee31497e59c84bfc3d312487391c19,f604f6f4dd3228016571d3fbea4e178372270e1e,4af6b652681d628da7411b55209e887a7247282c,,True,True,488108c8f6a87ca1d91ef5af0dbc08d53ea00f8320b19b7c0414515980f75895,Tests_passed,e1b0769ed10fd9fd33ca334cd32756556f98ad72cc6271b58045c13800641533,Tests_passed,True,True,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,8ddbcc49be31a669686a507c73d8af1cbf9185f76e2798a8941c1f98fd97df01,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,d46d07b04afdfdc4793e6aea4abe49721c4d53f305aa53b6b08e63bc4301a2ea,Merge_failed,d46d07b04afdfdc4793e6aea4abe49721c4d53f305aa53b6b08e63bc4301a2ea,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,0.054670095443725586,0.07010650634765625,0.041452646255493164,0.07022666931152344,0.04964423179626465,0.044382572174072266,0.07164216041564941,0.228529691696167,0.06241774559020996,0.2268691062927246,0.2211780548095703,0.19338178634643555,0.07060837745666504,0.2282416820526123 diff --git a/results/greatest_hits/merges_timed/jwtk/jjwt.csv b/results/greatest_hits/merges_timed/jwtk/jjwt.csv index 6944426506..95059776d6 100644 --- a/results/greatest_hits/merges_timed/jwtk/jjwt.csv +++ b/results/greatest_hits/merges_timed/jwtk/jjwt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -142,refs/remotes/origin/pull/293,b864f8820383baf76060579d3a2e9087ecc6eee3,b54c0904f3051c8c6729dd051a7d38ad35fa8e7b,44faaca42205b99503e3d500a7ce3a82d4115819,,True,True,07589569207f93e850db0472a25d3d4e84b4e424a820c9ccbbf79452faef8548,Tests_passed,ff0addc40e3f4c1f7aece1a35011b8880f11e3128e7f817f131549fa7e939d0b,Tests_passed,True,True,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,a47bf405109441487a736cd5f2e327f39304e016d6ac9e12763718722cb1d948,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,6fc5a29774f00c58f1994581c6ed4630c24697397934e4b1f3173fced3f4c907,Merge_failed,6fc5a29774f00c58f1994581c6ed4630c24697397934e4b1f3173fced3f4c907,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,18abc0cbefa19b15b688df2b1b4530c46cae0b15284546ea49d15b481a498951,Merge_failed,0df16ea4f5a7d81e41b3dbae5c412231ad1f597e79ca18b2bc2d8e2bfe531613,0.0465388298034668,0.045534372329711914,0.03653836250305176,0.05128359794616699,0.04006600379943848,0.04875946044921875,0.05227494239807129,0.23126626014709473,0.06807255744934082,0.21431875228881836,0.21430754661560059,0.17490625381469727,1.0916435718536377,0.2187347412109375 +142,refs/remotes/origin/pull/293,b864f8820383baf76060579d3a2e9087ecc6eee3,b54c0904f3051c8c6729dd051a7d38ad35fa8e7b,44faaca42205b99503e3d500a7ce3a82d4115819,,True,True,07589569207f93e850db0472a25d3d4e84b4e424a820c9ccbbf79452faef8548,Tests_passed,ff0addc40e3f4c1f7aece1a35011b8880f11e3128e7f817f131549fa7e939d0b,Tests_passed,True,True,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,a47bf405109441487a736cd5f2e327f39304e016d6ac9e12763718722cb1d948,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,6fc5a29774f00c58f1994581c6ed4630c24697397934e4b1f3173fced3f4c907,Merge_failed,6fc5a29774f00c58f1994581c6ed4630c24697397934e4b1f3173fced3f4c907,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,18abc0cbefa19b15b688df2b1b4530c46cae0b15284546ea49d15b481a498951,Merge_failed,0df16ea4f5a7d81e41b3dbae5c412231ad1f597e79ca18b2bc2d8e2bfe531613,0.0465388298034668,0.045534372329711914,0.03653836250305176,0.05128359794616699,0.04006600379943848,0.04875946044921875,0.05227494239807129,0.23126626014709473,0.06807255744934082,0.21448755264282227,0.21443700790405273,0.17490625381469727,1.0916435718536377,0.2187347412109375 diff --git a/results/greatest_hits/merges_timed/kevin-wayne/algs4.csv b/results/greatest_hits/merges_timed/kevin-wayne/algs4.csv index 410c3838d8..84b9e03e49 100644 --- a/results/greatest_hits/merges_timed/kevin-wayne/algs4.csv +++ b/results/greatest_hits/merges_timed/kevin-wayne/algs4.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/master,b66548467b304fa8a6e7b939b7c44cd265c0e1e8,8e875f80fefd14897240c10f329d6323e069974e,75395a716f9a6128d69879bee6d09abb3e397082,,True,True,9239c86344ccd63c35764c5a8756ab04ae6490c46700657297d576c7bdccc983,Tests_passed,5394368a3322d9e81d66e78df11439668edf9a0f9e6464c60388ff3a4b05c305,Tests_passed,True,True,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f6a22db34ee0065c3a466ea39ecfed63d6499a9d6d1728d44ea3f7f3cfda6492,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,e183cfdc99c53d079ebde9c84f56b37a4eb5cd0b4d1497de363a75f957ec81b0,Merge_failed,e183cfdc99c53d079ebde9c84f56b37a4eb5cd0b4d1497de363a75f957ec81b0,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,476f4d2a00a84f8b2e50e084e927034c57179db3ae24a83ea3401e37d7734c95,0.023292064666748047,0.02749013900756836,0.013513803482055664,0.01665973663330078,0.02262258529663086,0.017772912979125977,0.04252147674560547,0.14713239669799805,0.0649571418762207,0.0766141414642334,0.0778956413269043,0.08227896690368652,0.8448219299316406,0.23439478874206543 +6,refs/heads/master,b66548467b304fa8a6e7b939b7c44cd265c0e1e8,8e875f80fefd14897240c10f329d6323e069974e,75395a716f9a6128d69879bee6d09abb3e397082,,True,True,9239c86344ccd63c35764c5a8756ab04ae6490c46700657297d576c7bdccc983,Tests_passed,5394368a3322d9e81d66e78df11439668edf9a0f9e6464c60388ff3a4b05c305,Tests_passed,True,True,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f6a22db34ee0065c3a466ea39ecfed63d6499a9d6d1728d44ea3f7f3cfda6492,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,e183cfdc99c53d079ebde9c84f56b37a4eb5cd0b4d1497de363a75f957ec81b0,Merge_failed,e183cfdc99c53d079ebde9c84f56b37a4eb5cd0b4d1497de363a75f957ec81b0,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,476f4d2a00a84f8b2e50e084e927034c57179db3ae24a83ea3401e37d7734c95,0.023292064666748047,0.02749013900756836,0.013513803482055664,0.01665973663330078,0.02262258529663086,0.017772912979125977,0.04252147674560547,0.14713239669799805,0.0649571418762207,0.08693814277648926,0.08715629577636719,0.08227896690368652,0.8448219299316406,0.23439478874206543 diff --git a/results/greatest_hits/merges_timed/killme2008/aviator.csv b/results/greatest_hits/merges_timed/killme2008/aviator.csv index 3df48c8a87..ccfe7c6cef 100644 --- a/results/greatest_hits/merges_timed/killme2008/aviator.csv +++ b/results/greatest_hits/merges_timed/killme2008/aviator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,Tests_passed,True,True,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,0.04927468299865723,0.05126309394836426,0.06519412994384766,0.05892634391784668,0.07357287406921387,0.05908322334289551,0.06565332412719727,0.20274853706359863,0.042707204818725586,0.17630290985107422,0.17863750457763672,0.11348104476928711,1.1442959308624268,0.373673677444458 +19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,Tests_passed,True,True,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,0.04927468299865723,0.05126309394836426,0.06519412994384766,0.05892634391784668,0.07357287406921387,0.05908322334289551,0.06565332412719727,0.20274853706359863,0.042707204818725586,0.2157588005065918,0.17020893096923828,0.11348104476928711,1.1442959308624268,0.373673677444458 diff --git a/results/greatest_hits/merges_timed/kong/unirest-java.csv b/results/greatest_hits/merges_timed/kong/unirest-java.csv index f3c135e87f..7cc57cb304 100644 --- a/results/greatest_hits/merges_timed/kong/unirest-java.csv +++ b/results/greatest_hits/merges_timed/kong/unirest-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,Tests_passed,True,True,True,True,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,0.037122249603271484,0.043419837951660156,0.04746103286743164,0.05024886131286621,0.04902911186218262,0.04300355911254883,0.04208111763000488,0.16981816291809082,0.04526352882385254,0.15925073623657227,0.15832781791687012,0.10572075843811035,1.1297626495361328,0.203416109085083 +79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,Tests_passed,True,True,True,True,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,0.037122249603271484,0.043419837951660156,0.04746103286743164,0.05024886131286621,0.04902911186218262,0.04300355911254883,0.04208111763000488,0.16981816291809082,0.04526352882385254,0.15718507766723633,0.15737032890319824,0.10572075843811035,1.1297626495361328,0.203416109085083 diff --git a/results/greatest_hits/merges_timed/konloch/bytecode-viewer.csv b/results/greatest_hits/merges_timed/konloch/bytecode-viewer.csv index 293554793b..d472466963 100644 --- a/results/greatest_hits/merges_timed/konloch/bytecode-viewer.csv +++ b/results/greatest_hits/merges_timed/konloch/bytecode-viewer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,Tests_passed,True,True,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,4fd9f52a9dac1d2dc4f3f63be32c49ee58e1a3bf1bdb7b50e4843a3c28a806d7,Tests_passed,4fd9f52a9dac1d2dc4f3f63be32c49ee58e1a3bf1bdb7b50e4843a3c28a806d7,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,0.06708502769470215,0.07103109359741211,0.09766840934753418,0.11073470115661621,0.09166812896728516,0.11584758758544922,0.11857247352600098,0.17255091667175293,0.07530403137207031,0.24121785163879395,0.20323872566223145,0.14069533348083496,1.034867286682129,0.8183434009552002 +85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,Tests_passed,True,True,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,4fd9f52a9dac1d2dc4f3f63be32c49ee58e1a3bf1bdb7b50e4843a3c28a806d7,Tests_passed,4fd9f52a9dac1d2dc4f3f63be32c49ee58e1a3bf1bdb7b50e4843a3c28a806d7,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,0.06708502769470215,0.07103109359741211,0.09766840934753418,0.11073470115661621,0.09166812896728516,0.11584758758544922,0.11857247352600098,0.17255091667175293,0.07530403137207031,0.21434688568115234,0.2429671287536621,0.14069533348083496,1.034867286682129,0.8183434009552002 diff --git a/results/greatest_hits/merges_timed/lettuce-io/lettuce-core.csv b/results/greatest_hits/merges_timed/lettuce-io/lettuce-core.csv index b09567c8af..a023067373 100644 --- a/results/greatest_hits/merges_timed/lettuce-io/lettuce-core.csv +++ b/results/greatest_hits/merges_timed/lettuce-io/lettuce-core.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -31,refs/heads/main,dd997ac4b36fbe5b5cc6c3fe693ba9c524960d05,ace28afc371c993d35b471c2277ab522ceb7b631,caa06f44929bf41a1f73bdcf09eb8db5885c7001,,True,True,28fd8f90c6636b22add23662e41398c474584baf86bab9a316408247dd46689d,Tests_passed,6918532642f8665614890dbde4286a829c797c39916a82c902261f8e634b0af6,Tests_passed,True,True,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,dba68d84911e49e3f2146623a41bf6f7cb35a8ae11108f156aa73e0a2b6fe785,Tests_passed,dba68d84911e49e3f2146623a41bf6f7cb35a8ae11108f156aa73e0a2b6fe785,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,b9f51d66b985046efc15b5696da644209f02572033695c3bef55b046a79aca75,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,0.05300426483154297,0.049329280853271484,0.036774635314941406,0.053617000579833984,0.047768354415893555,0.05322599411010742,0.03701353073120117,0.1949765682220459,0.05163240432739258,0.18115687370300293,0.18004083633422852,0.12177395820617676,1.007312536239624,0.31505846977233887 +31,refs/heads/main,dd997ac4b36fbe5b5cc6c3fe693ba9c524960d05,ace28afc371c993d35b471c2277ab522ceb7b631,caa06f44929bf41a1f73bdcf09eb8db5885c7001,,True,True,28fd8f90c6636b22add23662e41398c474584baf86bab9a316408247dd46689d,Tests_passed,6918532642f8665614890dbde4286a829c797c39916a82c902261f8e634b0af6,Tests_passed,True,True,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,dba68d84911e49e3f2146623a41bf6f7cb35a8ae11108f156aa73e0a2b6fe785,Tests_passed,dba68d84911e49e3f2146623a41bf6f7cb35a8ae11108f156aa73e0a2b6fe785,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,b9f51d66b985046efc15b5696da644209f02572033695c3bef55b046a79aca75,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,0.05300426483154297,0.049329280853271484,0.036774635314941406,0.053617000579833984,0.047768354415893555,0.05322599411010742,0.03701353073120117,0.1949765682220459,0.05163240432739258,0.17795205116271973,0.1781630516052246,0.12177395820617676,1.007312536239624,0.31505846977233887 diff --git a/results/greatest_hits/merges_timed/linlinjava/litemall.csv b/results/greatest_hits/merges_timed/linlinjava/litemall.csv index ac730ef0ce..e5dcf8ddf4 100644 --- a/results/greatest_hits/merges_timed/linlinjava/litemall.csv +++ b/results/greatest_hits/merges_timed/linlinjava/litemall.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -123,refs/remotes/origin/pull/101,2623ec262305e76dc212afd10d0311cbc85fe81b,794aa4273eb6b746255b75a5e98805f57b5aea9c,570fff521b73bcdd0d4ec16906f7fc55e385946d,,True,True,4f50ed8b3507b9acccc1d2d02a3da27311ca04f4f278a345b1d55e2cc6e0b708,Tests_passed,e814eb628324b4f1e56b351940fa93219f1a7d6eed29913d539fd83086689a5b,Tests_passed,True,True,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,73e391bd598013a62313c35b394ab16cde8b2010805979c86e0f1094ae4810df,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,73e391bd598013a62313c35b394ab16cde8b2010805979c86e0f1094ae4810df,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,b5d2bd8efd97b59e1e6858e52ff58c1d52cba951599de5695b86dc7cfd9dd83c,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,5f42ff408d2cffd68df1eaa43da210354c3504c0878a9eceb9864ce610c53ee2,Merge_failed,bfddae9ba61fe811794d285e8db9fcfa9bced9b4412cc326d7bafe77122e251c,Merge_failed,c13bf330d70872f29a71d8cb393fcb376b1cf8ec0eb59ae142b82305d98938a5,Merge_failed,4c526b0e2f6ce764e882e57e8be261f65328c15c3373a2d04d3f85d3fa205b60,Merge_failed,b7dc61bfdd826e75b7b3c3c3da1b389c6d68a3cb43635cb50eda2c56ac334c35,0.11330986022949219,0.1005549430847168,0.09755229949951172,0.11331534385681152,0.11189818382263184,0.10906863212585449,0.0946352481842041,0.4250493049621582,0.14351654052734375,0.24374604225158691,0.24379777908325195,0.4702432155609131,0.7077407836914062,0.49303102493286133 +123,refs/remotes/origin/pull/101,2623ec262305e76dc212afd10d0311cbc85fe81b,794aa4273eb6b746255b75a5e98805f57b5aea9c,570fff521b73bcdd0d4ec16906f7fc55e385946d,,True,True,4f50ed8b3507b9acccc1d2d02a3da27311ca04f4f278a345b1d55e2cc6e0b708,Tests_passed,e814eb628324b4f1e56b351940fa93219f1a7d6eed29913d539fd83086689a5b,Tests_passed,True,True,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,73e391bd598013a62313c35b394ab16cde8b2010805979c86e0f1094ae4810df,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,73e391bd598013a62313c35b394ab16cde8b2010805979c86e0f1094ae4810df,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,b5d2bd8efd97b59e1e6858e52ff58c1d52cba951599de5695b86dc7cfd9dd83c,Merge_failed,176689f867ab40cdabbb8d2537a9a57da5600c8428cd8a826073b5639877f349,Merge_failed,5f42ff408d2cffd68df1eaa43da210354c3504c0878a9eceb9864ce610c53ee2,Merge_failed,bfddae9ba61fe811794d285e8db9fcfa9bced9b4412cc326d7bafe77122e251c,Merge_failed,c13bf330d70872f29a71d8cb393fcb376b1cf8ec0eb59ae142b82305d98938a5,Merge_failed,4c526b0e2f6ce764e882e57e8be261f65328c15c3373a2d04d3f85d3fa205b60,Merge_failed,b7dc61bfdd826e75b7b3c3c3da1b389c6d68a3cb43635cb50eda2c56ac334c35,0.11330986022949219,0.1005549430847168,0.09755229949951172,0.11331534385681152,0.11189818382263184,0.10906863212585449,0.0946352481842041,0.4250493049621582,0.14351654052734375,0.24110817909240723,0.24082303047180176,0.4702432155609131,0.7077407836914062,0.49303102493286133 diff --git a/results/greatest_hits/merges_timed/liyiorg/weixin-popular.csv b/results/greatest_hits/merges_timed/liyiorg/weixin-popular.csv index 76f9bac4c5..cc74d7759a 100644 --- a/results/greatest_hits/merges_timed/liyiorg/weixin-popular.csv +++ b/results/greatest_hits/merges_timed/liyiorg/weixin-popular.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,Tests_passed,True,True,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,38478bf23ee25409ea7839203734413d68a2600c9d3aef9ab5144ade065e91c1,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,38478bf23ee25409ea7839203734413d68a2600c9d3aef9ab5144ade065e91c1,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,a0f96248af9a66dcdf21f3fc3a6f7acbad31dcfcbf1e49e909afe42d90718a90,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Merge_failed,8d60cf248696b6d9b13216ae5a260b8a66741d3bbf6838ffe1fba2f269b5040b,0.04822850227355957,0.04094409942626953,0.0430302619934082,0.04453873634338379,0.050733327865600586,0.05132246017456055,0.05858111381530762,0.17635488510131836,0.08981704711914062,0.1499016284942627,0.1485896110534668,0.12128210067749023,0.45008349418640137,0.27417826652526855 +64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,Tests_passed,True,True,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,38478bf23ee25409ea7839203734413d68a2600c9d3aef9ab5144ade065e91c1,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,38478bf23ee25409ea7839203734413d68a2600c9d3aef9ab5144ade065e91c1,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Merge_failed,a0f96248af9a66dcdf21f3fc3a6f7acbad31dcfcbf1e49e909afe42d90718a90,Merge_failed,b1df191163572aa5d4aa8eb79d861fa82822a62818f436f60aebc3ed91aac98e,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Merge_failed,8d60cf248696b6d9b13216ae5a260b8a66741d3bbf6838ffe1fba2f269b5040b,0.04822850227355957,0.04094409942626953,0.0430302619934082,0.04453873634338379,0.050733327865600586,0.05132246017456055,0.05858111381530762,0.17635488510131836,0.08981704711914062,0.16011285781860352,0.1477375030517578,0.12128210067749023,0.45008349418640137,0.27417826652526855 diff --git a/results/greatest_hits/merges_timed/logstash/logstash-logback-encoder.csv b/results/greatest_hits/merges_timed/logstash/logstash-logback-encoder.csv index a001118a37..89f37547b9 100644 --- a/results/greatest_hits/merges_timed/logstash/logstash-logback-encoder.csv +++ b/results/greatest_hits/merges_timed/logstash/logstash-logback-encoder.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -253,refs/remotes/origin/pull/649,e8d87859b576c378a49d72d807bc5b0a96c44bc9,69ab39bb3d358438cb047fdd10f9ff440f840609,c87a732681f82eae948ff0d62d9df91087a875fe,,True,True,ba5edbc5e2848f3b7a4d73e2fe6d8921808b7daa07c0edc566416e623e581cbe,Tests_passed,29993c5f9a7b1e3b343d3539ac066104f4ef0bf3a97c937ea9442cd16249d027,Tests_passed,True,True,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_passed,eb2bd1fa544aa3ba8c89a4424d3df7b4b5dc0d4cb14d9879b11699af289dd626,Tests_passed,eb2bd1fa544aa3ba8c89a4424d3df7b4b5dc0d4cb14d9879b11699af289dd626,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,0.0427398681640625,0.04806017875671387,0.05511617660522461,0.0682518482208252,0.06818628311157227,0.0661153793334961,0.06399106979370117,0.2393791675567627,0.07101321220397949,0.36746954917907715,0.3774735927581787,0.1630089282989502,0.05350661277770996,0.3183302879333496 +253,refs/remotes/origin/pull/649,e8d87859b576c378a49d72d807bc5b0a96c44bc9,69ab39bb3d358438cb047fdd10f9ff440f840609,c87a732681f82eae948ff0d62d9df91087a875fe,,True,True,ba5edbc5e2848f3b7a4d73e2fe6d8921808b7daa07c0edc566416e623e581cbe,Tests_passed,29993c5f9a7b1e3b343d3539ac066104f4ef0bf3a97c937ea9442cd16249d027,Tests_passed,True,True,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_passed,eb2bd1fa544aa3ba8c89a4424d3df7b4b5dc0d4cb14d9879b11699af289dd626,Tests_passed,eb2bd1fa544aa3ba8c89a4424d3df7b4b5dc0d4cb14d9879b11699af289dd626,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,0.0427398681640625,0.04806017875671387,0.05511617660522461,0.0682518482208252,0.06818628311157227,0.0661153793334961,0.06399106979370117,0.2393791675567627,0.07101321220397949,0.3697831630706787,0.3711543083190918,0.1630089282989502,0.05350661277770996,0.3183302879333496 diff --git a/results/greatest_hits/merges_timed/medcl/elasticsearch-analysis-ik.csv b/results/greatest_hits/merges_timed/medcl/elasticsearch-analysis-ik.csv index 5d2422e413..4c4ba98793 100644 --- a/results/greatest_hits/merges_timed/medcl/elasticsearch-analysis-ik.csv +++ b/results/greatest_hits/merges_timed/medcl/elasticsearch-analysis-ik.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,Tests_passed,True,True,True,True,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,0.056929826736450195,0.05699658393859863,0.08025383949279785,0.08061790466308594,0.08028316497802734,0.08058309555053711,0.08079028129577637,0.13065838813781738,0.05724215507507324,0.21758151054382324,0.2180168628692627,0.1122901439666748,1.1493992805480957,0.23141980171203613 +3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,Tests_passed,True,True,True,True,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,0.056929826736450195,0.05699658393859863,0.08025383949279785,0.08061790466308594,0.08028316497802734,0.08058309555053711,0.08079028129577637,0.13065838813781738,0.05724215507507324,0.21592235565185547,0.21431612968444824,0.1122901439666748,1.1493992805480957,0.23141980171203613 diff --git a/results/greatest_hits/merges_timed/medcl/elasticsearch-analysis-pinyin.csv b/results/greatest_hits/merges_timed/medcl/elasticsearch-analysis-pinyin.csv index 475ff2b8ba..f40f38d46c 100644 --- a/results/greatest_hits/merges_timed/medcl/elasticsearch-analysis-pinyin.csv +++ b/results/greatest_hits/merges_timed/medcl/elasticsearch-analysis-pinyin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,True,True,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,Tests_passed,True,True,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,49670f6e60fec7de3b89f209bef3cd9bab0310adedfee9e71de44817b8bb6c33,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Merge_failed,572dde86788438359c654c1e99098c4ca6badc4fff50c300b3b659c256d73c7f,0.04614877700805664,0.045648813247680664,0.04175305366516113,0.03212332725524902,0.040902137756347656,0.03508758544921875,0.035361528396606445,0.1217963695526123,0.06773161888122559,0.14927887916564941,0.14833402633666992,0.11369752883911133,0.6239135265350342,0.20711946487426758 +12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,True,True,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,Tests_passed,True,True,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Merge_failed,49670f6e60fec7de3b89f209bef3cd9bab0310adedfee9e71de44817b8bb6c33,Merge_failed,b981f789d053708cd329d079c5bc2eb410472dd4f4b8c595f841e469dad622a0,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Merge_failed,572dde86788438359c654c1e99098c4ca6badc4fff50c300b3b659c256d73c7f,0.04614877700805664,0.045648813247680664,0.04175305366516113,0.03212332725524902,0.040902137756347656,0.03508758544921875,0.035361528396606445,0.1217963695526123,0.06773161888122559,0.14512062072753906,0.14676666259765625,0.11369752883911133,0.6239135265350342,0.20711946487426758 diff --git a/results/greatest_hits/merges_timed/mojohaus/exec-maven-plugin.csv b/results/greatest_hits/merges_timed/mojohaus/exec-maven-plugin.csv index 29aebc1448..510d4ee857 100644 --- a/results/greatest_hits/merges_timed/mojohaus/exec-maven-plugin.csv +++ b/results/greatest_hits/merges_timed/mojohaus/exec-maven-plugin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -43,refs/remotes/origin/pull/44,4c831013aa8566249aae635880e414012ded48ee,885f2f42706c637b79aebc3d6ea45b68394c9301,79ffadef8f9200893a5df55480b8cc920e77a394,,True,True,56102c0f0170020a033681690e9cb0174cdf5be753f59b8fbfcc4c31094eb98f,Tests_passed,f6ccc78e0da0f85a5fb0feeb6ed94f5da145f7625d30eceb39383711122a33f9,Tests_passed,True,True,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,3bce6b104624ccaf12f48d575be76a8d4202a528df2423f7a20cf6d21132c359,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,c80beb9a019e10ad2743601174aec94f867cdb5baab83b39619ed43de6a03177,Merge_failed,c80beb9a019e10ad2743601174aec94f867cdb5baab83b39619ed43de6a03177,Merge_failed,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Tests_passed,8540e33851275d5356cc248ac3cd4a514c69fb4c87ef2bfee857d3d799a713c1,Merge_failed,1c5e16cfaeecfc632f513844f79567f3193dd39ef5628e3b2809c810c12e0739,0.0350947380065918,0.04623556137084961,0.05068206787109375,0.046700239181518555,0.044840097427368164,0.04007720947265625,0.04721212387084961,0.1716630458831787,0.06914472579956055,0.07236599922180176,0.07293391227722168,0.12360334396362305,1.5209083557128906,0.19981098175048828 +43,refs/remotes/origin/pull/44,4c831013aa8566249aae635880e414012ded48ee,885f2f42706c637b79aebc3d6ea45b68394c9301,79ffadef8f9200893a5df55480b8cc920e77a394,,True,True,56102c0f0170020a033681690e9cb0174cdf5be753f59b8fbfcc4c31094eb98f,Tests_passed,f6ccc78e0da0f85a5fb0feeb6ed94f5da145f7625d30eceb39383711122a33f9,Tests_passed,True,True,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,3bce6b104624ccaf12f48d575be76a8d4202a528df2423f7a20cf6d21132c359,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,c80beb9a019e10ad2743601174aec94f867cdb5baab83b39619ed43de6a03177,Merge_failed,c80beb9a019e10ad2743601174aec94f867cdb5baab83b39619ed43de6a03177,Merge_failed,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Tests_passed,8540e33851275d5356cc248ac3cd4a514c69fb4c87ef2bfee857d3d799a713c1,Merge_failed,1c5e16cfaeecfc632f513844f79567f3193dd39ef5628e3b2809c810c12e0739,0.0350947380065918,0.04623556137084961,0.05068206787109375,0.046700239181518555,0.044840097427368164,0.04007720947265625,0.04721212387084961,0.1716630458831787,0.06914472579956055,0.07300305366516113,0.07275891304016113,0.12360334396362305,1.5209083557128906,0.19981098175048828 diff --git a/results/greatest_hits/merges_timed/moquette-io/moquette.csv b/results/greatest_hits/merges_timed/moquette-io/moquette.csv index 5000c5d8d2..9847e48df0 100644 --- a/results/greatest_hits/merges_timed/moquette-io/moquette.csv +++ b/results/greatest_hits/merges_timed/moquette-io/moquette.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -108,refs/remotes/origin/pull/109,f0bde2f711c6774a067098216079052e05940751,cc4b3715c59dbdca3cc68d422c0e541ef5258b62,a9404bdf31f9c6455857e5cfbaea9f54d95f008a,,True,True,3f33d8a484bbc013c0ce66ab4670073048dd2c4bf434a0847f9c7c94cae3d427,Tests_passed,51e1197b825373beb5903fb928988806465201c3ab3388b79fe0e9e4e70ee6ef,Tests_passed,True,True,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,0.05082535743713379,0.04283881187438965,0.05010581016540527,0.03232002258300781,0.03838062286376953,0.04252433776855469,0.04762005805969238,0.17762446403503418,0.04236960411071777,0.16084933280944824,0.16207456588745117,0.10495758056640625,0.9524059295654297,0.26206421852111816 +108,refs/remotes/origin/pull/109,f0bde2f711c6774a067098216079052e05940751,cc4b3715c59dbdca3cc68d422c0e541ef5258b62,a9404bdf31f9c6455857e5cfbaea9f54d95f008a,,True,True,3f33d8a484bbc013c0ce66ab4670073048dd2c4bf434a0847f9c7c94cae3d427,Tests_passed,51e1197b825373beb5903fb928988806465201c3ab3388b79fe0e9e4e70ee6ef,Tests_passed,True,True,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,0.05082535743713379,0.04283881187438965,0.05010581016540527,0.03232002258300781,0.03838062286376953,0.04252433776855469,0.04762005805969238,0.17762446403503418,0.04236960411071777,0.1594831943511963,0.15860223770141602,0.10495758056640625,0.9524059295654297,0.26206421852111816 diff --git a/results/greatest_hits/merges_timed/mpusher/mpush.csv b/results/greatest_hits/merges_timed/mpusher/mpush.csv index 784f64e23e..794ddcfd53 100644 --- a/results/greatest_hits/merges_timed/mpusher/mpush.csv +++ b/results/greatest_hits/merges_timed/mpusher/mpush.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -4,refs/heads/master,684f038dad1d5b95b6f3f60674e12e4ef0b47922,07fd8670acc7a57964abb915d5ca5f7ac52fc274,f13181de9b34506304d88fe53c7d7054b4263bfa,,True,True,9325b0a62a895f85e0a4a4c3cbbd4fb641db2580c675202874d33c62ebaecaf6,Tests_passed,5e9acc50a49f00d7b8ef74aae78782a1312444730aeacf468783fc14224fd47d,Tests_passed,True,True,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a843b9470551c3e439f4f5fd43ea9ad21c881afa996bee82993cb1739e76e6a9,Merge_failed,54c57a422d7b3f3d2be55785a5f8559f25f28da8df7883f8f4dbe9affb69d0da,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a9f3ce5c36d29e486416f4ae87e9f1f0c9b89ba5b25bcfea8f00dd0fbc5817f2,Merge_failed,a9f3ce5c36d29e486416f4ae87e9f1f0c9b89ba5b25bcfea8f00dd0fbc5817f2,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,fc72ebd162fd37de12fc5452c076ede619f97f3ad91cb988a941e61816ce683c,Merge_failed,ac66d17b435a7e060766986ee0df2af0f2fd065c1259b96ce324e510c0004381,0.05559968948364258,0.07389974594116211,0.06519770622253418,0.07088470458984375,0.0642862319946289,0.06090831756591797,0.06240391731262207,0.8698749542236328,0.12299489974975586,0.9716978073120117,0.9641993045806885,0.6969237327575684,5.425331354141235,0.38678717613220215 +4,refs/heads/master,684f038dad1d5b95b6f3f60674e12e4ef0b47922,07fd8670acc7a57964abb915d5ca5f7ac52fc274,f13181de9b34506304d88fe53c7d7054b4263bfa,,True,True,9325b0a62a895f85e0a4a4c3cbbd4fb641db2580c675202874d33c62ebaecaf6,Tests_passed,5e9acc50a49f00d7b8ef74aae78782a1312444730aeacf468783fc14224fd47d,Tests_passed,True,True,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a843b9470551c3e439f4f5fd43ea9ad21c881afa996bee82993cb1739e76e6a9,Merge_failed,54c57a422d7b3f3d2be55785a5f8559f25f28da8df7883f8f4dbe9affb69d0da,Merge_failed,a640621163f7da89daff3bc2a291a773b998411734ce5a39dbe7318b5c7daaeb,Merge_failed,a9f3ce5c36d29e486416f4ae87e9f1f0c9b89ba5b25bcfea8f00dd0fbc5817f2,Merge_failed,a9f3ce5c36d29e486416f4ae87e9f1f0c9b89ba5b25bcfea8f00dd0fbc5817f2,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,fc72ebd162fd37de12fc5452c076ede619f97f3ad91cb988a941e61816ce683c,Merge_failed,ac66d17b435a7e060766986ee0df2af0f2fd065c1259b96ce324e510c0004381,0.05559968948364258,0.07389974594116211,0.06519770622253418,0.07088470458984375,0.0642862319946289,0.06090831756591797,0.06240391731262207,0.8698749542236328,0.12299489974975586,0.9607257843017578,0.9603695869445801,0.6969237327575684,5.425331354141235,0.38678717613220215 diff --git a/results/greatest_hits/merges_timed/mybatis/mybatis-3.csv b/results/greatest_hits/merges_timed/mybatis/mybatis-3.csv index 863a7ac4d8..77fefda792 100644 --- a/results/greatest_hits/merges_timed/mybatis/mybatis-3.csv +++ b/results/greatest_hits/merges_timed/mybatis/mybatis-3.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -184,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,Tests_passed,True,True,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,0.13586640357971191,0.13757586479187012,0.2539541721343994,0.25399351119995117,0.2552957534790039,0.2543463706970215,0.2550218105316162,0.29887986183166504,0.13489007949829102,0.27087950706481934,0.2721266746520996,0.19056057929992676,0.14876532554626465,4.229933261871338 +184,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,Tests_passed,True,True,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,0.13586640357971191,0.13757586479187012,0.2539541721343994,0.25399351119995117,0.2552957534790039,0.2543463706970215,0.2550218105316162,0.29887986183166504,0.13489007949829102,0.26972365379333496,0.26905250549316406,0.19056057929992676,0.14876532554626465,4.229933261871338 diff --git a/results/greatest_hits/merges_timed/mybatis/spring.csv b/results/greatest_hits/merges_timed/mybatis/spring.csv index f7836e6ec6..a7bb9c74ed 100644 --- a/results/greatest_hits/merges_timed/mybatis/spring.csv +++ b/results/greatest_hits/merges_timed/mybatis/spring.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,Tests_passed,True,True,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,0.03406405448913574,0.043744802474975586,0.05973958969116211,0.05338478088378906,0.05395650863647461,0.06111645698547363,0.0741415023803711,0.2666006088256836,0.03545022010803223,0.33321070671081543,0.3355898857116699,0.15196585655212402,0.05642056465148926,0.35519886016845703 +155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,Tests_passed,True,True,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,0.03406405448913574,0.043744802474975586,0.05973958969116211,0.05338478088378906,0.05395650863647461,0.06111645698547363,0.0741415023803711,0.2666006088256836,0.03545022010803223,0.3325490951538086,0.3321387767791748,0.15196585655212402,0.05642056465148926,0.35519886016845703 diff --git a/results/greatest_hits/merges_timed/nanohttpd/nanohttpd.csv b/results/greatest_hits/merges_timed/nanohttpd/nanohttpd.csv index 8cd0c5ca8e..09ecba16cd 100644 --- a/results/greatest_hits/merges_timed/nanohttpd/nanohttpd.csv +++ b/results/greatest_hits/merges_timed/nanohttpd/nanohttpd.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -11,refs/heads/master,e175fd08e041cd741016bb1f1a944d2caec8f3e6,63815b9a19c35d965465fa25028cd0a9a5fbcb40,9cd340f18884c71807da5ed687bc51450b7811d0,,064eabb579823852af71b85087c929d27b87659a6b202f5c144a8b23a4ffe714,Tests_passed,d9184fa03ddd372bb9e50d2b80b64f6bfc77099e248476a61a62757e6b96f5c1,Tests_passed,True,True,True,True,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,760d179976a51f1a5bd49cfa994ffce2c119674b7576a63904b2797cc22c1bd2,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,0.04477047920227051,0.04626059532165527,0.04992818832397461,0.04505157470703125,0.04137539863586426,0.050064802169799805,0.056285858154296875,0.2608911991119385,0.028474807739257812,0.33516359329223633,0.333127498626709,0.137007474899292,2.3065645694732666,0.21901321411132812 +11,refs/heads/master,e175fd08e041cd741016bb1f1a944d2caec8f3e6,63815b9a19c35d965465fa25028cd0a9a5fbcb40,9cd340f18884c71807da5ed687bc51450b7811d0,,064eabb579823852af71b85087c929d27b87659a6b202f5c144a8b23a4ffe714,Tests_passed,d9184fa03ddd372bb9e50d2b80b64f6bfc77099e248476a61a62757e6b96f5c1,Tests_passed,True,True,True,True,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,760d179976a51f1a5bd49cfa994ffce2c119674b7576a63904b2797cc22c1bd2,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,0.04477047920227051,0.04626059532165527,0.04992818832397461,0.04505157470703125,0.04137539863586426,0.050064802169799805,0.056285858154296875,0.2608911991119385,0.028474807739257812,0.325345516204834,0.32613658905029297,0.137007474899292,2.3065645694732666,0.21901321411132812 diff --git a/results/greatest_hits/merges_timed/nepxion/discovery.csv b/results/greatest_hits/merges_timed/nepxion/discovery.csv index dba645ac76..23839200e3 100644 --- a/results/greatest_hits/merges_timed/nepxion/discovery.csv +++ b/results/greatest_hits/merges_timed/nepxion/discovery.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/6.x.x,99c2bc3a686bfaa15e56484c3828e1fb0e17cfd6,a5a645b7496ddd0c4647abc6b1d8334d561f1eb4,eeef4711d6e2f12a03b2956bda837b06311feea1,,True,True,084f2c345aeb1284e4d1a6d16ac0ad405f5477595a8ae351ee1f3266b7ee43df,Tests_passed,c93f72ef3c8f6ade021264011100c1be77a55a5d6f716404c4e16f69bcbba451,Tests_passed,True,True,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9f12e440b5fef3fb34930f9ee4f9a94d8cdfe5b03b91e127d8ea5348a29cadd9,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,8186fac8f99130b80b1e5c7e4d7b6dee100952815dbab9cc6fe75558c5d119d6,Merge_failed,8186fac8f99130b80b1e5c7e4d7b6dee100952815dbab9cc6fe75558c5d119d6,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,0.0481562614440918,0.031149625778198242,0.05950450897216797,0.025644302368164062,0.05263781547546387,0.05614781379699707,0.04702305793762207,0.3046746253967285,0.12761402130126953,0.22952961921691895,0.24251508712768555,0.18300557136535645,0.03519845008850098,0.44635605812072754 +13,refs/heads/6.x.x,99c2bc3a686bfaa15e56484c3828e1fb0e17cfd6,a5a645b7496ddd0c4647abc6b1d8334d561f1eb4,eeef4711d6e2f12a03b2956bda837b06311feea1,,True,True,084f2c345aeb1284e4d1a6d16ac0ad405f5477595a8ae351ee1f3266b7ee43df,Tests_passed,c93f72ef3c8f6ade021264011100c1be77a55a5d6f716404c4e16f69bcbba451,Tests_passed,True,True,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9f12e440b5fef3fb34930f9ee4f9a94d8cdfe5b03b91e127d8ea5348a29cadd9,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,8186fac8f99130b80b1e5c7e4d7b6dee100952815dbab9cc6fe75558c5d119d6,Merge_failed,8186fac8f99130b80b1e5c7e4d7b6dee100952815dbab9cc6fe75558c5d119d6,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,0.0481562614440918,0.031149625778198242,0.05950450897216797,0.025644302368164062,0.05263781547546387,0.05614781379699707,0.04702305793762207,0.3046746253967285,0.12761402130126953,0.237746000289917,0.22742795944213867,0.18300557136535645,0.03519845008850098,0.44635605812072754 diff --git a/results/greatest_hits/merges_timed/newbee-ltd/newbee-mall.csv b/results/greatest_hits/merges_timed/newbee-ltd/newbee-mall.csv index c2817f6e27..a4c855d2b0 100644 --- a/results/greatest_hits/merges_timed/newbee-ltd/newbee-mall.csv +++ b/results/greatest_hits/merges_timed/newbee-ltd/newbee-mall.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -25,refs/remotes/origin/pull/62,0710125767852fddddaf0ab338c25793f492f68d,1c1d9af4776ed9e0da72091e7635065a05f53ee1,59354e6e91eefa18168fb7528c1d4b462196575f,,True,True,2f4394f7607535d62e504d42dfee2c0163bca12dff23efd0f52a1e8c3b7d8fd2,Tests_passed,0f025595e8b03340e6f54231cae991778a17399c8f390b26c0bee570918cab7c,Tests_passed,True,True,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,70b40ecd186f3475b61f24bbd55e10f6393e3bc8d19c9f0729100a3229ffb72c,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,0e73a90785e0aa7751a842a5c012adb18ffc64d88ad529dab0c7d5a7a259e1cc,Merge_failed,0e73a90785e0aa7751a842a5c012adb18ffc64d88ad529dab0c7d5a7a259e1cc,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,0.11765217781066895,0.11958527565002441,0.14587926864624023,0.1566603183746338,0.14646315574645996,0.14771580696105957,0.15063238143920898,0.36700987815856934,0.1731112003326416,0.5258033275604248,0.5279309749603271,0.3409719467163086,0.13479018211364746,0.57694411277771 +25,refs/remotes/origin/pull/62,0710125767852fddddaf0ab338c25793f492f68d,1c1d9af4776ed9e0da72091e7635065a05f53ee1,59354e6e91eefa18168fb7528c1d4b462196575f,,True,True,2f4394f7607535d62e504d42dfee2c0163bca12dff23efd0f52a1e8c3b7d8fd2,Tests_passed,0f025595e8b03340e6f54231cae991778a17399c8f390b26c0bee570918cab7c,Tests_passed,True,True,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,70b40ecd186f3475b61f24bbd55e10f6393e3bc8d19c9f0729100a3229ffb72c,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,0e73a90785e0aa7751a842a5c012adb18ffc64d88ad529dab0c7d5a7a259e1cc,Merge_failed,0e73a90785e0aa7751a842a5c012adb18ffc64d88ad529dab0c7d5a7a259e1cc,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,0.11765217781066895,0.11958527565002441,0.14587926864624023,0.1566603183746338,0.14646315574645996,0.14771580696105957,0.15063238143920898,0.36700987815856934,0.1731112003326416,0.5268151760101318,0.5282394886016846,0.3409719467163086,0.13479018211364746,0.57694411277771 diff --git a/results/greatest_hits/merges_timed/ninjaframework/ninja.csv b/results/greatest_hits/merges_timed/ninjaframework/ninja.csv index 68e8d47894..6a2c6ed540 100644 --- a/results/greatest_hits/merges_timed/ninjaframework/ninja.csv +++ b/results/greatest_hits/merges_timed/ninjaframework/ninja.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -480,refs/heads/develop,851c45513b188851e66868f1fdd0d80a1ed7344c,6a57f076f80dfeeb316a40fb134711b9388bc32c,cd3d0d8b56760edf71bddc2c6b1b4f00aa3a3b30,,True,True,3def925c02143a1c3a406890fff77012f7d1504aa3bf86ebd07df7e4e9b1994f,Tests_passed,d534b4720cb943c07b998ccd6572246a84b3fb11153dcbe1fa0db94a2bee06af,Tests_passed,True,True,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_failed,be09c3fa3cace75a7c0132a2c178d0d6d6888b4db4179e5f3a0884d17a84a0bc,Tests_failed,be09c3fa3cace75a7c0132a2c178d0d6d6888b4db4179e5f3a0884d17a84a0bc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,f487c028fd9017264f2f2db0bfc2fe20207b7b2bbf02a6d352883daf89ccf869,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,0.019037246704101562,0.018578529357910156,0.023587942123413086,0.023169517517089844,0.023734331130981445,0.02359771728515625,0.023306846618652344,0.053696632385253906,0.019121408462524414,0.1620783805847168,0.15946626663208008,0.0736551284790039,0.49148130416870117,0.2518453598022461 +480,refs/heads/develop,851c45513b188851e66868f1fdd0d80a1ed7344c,6a57f076f80dfeeb316a40fb134711b9388bc32c,cd3d0d8b56760edf71bddc2c6b1b4f00aa3a3b30,,True,True,3def925c02143a1c3a406890fff77012f7d1504aa3bf86ebd07df7e4e9b1994f,Tests_passed,d534b4720cb943c07b998ccd6572246a84b3fb11153dcbe1fa0db94a2bee06af,Tests_passed,True,True,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_failed,be09c3fa3cace75a7c0132a2c178d0d6d6888b4db4179e5f3a0884d17a84a0bc,Tests_failed,be09c3fa3cace75a7c0132a2c178d0d6d6888b4db4179e5f3a0884d17a84a0bc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,f487c028fd9017264f2f2db0bfc2fe20207b7b2bbf02a6d352883daf89ccf869,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,0.019037246704101562,0.018578529357910156,0.023587942123413086,0.023169517517089844,0.023734331130981445,0.02359771728515625,0.023306846618652344,0.053696632385253906,0.019121408462524414,0.15977835655212402,0.15949583053588867,0.0736551284790039,0.49148130416870117,0.2518453598022461 diff --git a/results/greatest_hits/merges_timed/ninjudd/drip.csv b/results/greatest_hits/merges_timed/ninjudd/drip.csv index 8749f53228..0570d41cfe 100644 --- a/results/greatest_hits/merges_timed/ninjudd/drip.csv +++ b/results/greatest_hits/merges_timed/ninjudd/drip.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/heads/master,d2d0fae2ac75d59f17a8b24764fe886d73349e21,381ee4e2e8e56034ec0b79744aa2e8ad7ccc9796,32381db764e83aa02c6ad94a987076c64c54e259,,True,True,02513436999f519a039250c513424abc4cfbaf279a90f64e54b6f6438445a90d,Tests_passed,477d7e3589fe9da218db8dd24a6bc40c75fde183af52b5865fcbacffa0de77b2,Tests_passed,True,True,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,0.03739500045776367,0.03791236877441406,0.03908228874206543,0.038495540618896484,0.037780046463012695,0.03877425193786621,0.03641557693481445,0.15652179718017578,0.03850603103637695,0.14362168312072754,0.14412140846252441,0.10643959045410156,0.7693829536437988,0.18352985382080078 +19,refs/heads/master,d2d0fae2ac75d59f17a8b24764fe886d73349e21,381ee4e2e8e56034ec0b79744aa2e8ad7ccc9796,32381db764e83aa02c6ad94a987076c64c54e259,,True,True,02513436999f519a039250c513424abc4cfbaf279a90f64e54b6f6438445a90d,Tests_passed,477d7e3589fe9da218db8dd24a6bc40c75fde183af52b5865fcbacffa0de77b2,Tests_passed,True,True,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,0.03739500045776367,0.03791236877441406,0.03908228874206543,0.038495540618896484,0.037780046463012695,0.03877425193786621,0.03641557693481445,0.15652179718017578,0.03850603103637695,0.1417996883392334,0.1422433853149414,0.10643959045410156,0.7693829536437988,0.18352985382080078 diff --git a/results/greatest_hits/merges_timed/oldmanpushcart/greys-anatomy.csv b/results/greatest_hits/merges_timed/oldmanpushcart/greys-anatomy.csv index c0bdceb32c..86e7d6deb3 100644 --- a/results/greatest_hits/merges_timed/oldmanpushcart/greys-anatomy.csv +++ b/results/greatest_hits/merges_timed/oldmanpushcart/greys-anatomy.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,True,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,Tests_passed,True,True,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,f0bd0f24957168df3bfb713cf6ec058184de412825cc84773553673f487a9094,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,49b6df8f38a303e765b0f4331314a45f661593c9375bcf488c85ed1b6049023c,Merge_failed,a4516eb7ff27207df652dbbdaea98bc42a47e5f0ccce492c8bfbc524be1e3980,Merge_failed,a4516eb7ff27207df652dbbdaea98bc42a47e5f0ccce492c8bfbc524be1e3980,Merge_failed,d4c3025993c88d20cfa2429927d94818b776423bb4f5eea009e2d2bc37d69d2a,Merge_failed,49527bac28df477a10ef01516de95eb4f143d48d432ce02bb10a9901e0d6759e,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,1c27b4755eb3a412d78da63c56ed36270caadfd78bd922be6dddd7ef74cb75d3,Merge_failed,1c27b4755eb3a412d78da63c56ed36270caadfd78bd922be6dddd7ef74cb75d3,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,0.05584526062011719,0.06443357467651367,0.06381487846374512,0.061077117919921875,0.0633094310760498,0.06451773643493652,0.05006241798400879,2.2430131435394287,0.43747425079345703,2.978907346725464,2.9477927684783936,1.9398653507232666,19.027888774871826,0.2559974193572998 +78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,True,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,Tests_passed,True,True,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,f0bd0f24957168df3bfb713cf6ec058184de412825cc84773553673f487a9094,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,49b6df8f38a303e765b0f4331314a45f661593c9375bcf488c85ed1b6049023c,Merge_failed,a4516eb7ff27207df652dbbdaea98bc42a47e5f0ccce492c8bfbc524be1e3980,Merge_failed,a4516eb7ff27207df652dbbdaea98bc42a47e5f0ccce492c8bfbc524be1e3980,Merge_failed,d4c3025993c88d20cfa2429927d94818b776423bb4f5eea009e2d2bc37d69d2a,Merge_failed,49527bac28df477a10ef01516de95eb4f143d48d432ce02bb10a9901e0d6759e,Merge_failed,646673cb6b7651f1297c8727a4f65f5ea12d03770c4e3676734065778f9c0c65,Merge_failed,1c27b4755eb3a412d78da63c56ed36270caadfd78bd922be6dddd7ef74cb75d3,Merge_failed,1c27b4755eb3a412d78da63c56ed36270caadfd78bd922be6dddd7ef74cb75d3,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,0.05584526062011719,0.06443357467651367,0.06381487846374512,0.061077117919921875,0.0633094310760498,0.06451773643493652,0.05006241798400879,2.2430131435394287,0.43747425079345703,2.9816315174102783,2.9489355087280273,1.9398653507232666,19.027888774871826,0.2559974193572998 diff --git a/results/greatest_hits/merges_timed/openapitools/openapi-generator.csv b/results/greatest_hits/merges_timed/openapitools/openapi-generator.csv index cbbe4147da..13890d79f9 100644 --- a/results/greatest_hits/merges_timed/openapitools/openapi-generator.csv +++ b/results/greatest_hits/merges_timed/openapitools/openapi-generator.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3558,refs/remotes/origin/pull/1014,297029e1bd2112e6fbeef1efde0778141a2cdf9c,205fa699e300a47b643ac786334930777c0a37a9,35c3be83f85b36d40d92d2cf6c5d78edf96d1980,,f535c18b0acb6787bb89ef1a1fe9e8160020b4f0237a4a4675a6649de2fb4ab9,Tests_passed,55355a47d45942c494d2873eff0c94b8208e31fbf15ca3f215dde9b1be8d4686,Tests_passed,True,True,True,True,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,10d569eed06d987261631ae742c8ae2efdacae977edcefe4b57bbe14aaaedbb6,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,0.044916629791259766,0.05884194374084473,0.0490260124206543,0.05456686019897461,0.05364537239074707,0.05592966079711914,0.0525360107421875,0.1893613338470459,0.0382695198059082,0.21221399307250977,0.21271300315856934,0.11614823341369629,2.380113363265991,1.7434051036834717 +3558,refs/remotes/origin/pull/1014,297029e1bd2112e6fbeef1efde0778141a2cdf9c,205fa699e300a47b643ac786334930777c0a37a9,35c3be83f85b36d40d92d2cf6c5d78edf96d1980,,f535c18b0acb6787bb89ef1a1fe9e8160020b4f0237a4a4675a6649de2fb4ab9,Tests_passed,55355a47d45942c494d2873eff0c94b8208e31fbf15ca3f215dde9b1be8d4686,Tests_passed,True,True,True,True,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,10d569eed06d987261631ae742c8ae2efdacae977edcefe4b57bbe14aaaedbb6,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,0.044916629791259766,0.05884194374084473,0.0490260124206543,0.05456686019897461,0.05364537239074707,0.05592966079711914,0.0525360107421875,0.1893613338470459,0.0382695198059082,0.2160508632659912,0.21443676948547363,0.11614823341369629,2.380113363265991,1.7434051036834717 diff --git a/results/greatest_hits/merges_timed/openrefine/openrefine.csv b/results/greatest_hits/merges_timed/openrefine/openrefine.csv index 35b6f6a861..768250f665 100644 --- a/results/greatest_hits/merges_timed/openrefine/openrefine.csv +++ b/results/greatest_hits/merges_timed/openrefine/openrefine.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,Tests_passed,True,True,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,0.049082040786743164,0.06729316711425781,0.06582522392272949,0.05254507064819336,0.05135035514831543,0.06628179550170898,0.05425310134887695,0.16430902481079102,0.05081796646118164,0.18729138374328613,0.18699431419372559,0.10298490524291992,0.07673406600952148,0.9323034286499023 +306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,Tests_passed,True,True,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,0.049082040786743164,0.06729316711425781,0.06582522392272949,0.05254507064819336,0.05135035514831543,0.06628179550170898,0.05425310134887695,0.16430902481079102,0.05081796646118164,0.1813526153564453,0.18154096603393555,0.10298490524291992,0.07673406600952148,0.9323034286499023 diff --git a/results/greatest_hits/merges_timed/openzipkin/zipkin.csv b/results/greatest_hits/merges_timed/openzipkin/zipkin.csv index 6415d9c5f6..271c7dd5bf 100644 --- a/results/greatest_hits/merges_timed/openzipkin/zipkin.csv +++ b/results/greatest_hits/merges_timed/openzipkin/zipkin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -817,refs/remotes/origin/pull/3437,cc301700a10142e2d7f5f46da869c93197b58b4b,b121d46945d70759a1e1a330831c3085dc406d8b,070afe27beb2d9fa3ffd38780119fb63705534a6,,True,True,bf7714846c403c012dd78282285973c68203482a81c8540a7b472986f7656a09,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,True,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,0.0516207218170166,0.04362034797668457,0.013971090316772461,0.013147592544555664,0.013854503631591797,0.013248205184936523,0.01787114143371582,0.17997264862060547,0.052214860916137695,0.16550350189208984,0.16614747047424316,0.07423019409179688,0.028954744338989258,0.32126426696777344 +817,refs/remotes/origin/pull/3437,cc301700a10142e2d7f5f46da869c93197b58b4b,b121d46945d70759a1e1a330831c3085dc406d8b,070afe27beb2d9fa3ffd38780119fb63705534a6,,True,True,bf7714846c403c012dd78282285973c68203482a81c8540a7b472986f7656a09,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,True,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,0.0516207218170166,0.04362034797668457,0.013971090316772461,0.013147592544555664,0.013854503631591797,0.013248205184936523,0.01787114143371582,0.17997264862060547,0.052214860916137695,0.16301536560058594,0.1616075038909912,0.07423019409179688,0.028954744338989258,0.32126426696777344 diff --git a/results/greatest_hits/merges_timed/pagehelper/mybatis-pagehelper.csv b/results/greatest_hits/merges_timed/pagehelper/mybatis-pagehelper.csv index 3ba422ac36..b2e5d86762 100644 --- a/results/greatest_hits/merges_timed/pagehelper/mybatis-pagehelper.csv +++ b/results/greatest_hits/merges_timed/pagehelper/mybatis-pagehelper.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,8182846c13c90ee486dbbe62bec51705e8fd3f83,8961063ccaebbcb71e3ea627ab90a8c25bcdd75b,be523bc4b471c78a89108bffc9c3f7bf88cdf69c,,True,True,c82ff8a978d8c2c2ffcda1ea65c82c082dfbf2206a8352126a7034eb8550cd02,Tests_passed,b8cbe942156d6c5c0d7d6015d59acfee188dc713b4f283f6fd03906c520f83ef,Tests_passed,True,True,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,0.040831804275512695,0.041558265686035156,0.05763840675354004,0.02368450164794922,0.05775141716003418,0.02333521842956543,0.05723166465759277,0.05316472053527832,0.04219794273376465,0.19396281242370605,0.18859505653381348,0.07686138153076172,0.9904115200042725,0.3719148635864258 +3,refs/heads/master,8182846c13c90ee486dbbe62bec51705e8fd3f83,8961063ccaebbcb71e3ea627ab90a8c25bcdd75b,be523bc4b471c78a89108bffc9c3f7bf88cdf69c,,True,True,c82ff8a978d8c2c2ffcda1ea65c82c082dfbf2206a8352126a7034eb8550cd02,Tests_passed,b8cbe942156d6c5c0d7d6015d59acfee188dc713b4f283f6fd03906c520f83ef,Tests_passed,True,True,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,0.040831804275512695,0.041558265686035156,0.05763840675354004,0.02368450164794922,0.05775141716003418,0.02333521842956543,0.05723166465759277,0.05316472053527832,0.04219794273376465,0.1876537799835205,0.1864454746246338,0.07686138153076172,0.9904115200042725,0.3719148635864258 diff --git a/results/greatest_hits/merges_timed/pedrovgs/algorithms.csv b/results/greatest_hits/merges_timed/pedrovgs/algorithms.csv index e3aa23b7c1..12e58a93ce 100644 --- a/results/greatest_hits/merges_timed/pedrovgs/algorithms.csv +++ b/results/greatest_hits/merges_timed/pedrovgs/algorithms.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,f19931ca02a3dea15a502859251c2361252bf79b80945ff12a235522b5421e4d,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,0.03966784477233887,0.045026302337646484,0.026703596115112305,0.030169010162353516,0.03470635414123535,0.014301300048828125,0.04409193992614746,0.2263469696044922,0.07664608955383301,0.15924620628356934,0.15944790840148926,0.16540098190307617,0.8052289485931396,0.18524503707885742 +19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,f19931ca02a3dea15a502859251c2361252bf79b80945ff12a235522b5421e4d,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,0.03966784477233887,0.045026302337646484,0.026703596115112305,0.030169010162353516,0.03470635414123535,0.014301300048828125,0.04409193992614746,0.2263469696044922,0.07664608955383301,0.15964102745056152,0.15875744819641113,0.16540098190307617,0.8052289485931396,0.18524503707885742 diff --git a/results/greatest_hits/merges_timed/pmd/pmd.csv b/results/greatest_hits/merges_timed/pmd/pmd.csv index 9221fb98eb..97f5828067 100644 --- a/results/greatest_hits/merges_timed/pmd/pmd.csv +++ b/results/greatest_hits/merges_timed/pmd/pmd.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -1042,refs/heads/master,15a82f0ddb19fe060331dc1ec56075fe4a4b871c,6dbcf77953e9ee91780d1aea3d90074daaf21126,1c08f946917a938669cfcf011e238dae028b3898,,22b63a86da4cfa6a87f4432125e0da5e71a8836aebaae855ae4f0488f6aadee5,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,Tests_passed,True,True,True,True,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,0.04955315589904785,0.04905509948730469,0.06485319137573242,0.06600189208984375,0.06580257415771484,0.06609106063842773,0.06555461883544922,0.1255786418914795,0.048784494400024414,0.18501830101013184,0.18534302711486816,0.1633446216583252,0.7231693267822266,2.482933282852173 +1042,refs/heads/master,15a82f0ddb19fe060331dc1ec56075fe4a4b871c,6dbcf77953e9ee91780d1aea3d90074daaf21126,1c08f946917a938669cfcf011e238dae028b3898,,22b63a86da4cfa6a87f4432125e0da5e71a8836aebaae855ae4f0488f6aadee5,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,Tests_passed,True,True,True,True,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,0.04955315589904785,0.04905509948730469,0.06485319137573242,0.06600189208984375,0.06580257415771484,0.06609106063842773,0.06555461883544922,0.1255786418914795,0.048784494400024414,0.18507122993469238,0.1855170726776123,0.1633446216583252,0.7231693267822266,2.482933282852173 diff --git a/results/greatest_hits/merges_timed/qihoo360/xlearning.csv b/results/greatest_hits/merges_timed/qihoo360/xlearning.csv index 8ea3e7ade0..6eee9a7848 100644 --- a/results/greatest_hits/merges_timed/qihoo360/xlearning.csv +++ b/results/greatest_hits/merges_timed/qihoo360/xlearning.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -5,refs/heads/master,93be0646a1cb67bbb6e1117f941151ba14fc7607,be65c5d4b8f92b368953b35409694935906ba113,a136019bb34dcd33c7317dd6a256f6d4ea0f0a19,,True,True,9d882f247fe89083eaa0c8a705148f46f059117e1a79faec1d8f31a54dc63357,Tests_passed,66f9ad3fe492a495ad660819ee85e059199a1717583f4e1160ff88de7131743a,Tests_passed,True,True,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,0.04380655288696289,0.04984688758850098,0.05139327049255371,0.04793262481689453,0.04714512825012207,0.04538917541503906,0.054291486740112305,0.16465163230895996,0.04244565963745117,0.19204974174499512,0.18924927711486816,0.12756013870239258,2.479236125946045,0.7491292953491211 +5,refs/heads/master,93be0646a1cb67bbb6e1117f941151ba14fc7607,be65c5d4b8f92b368953b35409694935906ba113,a136019bb34dcd33c7317dd6a256f6d4ea0f0a19,,True,True,9d882f247fe89083eaa0c8a705148f46f059117e1a79faec1d8f31a54dc63357,Tests_passed,66f9ad3fe492a495ad660819ee85e059199a1717583f4e1160ff88de7131743a,Tests_passed,True,True,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,0.04380655288696289,0.04984688758850098,0.05139327049255371,0.04793262481689453,0.04714512825012207,0.04538917541503906,0.054291486740112305,0.16465163230895996,0.04244565963745117,0.1871490478515625,0.1886758804321289,0.12756013870239258,2.479236125946045,0.7491292953491211 diff --git a/results/greatest_hits/merges_timed/qunarcorp/qmq.csv b/results/greatest_hits/merges_timed/qunarcorp/qmq.csv index 4f79f3d1b8..30a6ddeb1f 100644 --- a/results/greatest_hits/merges_timed/qunarcorp/qmq.csv +++ b/results/greatest_hits/merges_timed/qunarcorp/qmq.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -60,refs/remotes/origin/pull/110,6a8eb4126c66b523da574d008c077fb35426d9a8,6a39e0ac27afd06532a3b69cbc347138ed440eb0,4721e7b153c012f282b28728121a90f7aac9a341,,True,True,3b9c64e2680c301c5cad0abba71f38420f91096ca50eb4fff09b68d06b428981,Tests_passed,607691dcc4fc8e8c6c8ffdc73977be4d1f36fe6b6b9bf15dcf8a36fa75b95cc5,Tests_passed,True,True,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,6bf187bb1f9f17744328185f25a5af5102a0e5362f19eae8fcae9730e19962c0,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,5aceef0ed2efbfe027572fbdbcacedf5d89da544e783663ca059143615712a9e,Merge_failed,5aceef0ed2efbfe027572fbdbcacedf5d89da544e783663ca059143615712a9e,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Merge_failed,a60e221529b49e11ef8dd544d16c5d7051e7da6c973ff186d4f0b5408ba7629a,0.06831073760986328,0.0698542594909668,0.08614349365234375,0.08961105346679688,0.07843828201293945,0.08429408073425293,0.08479857444763184,0.15212368965148926,0.08537530899047852,0.11588907241821289,0.11492133140563965,0.1692051887512207,0.6770317554473877,1.4313361644744873 +60,refs/remotes/origin/pull/110,6a8eb4126c66b523da574d008c077fb35426d9a8,6a39e0ac27afd06532a3b69cbc347138ed440eb0,4721e7b153c012f282b28728121a90f7aac9a341,,True,True,3b9c64e2680c301c5cad0abba71f38420f91096ca50eb4fff09b68d06b428981,Tests_passed,607691dcc4fc8e8c6c8ffdc73977be4d1f36fe6b6b9bf15dcf8a36fa75b95cc5,Tests_passed,True,True,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,6bf187bb1f9f17744328185f25a5af5102a0e5362f19eae8fcae9730e19962c0,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,5aceef0ed2efbfe027572fbdbcacedf5d89da544e783663ca059143615712a9e,Merge_failed,5aceef0ed2efbfe027572fbdbcacedf5d89da544e783663ca059143615712a9e,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Merge_failed,a60e221529b49e11ef8dd544d16c5d7051e7da6c973ff186d4f0b5408ba7629a,0.06831073760986328,0.0698542594909668,0.08614349365234375,0.08961105346679688,0.07843828201293945,0.08429408073425293,0.08479857444763184,0.15212368965148926,0.08537530899047852,0.11521124839782715,0.11624932289123535,0.1692051887512207,0.6770317554473877,1.4313361644744873 diff --git a/results/greatest_hits/merges_timed/robotiumtech/robotium.csv b/results/greatest_hits/merges_timed/robotiumtech/robotium.csv index 43c851c85c..82cd72c315 100644 --- a/results/greatest_hits/merges_timed/robotiumtech/robotium.csv +++ b/results/greatest_hits/merges_timed/robotiumtech/robotium.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,Tests_passed,True,True,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,6b41cdeb2f07290f60395d6b8aabe6c7380b02a6461d4dfa939aeb6e8ce2c3d5,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,02e8a9bb52e99aa197cd0111321315747cd7f50c5d8913dae11c1020fb22bfc4,Merge_failed,02e8a9bb52e99aa197cd0111321315747cd7f50c5d8913dae11c1020fb22bfc4,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,0.03948783874511719,0.054152727127075195,0.048850297927856445,0.04844975471496582,0.05275583267211914,0.05498552322387695,0.03831171989440918,0.1726078987121582,0.08118772506713867,0.07767724990844727,0.07774686813354492,0.10677576065063477,0.9639925956726074,0.23319792747497559 +27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,Tests_passed,True,True,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,6b41cdeb2f07290f60395d6b8aabe6c7380b02a6461d4dfa939aeb6e8ce2c3d5,Merge_failed,c6098807756d2833254985bc7c19af80592ae4c341c73f5f67a9d5165a615083,Merge_failed,02e8a9bb52e99aa197cd0111321315747cd7f50c5d8913dae11c1020fb22bfc4,Merge_failed,02e8a9bb52e99aa197cd0111321315747cd7f50c5d8913dae11c1020fb22bfc4,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,0.03948783874511719,0.054152727127075195,0.048850297927856445,0.04844975471496582,0.05275583267211914,0.05498552322387695,0.03831171989440918,0.1726078987121582,0.08118772506713867,0.07740378379821777,0.07671022415161133,0.10677576065063477,0.9639925956726074,0.23319792747497559 diff --git a/results/greatest_hits/merges_timed/roncoo/roncoo-pay.csv b/results/greatest_hits/merges_timed/roncoo/roncoo-pay.csv index 130d3e139d..670cf26429 100644 --- a/results/greatest_hits/merges_timed/roncoo/roncoo-pay.csv +++ b/results/greatest_hits/merges_timed/roncoo/roncoo-pay.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/master,ccca546fb46e38dad6085df47dbdc9e1327b86f5,3a909a22c9890c12772b13c0901cfaff0b18cc2b,f87b86aa53ecb4dea693ec74ee5292738f8cef12,,True,True,cdea973b895ee16b3d17a0f23afbf7e75980a0d35130e587f8bc482850c9ae89,Tests_passed,89bbd7526f75f6c35a1cee28e626238852bfb36a160d5a9d91ac511df2dd16e8,Tests_passed,True,True,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,899f0846b2c126c4086fa651749eee1c261790deb3ce923bded29f1e9d3046f6,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,529abeb79e8ec77d686df61f3fad0670e7e91652ec44e062c29b0ec48232fe7d,Merge_failed,10fce70721bde1da7bbb8d9de882b6c9a53efd45c138fb654a300171b971d050,Merge_failed,10fce70721bde1da7bbb8d9de882b6c9a53efd45c138fb654a300171b971d050,Merge_failed,3849d8e6e347e6f8d1712cbee817135a0032cb74f75ec1ed8a7aa6f61a51d82b,Merge_failed,d79d57a4aaf4fef25f9768d76d4193a877e641dc67abb58457fc90d7cde61193,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,5d4f659de0d1da06263e72d1e3cfc8a627a2d4c3be796c5d2f5ba63aa674c518,Merge_failed,7c29102cad303c274d44d25a019ab49b77cc95f383e27a99306c3d4a2c7ae697,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,30bc0716eb5523b331cce8491d50d5e9ea7bdbe59f15a96366e7f4efe08636a3,Merge_failed,ff28d45460eb58be9d9dd54d40a82ceb5b01554cf23fe15ab3c11fc2b3bba30a,0.07822179794311523,0.07942938804626465,0.08997750282287598,0.100250244140625,0.09738993644714355,0.08235287666320801,0.08982300758361816,0.95804762840271,0.141829252243042,0.6737823486328125,0.6869494915008545,0.9595131874084473,3.383166790008545,1.820636510848999 +17,refs/heads/master,ccca546fb46e38dad6085df47dbdc9e1327b86f5,3a909a22c9890c12772b13c0901cfaff0b18cc2b,f87b86aa53ecb4dea693ec74ee5292738f8cef12,,True,True,cdea973b895ee16b3d17a0f23afbf7e75980a0d35130e587f8bc482850c9ae89,Tests_passed,89bbd7526f75f6c35a1cee28e626238852bfb36a160d5a9d91ac511df2dd16e8,Tests_passed,True,True,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,899f0846b2c126c4086fa651749eee1c261790deb3ce923bded29f1e9d3046f6,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,529abeb79e8ec77d686df61f3fad0670e7e91652ec44e062c29b0ec48232fe7d,Merge_failed,10fce70721bde1da7bbb8d9de882b6c9a53efd45c138fb654a300171b971d050,Merge_failed,10fce70721bde1da7bbb8d9de882b6c9a53efd45c138fb654a300171b971d050,Merge_failed,3849d8e6e347e6f8d1712cbee817135a0032cb74f75ec1ed8a7aa6f61a51d82b,Merge_failed,d79d57a4aaf4fef25f9768d76d4193a877e641dc67abb58457fc90d7cde61193,Merge_failed,8085f5fa1753bb2b72446c9e5c86e4e39c954da280555e8908bae32dbbdc81fc,Merge_failed,5d4f659de0d1da06263e72d1e3cfc8a627a2d4c3be796c5d2f5ba63aa674c518,Merge_failed,7c29102cad303c274d44d25a019ab49b77cc95f383e27a99306c3d4a2c7ae697,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,30bc0716eb5523b331cce8491d50d5e9ea7bdbe59f15a96366e7f4efe08636a3,Merge_failed,ff28d45460eb58be9d9dd54d40a82ceb5b01554cf23fe15ab3c11fc2b3bba30a,0.07822179794311523,0.07942938804626465,0.08997750282287598,0.100250244140625,0.09738993644714355,0.08235287666320801,0.08982300758361816,0.95804762840271,0.141829252243042,0.6766138076782227,0.6775050163269043,0.9595131874084473,3.383166790008545,1.820636510848999 diff --git a/results/greatest_hits/merges_timed/rubenlagus/telegrambots.csv b/results/greatest_hits/merges_timed/rubenlagus/telegrambots.csv index d35bfbdf37..b8619ba5eb 100644 --- a/results/greatest_hits/merges_timed/rubenlagus/telegrambots.csv +++ b/results/greatest_hits/merges_timed/rubenlagus/telegrambots.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -128,refs/heads/master,15fe637998d55ef567d4e499e948c9d183b99fb4,ef1bd09a6ae312da059076e82de2ffafd98f45e8,fc12de81c0ab1c076a974a4505a8eb48ab567290,,True,True,9e020980e01f698749561bf794806ac92be32dc608dd0a1da648123c1f9bf19a,Tests_passed,856f1c857d9252741c52b9ee99e1dfd2d0245bd15f640f73fbdc53fc75b35584,Tests_passed,True,True,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,6542d9032d5b7897ff29c730a604f9019df0fad43c7724f9a7089525b8e0ac04,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Tests_passed,409e0a5bbb5016109c0626869abbc20de1435bb052b5c3ea9b77b11f1ff1c1a1,Tests_passed,409e0a5bbb5016109c0626869abbc20de1435bb052b5c3ea9b77b11f1ff1c1a1,Merge_failed,0a856019c4d8c9f4ac65faf6fff261a9f7cb8cdfb8c7290101f7a562118a7ce8,Tests_failed,773883e34cf9868d904cab7d9bd74d75fc486df14a6b7af3ff5604c6c43ce30b,Merge_failed,6e59f1fdc4f915228c35b250be077d297700e9804c6978d5ba6b65793b6fc615,0.03579282760620117,0.05072498321533203,0.0315098762512207,0.04394698143005371,0.04407620429992676,0.04171252250671387,0.05278635025024414,0.3486945629119873,0.06067395210266113,0.662489652633667,0.6536605358123779,0.27482008934020996,4.423612117767334,0.30745792388916016 +128,refs/heads/master,15fe637998d55ef567d4e499e948c9d183b99fb4,ef1bd09a6ae312da059076e82de2ffafd98f45e8,fc12de81c0ab1c076a974a4505a8eb48ab567290,,True,True,9e020980e01f698749561bf794806ac92be32dc608dd0a1da648123c1f9bf19a,Tests_passed,856f1c857d9252741c52b9ee99e1dfd2d0245bd15f640f73fbdc53fc75b35584,Tests_passed,True,True,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,6542d9032d5b7897ff29c730a604f9019df0fad43c7724f9a7089525b8e0ac04,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Tests_passed,409e0a5bbb5016109c0626869abbc20de1435bb052b5c3ea9b77b11f1ff1c1a1,Tests_passed,409e0a5bbb5016109c0626869abbc20de1435bb052b5c3ea9b77b11f1ff1c1a1,Merge_failed,0a856019c4d8c9f4ac65faf6fff261a9f7cb8cdfb8c7290101f7a562118a7ce8,Tests_failed,773883e34cf9868d904cab7d9bd74d75fc486df14a6b7af3ff5604c6c43ce30b,Merge_failed,6e59f1fdc4f915228c35b250be077d297700e9804c6978d5ba6b65793b6fc615,0.03579282760620117,0.05072498321533203,0.0315098762512207,0.04394698143005371,0.04407620429992676,0.04171252250671387,0.05278635025024414,0.3486945629119873,0.06067395210266113,0.656463623046875,0.6471819877624512,0.27482008934020996,4.423612117767334,0.30745792388916016 diff --git a/results/greatest_hits/merges_timed/runelite/runelite.csv b/results/greatest_hits/merges_timed/runelite/runelite.csv index 5b011fb3b7..5d3323f057 100644 --- a/results/greatest_hits/merges_timed/runelite/runelite.csv +++ b/results/greatest_hits/merges_timed/runelite/runelite.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -661,refs/heads/master,6b475a74dba16b6dbae71c108df8f4be30384ca3,2835feea7037de3067f6a9ec59e798723d660cdb,91bc28a84ba1ad90c2429b1b61f4236ea929f8dd,,True,True,ad424b10eef70502998a953805b02ff10f3ecb06663bab544179cc3b6f1d61d8,Tests_passed,b8713a3e3dfae813b1bed11bc1595196d2fa18f5478863b29b533d0c585caa57,Tests_passed,True,True,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,0.06751799583435059,0.07097363471984863,0.09463286399841309,0.09535408020019531,0.09900164604187012,0.0975186824798584,0.09487247467041016,0.17764544486999512,0.0710456371307373,0.23256254196166992,0.23411965370178223,0.13149070739746094,1.758108139038086,2.153752088546753 +661,refs/heads/master,6b475a74dba16b6dbae71c108df8f4be30384ca3,2835feea7037de3067f6a9ec59e798723d660cdb,91bc28a84ba1ad90c2429b1b61f4236ea929f8dd,,True,True,ad424b10eef70502998a953805b02ff10f3ecb06663bab544179cc3b6f1d61d8,Tests_passed,b8713a3e3dfae813b1bed11bc1595196d2fa18f5478863b29b533d0c585caa57,Tests_passed,True,True,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,0.06751799583435059,0.07097363471984863,0.09463286399841309,0.09535408020019531,0.09900164604187012,0.0975186824798584,0.09487247467041016,0.17764544486999512,0.0710456371307373,0.23211407661437988,0.23731088638305664,0.13149070739746094,1.758108139038086,2.153752088546753 diff --git a/results/greatest_hits/merges_timed/scribejava/scribejava.csv b/results/greatest_hits/merges_timed/scribejava/scribejava.csv index 93e52e574d..3d88f43b4e 100644 --- a/results/greatest_hits/merges_timed/scribejava/scribejava.csv +++ b/results/greatest_hits/merges_timed/scribejava/scribejava.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,Tests_passed,True,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.03954148292541504,0.05458664894104004,0.031190156936645508,0.04810595512390137,0.06870579719543457,0.06032061576843262,0.06110382080078125,0.1753065586090088,0.04774165153503418,0.17472386360168457,0.17846345901489258,0.12111067771911621,1.0731663703918457,0.32602763175964355 +3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,Tests_passed,True,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_failed,532ac7a837c8a19bb7cc9313ea8f0371f60364fcca27001047fba5978fa19096,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.03954148292541504,0.05458664894104004,0.031190156936645508,0.04810595512390137,0.06870579719543457,0.06032061576843262,0.06110382080078125,0.1753065586090088,0.04774165153503418,0.1745896339416504,0.17476415634155273,0.12111067771911621,1.0731663703918457,0.32602763175964355 diff --git a/results/greatest_hits/merges_timed/shopizer-ecommerce/shopizer.csv b/results/greatest_hits/merges_timed/shopizer-ecommerce/shopizer.csv index 50ec5c1bf0..ae8ddbe032 100644 --- a/results/greatest_hits/merges_timed/shopizer-ecommerce/shopizer.csv +++ b/results/greatest_hits/merges_timed/shopizer-ecommerce/shopizer.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -2,refs/heads/main,50ecad795f23f1441823702df26fbe09f8c1add7,e0a1b61381f2f276974e534c54154c0ecd26d15c,6d6c78728d772176067e479445d86c8036928e95,,True,True,75576ca2229e0eda424168ae538fd25043f443ed8053407a217c5af63b2e5a4d,Tests_passed,f51524fa51d1546c5cd6e11ad45aca3a5520dcdb06cd0c9aed79c14e07956232,Tests_passed,True,True,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,72eab868eba9b44cb2c5a053d69ed7e5a2b7fe54fa3dd36bd222af37ca24d836,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,24a62b0b52c7d7d79e62bfec268910aab973faf7e8d05354d1a99b202dc0b615,Merge_failed,24a62b0b52c7d7d79e62bfec268910aab973faf7e8d05354d1a99b202dc0b615,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_failed,7cbc8781b6466df9abe10143587b8ca81f79db9757896dc33b06d7289250aa4a,0.05871248245239258,0.0506443977355957,0.06371355056762695,0.06975030899047852,0.07283139228820801,0.06819915771484375,0.05322694778442383,0.37462592124938965,0.28684496879577637,0.08057618141174316,0.08120369911193848,0.12846994400024414,1.1160502433776855,0.8740432262420654 +2,refs/heads/main,50ecad795f23f1441823702df26fbe09f8c1add7,e0a1b61381f2f276974e534c54154c0ecd26d15c,6d6c78728d772176067e479445d86c8036928e95,,True,True,75576ca2229e0eda424168ae538fd25043f443ed8053407a217c5af63b2e5a4d,Tests_passed,f51524fa51d1546c5cd6e11ad45aca3a5520dcdb06cd0c9aed79c14e07956232,Tests_passed,True,True,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,72eab868eba9b44cb2c5a053d69ed7e5a2b7fe54fa3dd36bd222af37ca24d836,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,24a62b0b52c7d7d79e62bfec268910aab973faf7e8d05354d1a99b202dc0b615,Merge_failed,24a62b0b52c7d7d79e62bfec268910aab973faf7e8d05354d1a99b202dc0b615,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_failed,7cbc8781b6466df9abe10143587b8ca81f79db9757896dc33b06d7289250aa4a,0.05871248245239258,0.0506443977355957,0.06371355056762695,0.06975030899047852,0.07283139228820801,0.06819915771484375,0.05322694778442383,0.37462592124938965,0.28684496879577637,0.07180237770080566,0.08153057098388672,0.12846994400024414,1.1160502433776855,0.8740432262420654 diff --git a/results/greatest_hits/merges_timed/soabase/exhibitor.csv b/results/greatest_hits/merges_timed/soabase/exhibitor.csv index 508a3aa6cf..1725ba4303 100644 --- a/results/greatest_hits/merges_timed/soabase/exhibitor.csv +++ b/results/greatest_hits/merges_timed/soabase/exhibitor.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -127,refs/remotes/origin/frontend-rework,78de708554f75c4e14dc12d8f6ac3f02ed567a26,3955ecd938deb974f1156e416720c1b7fac0401e,c2e2bab03d3aa986fd1b148454e977c8f5309c8c,,True,True,87fa2edc5f369d896512e0ee7321586dbbb281514b5e901ef27bcb7016f5bfdf,Tests_passed,9be6e41f3c3f2d82d470b385606d11204a4db37a387977e745f0d3bd299fd6f4,Tests_passed,True,True,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,cd258f2a2e6b374aabfd6d5fef9b85dec5858440f485e0a79270a9783f3f96c3,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,cd258f2a2e6b374aabfd6d5fef9b85dec5858440f485e0a79270a9783f3f96c3,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,f6e8f45305109cbd41122bb5be00400129f13934086ddb86535631749d6a69df,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,24fa839f51c5a0a150af5cadf54885b45adf1b61a35a4051ee9d3b99ee75e9a7,Merge_failed,3c7bbfa7248370b919e6c2415c09d08fe766fe2e8f9917e3f0ff00411a9410ce,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Merge_failed,2e783798293bf547d6c2d67b9eae9d87599372841cec13cb4b6b75d7028cbca9,0.06190800666809082,0.038482666015625,0.0528407096862793,0.052583932876586914,0.051085710525512695,0.020075321197509766,0.04843592643737793,0.3914914131164551,0.07147836685180664,0.3940718173980713,0.39437365531921387,0.3454859256744385,3.250204563140869,0.2783818244934082 +127,refs/remotes/origin/frontend-rework,78de708554f75c4e14dc12d8f6ac3f02ed567a26,3955ecd938deb974f1156e416720c1b7fac0401e,c2e2bab03d3aa986fd1b148454e977c8f5309c8c,,True,True,87fa2edc5f369d896512e0ee7321586dbbb281514b5e901ef27bcb7016f5bfdf,Tests_passed,9be6e41f3c3f2d82d470b385606d11204a4db37a387977e745f0d3bd299fd6f4,Tests_passed,True,True,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,cd258f2a2e6b374aabfd6d5fef9b85dec5858440f485e0a79270a9783f3f96c3,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,cd258f2a2e6b374aabfd6d5fef9b85dec5858440f485e0a79270a9783f3f96c3,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,f6e8f45305109cbd41122bb5be00400129f13934086ddb86535631749d6a69df,Merge_failed,0a3a25242954336f9b9137fa2c8537877f27b0feaec3c1a3d65b53b72c1a4b95,Merge_failed,24fa839f51c5a0a150af5cadf54885b45adf1b61a35a4051ee9d3b99ee75e9a7,Merge_failed,3c7bbfa7248370b919e6c2415c09d08fe766fe2e8f9917e3f0ff00411a9410ce,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Merge_failed,2e783798293bf547d6c2d67b9eae9d87599372841cec13cb4b6b75d7028cbca9,0.06190800666809082,0.038482666015625,0.0528407096862793,0.052583932876586914,0.051085710525512695,0.020075321197509766,0.04843592643737793,0.3914914131164551,0.07147836685180664,0.4006369113922119,0.3902740478515625,0.3454859256744385,3.250204563140869,0.2783818244934082 diff --git a/results/greatest_hits/merges_timed/sofastack/sofa-bolt.csv b/results/greatest_hits/merges_timed/sofastack/sofa-bolt.csv index e9b1727163..819d8bc9c8 100644 --- a/results/greatest_hits/merges_timed/sofastack/sofa-bolt.csv +++ b/results/greatest_hits/merges_timed/sofastack/sofa-bolt.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -88,refs/remotes/origin/pull/36,48c96584e07d2715f0346ea03a50e50c03b8787d,908263dbc59f0b854f1c751617bdab6aecb34693,06398729e98d1ac5779566dfd64be127c2745914,,bb5c48b1907e509e420cb177189be4ca8131ea37f739adc5acde3f4602192452,Tests_passed,e86ccd0fce2b7c392747b24b749acc01805ccfb60809db6d21419a6daa77e5d3,Tests_passed,True,True,True,True,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,c2e7d5a62eb388104c2fdf4c856623633d6b52a565b6a05b7ffb75b5c5b2fc70,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0e6061ef54baa69ef1946bcaaf9fb5cab25df1207fb539565b3687df41b7afbd,Merge_failed,0e6061ef54baa69ef1946bcaaf9fb5cab25df1207fb539565b3687df41b7afbd,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,c1b2c3cc0de3fd381797f11de552c20b563d05a0a4895a683a8d72b11b6bbf13,0.06525468826293945,0.05779147148132324,0.06747269630432129,0.08174467086791992,0.0697011947631836,0.06210970878601074,0.05730485916137695,0.7185218334197998,0.08726811408996582,1.2048735618591309,1.2108385562896729,0.5613417625427246,6.123358249664307,0.40825581550598145 +88,refs/remotes/origin/pull/36,48c96584e07d2715f0346ea03a50e50c03b8787d,908263dbc59f0b854f1c751617bdab6aecb34693,06398729e98d1ac5779566dfd64be127c2745914,,bb5c48b1907e509e420cb177189be4ca8131ea37f739adc5acde3f4602192452,Tests_passed,e86ccd0fce2b7c392747b24b749acc01805ccfb60809db6d21419a6daa77e5d3,Tests_passed,True,True,True,True,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,c2e7d5a62eb388104c2fdf4c856623633d6b52a565b6a05b7ffb75b5c5b2fc70,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0e6061ef54baa69ef1946bcaaf9fb5cab25df1207fb539565b3687df41b7afbd,Merge_failed,0e6061ef54baa69ef1946bcaaf9fb5cab25df1207fb539565b3687df41b7afbd,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,c1b2c3cc0de3fd381797f11de552c20b563d05a0a4895a683a8d72b11b6bbf13,0.06525468826293945,0.05779147148132324,0.06747269630432129,0.08174467086791992,0.0697011947631836,0.06210970878601074,0.05730485916137695,0.7185218334197998,0.08726811408996582,1.1939387321472168,1.1912357807159424,0.5613417625427246,6.123358249664307,0.40825581550598145 diff --git a/results/greatest_hits/merges_timed/spotify/apollo.csv b/results/greatest_hits/merges_timed/spotify/apollo.csv index 4101164409..b1e3c55c9c 100644 --- a/results/greatest_hits/merges_timed/spotify/apollo.csv +++ b/results/greatest_hits/merges_timed/spotify/apollo.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -146,refs/heads/1.x,2fa878096eab6deaff1ea76fb125b0532bfd0eaa,44e3d9262d51874823f42ebd330599fb726a2627,54334ee2535a264d5994f3179ed89a576607e198,,True,True,3f2a34bb6f04d0802bec4291f7d94903105bcff640e0943d077223995ada3c80,Tests_passed,74ac13685abdc49322bb19abdfe0b21244c51647d4678e66d100b73186c04721,Tests_passed,True,True,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,0.06300663948059082,0.07809996604919434,0.046755075454711914,0.07096982002258301,0.0643620491027832,0.06816935539245605,0.07728242874145508,0.3040618896484375,0.031987905502319336,0.44571352005004883,0.44422411918640137,0.2470555305480957,1.6079597473144531,0.4427609443664551 +146,refs/heads/1.x,2fa878096eab6deaff1ea76fb125b0532bfd0eaa,44e3d9262d51874823f42ebd330599fb726a2627,54334ee2535a264d5994f3179ed89a576607e198,,True,True,3f2a34bb6f04d0802bec4291f7d94903105bcff640e0943d077223995ada3c80,Tests_passed,74ac13685abdc49322bb19abdfe0b21244c51647d4678e66d100b73186c04721,Tests_passed,True,True,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,0.06300663948059082,0.07809996604919434,0.046755075454711914,0.07096982002258301,0.0643620491027832,0.06816935539245605,0.07728242874145508,0.3040618896484375,0.031987905502319336,0.4386420249938965,0.439511775970459,0.2470555305480957,1.6079597473144531,0.4427609443664551 diff --git a/results/greatest_hits/merges_timed/spotify/dockerfile-maven.csv b/results/greatest_hits/merges_timed/spotify/dockerfile-maven.csv index 48472f42e7..e9a0c0e4ba 100644 --- a/results/greatest_hits/merges_timed/spotify/dockerfile-maven.csv +++ b/results/greatest_hits/merges_timed/spotify/dockerfile-maven.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -58,refs/remotes/origin/pull/59,e37bb5427d990c2dfc7aecd1e27b211b7f5a741c,b6070ff108f62ec925668b427f24e250e46cbaa9,ab2ff6ea5e9aa0e534b77d0bd9522da91ef9ad54,,True,True,726e6c0ff2eeda71db26fee3e309082b5906fbcebd132d65e2dc96ea23be5422,Tests_passed,76b95ce9a695abd1a80bb7b7c9c1ab677654c51343784aa09e7cd984150906c6,Tests_passed,True,True,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,0.04335927963256836,0.0442354679107666,0.04241204261779785,0.048003435134887695,0.04336905479431152,0.04075121879577637,0.04299187660217285,0.15304279327392578,0.04386425018310547,0.16137909889221191,0.16126680374145508,0.1180882453918457,0.7774229049682617,0.19003772735595703 +58,refs/remotes/origin/pull/59,e37bb5427d990c2dfc7aecd1e27b211b7f5a741c,b6070ff108f62ec925668b427f24e250e46cbaa9,ab2ff6ea5e9aa0e534b77d0bd9522da91ef9ad54,,True,True,726e6c0ff2eeda71db26fee3e309082b5906fbcebd132d65e2dc96ea23be5422,Tests_passed,76b95ce9a695abd1a80bb7b7c9c1ab677654c51343784aa09e7cd984150906c6,Tests_passed,True,True,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,0.04335927963256836,0.0442354679107666,0.04241204261779785,0.048003435134887695,0.04336905479431152,0.04075121879577637,0.04299187660217285,0.15304279327392578,0.04386425018310547,0.15906572341918945,0.15896892547607422,0.1180882453918457,0.7774229049682617,0.19003772735595703 diff --git a/results/greatest_hits/merges_timed/spring-projects/spring-data-elasticsearch.csv b/results/greatest_hits/merges_timed/spring-projects/spring-data-elasticsearch.csv index 01885d8853..7eb8163509 100644 --- a/results/greatest_hits/merges_timed/spring-projects/spring-data-elasticsearch.csv +++ b/results/greatest_hits/merges_timed/spring-projects/spring-data-elasticsearch.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/main,923273955bba5524f566cc1df06955738772221f,7853e3da717c0e7316605796f3af7c888bde93b0,8b4da081eb68254dc4a12cdfa4fd68acc3623c4f,,0443b75acf5777a405f26f63cb6b91a3ec813c41afcfd67e4f12f00da7cf71ef,Tests_passed,fab8e5e895425947f043e9c8ca6ba4bc13b8bed4b4379ee6bcac33f28a24edf8,Tests_passed,True,True,True,True,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,0.06298828125,0.0325016975402832,0.043036699295043945,0.0440523624420166,0.047220468521118164,0.03683328628540039,0.045871734619140625,0.14998269081115723,0.04068470001220703,0.1687629222869873,0.16765093803405762,0.08961963653564453,1.1124932765960693,0.2716844081878662 +17,refs/heads/main,923273955bba5524f566cc1df06955738772221f,7853e3da717c0e7316605796f3af7c888bde93b0,8b4da081eb68254dc4a12cdfa4fd68acc3623c4f,,0443b75acf5777a405f26f63cb6b91a3ec813c41afcfd67e4f12f00da7cf71ef,Tests_passed,fab8e5e895425947f043e9c8ca6ba4bc13b8bed4b4379ee6bcac33f28a24edf8,Tests_passed,True,True,True,True,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,0.06298828125,0.0325016975402832,0.043036699295043945,0.0440523624420166,0.047220468521118164,0.03683328628540039,0.045871734619140625,0.14998269081115723,0.04068470001220703,0.16681790351867676,0.16771364212036133,0.08961963653564453,1.1124932765960693,0.2716844081878662 diff --git a/results/greatest_hits/merges_timed/square/javapoet.csv b/results/greatest_hits/merges_timed/square/javapoet.csv index 7a1ffdf8f2..276e9200aa 100644 --- a/results/greatest_hits/merges_timed/square/javapoet.csv +++ b/results/greatest_hits/merges_timed/square/javapoet.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -393,refs/remotes/origin/pull/681,51a233ea132edf4d94c9b88a2dc6d4ce6e673953,23210ddf289ad3d5b9ddf22b016c32c7c9a577da,e9460b84fc41464c2aa2ef85c84dd1ac87ae1692,,True,True,e2e6681ffed01a198e0202a4622d74974dbb14499d3016111d36086671b9be1c,Tests_passed,48202a6ffdeddbfd6fce3b795943220c15ad35c63b5be60cbfb590bb2121b9a7,Tests_passed,True,True,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,d2fb2021d8f7c27ba9dbeb04c8403a964fa297630b9e799f7309486af908ccdd,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Merge_failed,e58f9421b970facb202f03992c6cf1af2deb94ee13fcd2416e007c9840613b95,Tests_passed,4265762ca47b106693710521108d246822d5344a5b9dbc9c39e39e511bce8c81,Merge_failed,ff1340e865b260488d30ef78e9e636fde111ef23eebdff77da3814ee059aed8c,0.04164004325866699,0.03193950653076172,0.04573655128479004,0.048374176025390625,0.0348658561706543,0.0527338981628418,0.04807615280151367,0.17081522941589355,0.08014941215515137,0.15935969352722168,0.15860486030578613,0.11350131034851074,0.9764175415039062,0.23201894760131836 +393,refs/remotes/origin/pull/681,51a233ea132edf4d94c9b88a2dc6d4ce6e673953,23210ddf289ad3d5b9ddf22b016c32c7c9a577da,e9460b84fc41464c2aa2ef85c84dd1ac87ae1692,,True,True,e2e6681ffed01a198e0202a4622d74974dbb14499d3016111d36086671b9be1c,Tests_passed,48202a6ffdeddbfd6fce3b795943220c15ad35c63b5be60cbfb590bb2121b9a7,Tests_passed,True,True,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,d2fb2021d8f7c27ba9dbeb04c8403a964fa297630b9e799f7309486af908ccdd,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Merge_failed,e58f9421b970facb202f03992c6cf1af2deb94ee13fcd2416e007c9840613b95,Tests_passed,4265762ca47b106693710521108d246822d5344a5b9dbc9c39e39e511bce8c81,Merge_failed,ff1340e865b260488d30ef78e9e636fde111ef23eebdff77da3814ee059aed8c,0.04164004325866699,0.03193950653076172,0.04573655128479004,0.048374176025390625,0.0348658561706543,0.0527338981628418,0.04807615280151367,0.17081522941589355,0.08014941215515137,0.159559965133667,0.16035246849060059,0.11350131034851074,0.9764175415039062,0.23201894760131836 diff --git a/results/greatest_hits/merges_timed/swagger-api/swagger-codegen.csv b/results/greatest_hits/merges_timed/swagger-api/swagger-codegen.csv index 7786480ccb..410801482b 100644 --- a/results/greatest_hits/merges_timed/swagger-api/swagger-codegen.csv +++ b/results/greatest_hits/merges_timed/swagger-api/swagger-codegen.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -466,refs/heads/master,4a3d9358eed45dde1ca5541526b224466b65177b,75bd838d23b44e842c3873ebc39d180ed304e6b1,cff573f3ddb38d35053d648a921b4517719abf35,,True,True,6f36a44c98caf3f8f191fd46208cfa0ba9ea5d5b4141180def3ea94e2c9599a3,Tests_passed,116184c2153309ed2b8e7382e7e2251bdd4f6f083a53e52cf0e39a9386481316,Tests_passed,True,True,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,abdcda207648f20ec1f55b4a3a9411b0a38251b538222fa566c5769329875966,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,ebd3b6b8a305d023c57776ca630a31745b9cfb22b9099a693bfbe917af779f98,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,0.11798787117004395,0.1209554672241211,0.19637155532836914,0.20195722579956055,0.19887614250183105,0.19826650619506836,0.20042657852172852,0.2284870147705078,0.10812258720397949,0.2549271583557129,0.2549450397491455,0.17418527603149414,0.8080813884735107,3.2460575103759766 +466,refs/heads/master,4a3d9358eed45dde1ca5541526b224466b65177b,75bd838d23b44e842c3873ebc39d180ed304e6b1,cff573f3ddb38d35053d648a921b4517719abf35,,True,True,6f36a44c98caf3f8f191fd46208cfa0ba9ea5d5b4141180def3ea94e2c9599a3,Tests_passed,116184c2153309ed2b8e7382e7e2251bdd4f6f083a53e52cf0e39a9386481316,Tests_passed,True,True,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,abdcda207648f20ec1f55b4a3a9411b0a38251b538222fa566c5769329875966,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,ebd3b6b8a305d023c57776ca630a31745b9cfb22b9099a693bfbe917af779f98,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,0.11798787117004395,0.1209554672241211,0.19637155532836914,0.20195722579956055,0.19887614250183105,0.19826650619506836,0.20042657852172852,0.2284870147705078,0.10812258720397949,0.25600624084472656,0.25288820266723633,0.17418527603149414,0.8080813884735107,3.2460575103759766 diff --git a/results/greatest_hits/merges_timed/thealgorithms/java.csv b/results/greatest_hits/merges_timed/thealgorithms/java.csv index 580e180cc4..2bd71f02bb 100644 --- a/results/greatest_hits/merges_timed/thealgorithms/java.csv +++ b/results/greatest_hits/merges_timed/thealgorithms/java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -884,refs/remotes/origin/pull/2983,1b5ed154bb8206cfbd6a59ee61affc5f8b12866a,583ceabde1cee7050a9e04683aa0b741c648ede2,7d5de041ebeea76cea257b03d5bd792adeb27b4e,,True,True,52f77ccd11e915fb96ec90edd7500bfd907394eccb0cb0fd872a3fa020563072,Tests_passed,c5c363c3cb50bfc106182f59b9061d3d85f68aecdc065462b38042030377599f,Tests_passed,True,True,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,2ad62f9843f992482061f6a245a76a8ad90a8de64a4a1ffc7136df7509aed821,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,a7f650d7ae422c2b309c9b942f248be7d403a1f75fa78a1a61a93fab4c1c83a3,Merge_failed,a7f650d7ae422c2b309c9b942f248be7d403a1f75fa78a1a61a93fab4c1c83a3,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,1ea451368f60577b6918cb575912f1fc7de0f4040ed1117ff362db1d8533447a,0.04273271560668945,0.015909194946289062,0.04032754898071289,0.03788328170776367,0.03939199447631836,0.03731226921081543,0.0488436222076416,0.23323750495910645,0.12015056610107422,0.0749044418334961,0.08478355407714844,0.11980676651000977,0.752741813659668,0.3952362537384033 +884,refs/remotes/origin/pull/2983,1b5ed154bb8206cfbd6a59ee61affc5f8b12866a,583ceabde1cee7050a9e04683aa0b741c648ede2,7d5de041ebeea76cea257b03d5bd792adeb27b4e,,True,True,52f77ccd11e915fb96ec90edd7500bfd907394eccb0cb0fd872a3fa020563072,Tests_passed,c5c363c3cb50bfc106182f59b9061d3d85f68aecdc065462b38042030377599f,Tests_passed,True,True,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,2ad62f9843f992482061f6a245a76a8ad90a8de64a4a1ffc7136df7509aed821,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,a7f650d7ae422c2b309c9b942f248be7d403a1f75fa78a1a61a93fab4c1c83a3,Merge_failed,a7f650d7ae422c2b309c9b942f248be7d403a1f75fa78a1a61a93fab4c1c83a3,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,1ea451368f60577b6918cb575912f1fc7de0f4040ed1117ff362db1d8533447a,0.04273271560668945,0.015909194946289062,0.04032754898071289,0.03788328170776367,0.03939199447631836,0.03731226921081543,0.0488436222076416,0.23323750495910645,0.12015056610107422,0.0752873420715332,0.06544637680053711,0.11980676651000977,0.752741813659668,0.3952362537384033 diff --git a/results/greatest_hits/merges_timed/thinkgem/jeesite.csv b/results/greatest_hits/merges_timed/thinkgem/jeesite.csv index e9cfc1bc8b..9e09c2896a 100644 --- a/results/greatest_hits/merges_timed/thinkgem/jeesite.csv +++ b/results/greatest_hits/merges_timed/thinkgem/jeesite.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -74,refs/heads/master,618aafef63176f57f1b37ce8ed27900defad488d,e899db71e9da23b3387f7cc499cdae35eef8092d,42b86512b01066f6f3820ce319d00c00b9ca6900,,True,True,31c68b2105e95fa976964408cb53292866dc6639a59700b4f4b5208e5a046e6e,Tests_passed,b15ce129447eb73ea54b1b6306ad9c1db10124b2c1e336d34e94219a5ef2b6b4,Tests_passed,True,True,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,8c86d03b2f7394761159028cd9072804f81fa60b32c0940864e408898950b37f,Merge_failed,c56af07c32e076764e6d18382ce5e80b5c3e03daf4419a68d733749639b90249,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,7933b74af6845fc779dc4e6168cbb49882f7b0d7d1c34abb57248727dc7eaa41,Merge_failed,7933b74af6845fc779dc4e6168cbb49882f7b0d7d1c34abb57248727dc7eaa41,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,c787b7fa919d5f9e0e99de02712ceb9064dacca4ac29baf97eba6b1afd33c7aa,0.03728294372558594,0.0598902702331543,0.06261682510375977,0.05206036567687988,0.06624245643615723,0.05527758598327637,0.0629739761352539,0.19293904304504395,0.10345196723937988,0.08099985122680664,0.0813298225402832,0.13468718528747559,1.0537712574005127,0.35123276710510254 +74,refs/heads/master,618aafef63176f57f1b37ce8ed27900defad488d,e899db71e9da23b3387f7cc499cdae35eef8092d,42b86512b01066f6f3820ce319d00c00b9ca6900,,True,True,31c68b2105e95fa976964408cb53292866dc6639a59700b4f4b5208e5a046e6e,Tests_passed,b15ce129447eb73ea54b1b6306ad9c1db10124b2c1e336d34e94219a5ef2b6b4,Tests_passed,True,True,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,8c86d03b2f7394761159028cd9072804f81fa60b32c0940864e408898950b37f,Merge_failed,c56af07c32e076764e6d18382ce5e80b5c3e03daf4419a68d733749639b90249,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,7933b74af6845fc779dc4e6168cbb49882f7b0d7d1c34abb57248727dc7eaa41,Merge_failed,7933b74af6845fc779dc4e6168cbb49882f7b0d7d1c34abb57248727dc7eaa41,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,c787b7fa919d5f9e0e99de02712ceb9064dacca4ac29baf97eba6b1afd33c7aa,0.03728294372558594,0.0598902702331543,0.06261682510375977,0.05206036567687988,0.06624245643615723,0.05527758598327637,0.0629739761352539,0.19293904304504395,0.10345196723937988,0.08127832412719727,0.0814201831817627,0.13468718528747559,1.0537712574005127,0.35123276710510254 diff --git a/results/greatest_hits/merges_timed/tipsy/javalin.csv b/results/greatest_hits/merges_timed/tipsy/javalin.csv index 36552da923..2f60d2b6de 100644 --- a/results/greatest_hits/merges_timed/tipsy/javalin.csv +++ b/results/greatest_hits/merges_timed/tipsy/javalin.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -101,refs/remotes/origin/pull/2020,60530d20dd09c78de5831f0e9dace00d67c65df9,cedc91760eb796e72d5e45146e47633fecbfbae2,1fd96f8402b32ae8a80cb7e9e94c3245424cdca5,,True,True,e7a74f7077564b0463257b4dfdc8640567c00724b05d672dfdc5a5bd692519b1,Tests_passed,159e39dfe631d3dd32e3162fb2ae916ff95e2750ce5cb37da62f92f9ab9f0e13,Tests_passed,True,True,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,c841eceb977856ad00896a9e2d957f120c22ce2950d4b81b9fb60a62d786c1d5,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Merge_failed,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,a209323091224cf3a2a22f308de3a41958dfa3ffb03aa564b94143acce7d6bb6,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,0.05678844451904297,0.04638075828552246,0.06685876846313477,0.042023658752441406,0.03247499465942383,0.06253623962402344,0.05232119560241699,0.3135712146759033,0.07790422439575195,0.1806166172027588,0.16504549980163574,0.2360239028930664,0.6348621845245361,0.25212597846984863 +101,refs/remotes/origin/pull/2020,60530d20dd09c78de5831f0e9dace00d67c65df9,cedc91760eb796e72d5e45146e47633fecbfbae2,1fd96f8402b32ae8a80cb7e9e94c3245424cdca5,,True,True,e7a74f7077564b0463257b4dfdc8640567c00724b05d672dfdc5a5bd692519b1,Tests_passed,159e39dfe631d3dd32e3162fb2ae916ff95e2750ce5cb37da62f92f9ab9f0e13,Tests_passed,True,True,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,c841eceb977856ad00896a9e2d957f120c22ce2950d4b81b9fb60a62d786c1d5,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Merge_failed,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,a209323091224cf3a2a22f308de3a41958dfa3ffb03aa564b94143acce7d6bb6,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,0.05678844451904297,0.04638075828552246,0.06685876846313477,0.042023658752441406,0.03247499465942383,0.06253623962402344,0.05232119560241699,0.3135712146759033,0.07790422439575195,0.16883015632629395,0.1619410514831543,0.2360239028930664,0.6348621845245361,0.25212597846984863 diff --git a/results/greatest_hits/merges_timed/vdurmont/emoji-java.csv b/results/greatest_hits/merges_timed/vdurmont/emoji-java.csv index f5fe4f2973..111dbc2152 100644 --- a/results/greatest_hits/merges_timed/vdurmont/emoji-java.csv +++ b/results/greatest_hits/merges_timed/vdurmont/emoji-java.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -10,refs/remotes/origin/pull/120,d8952758be36cca3d760dc922f17b9a135edaa64,15bf60c80feff7bb26a864994f6fbd388070efa3,1f265481de513c1ee1cc744c4d9c18627014cee1,,True,True,78c6cae5752349d535258efafca720a21ae37ef2f932a31304951d24812ce1bb,Tests_passed,f72a2e1e109897ef270ea21c143791aad14d1128d73b8769deadf0117c649750,Tests_passed,True,True,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,51ebf42a2f8d9d37091a6725527b15bf7c8a78aff4b2706afc1e5806a503a638,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,ca833d6a6a8637cab6a18807b82fc6c98b50242c5260f23f6451b3b53fb2f3f4,Merge_failed,ca833d6a6a8637cab6a18807b82fc6c98b50242c5260f23f6451b3b53fb2f3f4,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Merge_failed,8858bcb81a5e757fe4738d3d64d53a9dbd8ec84ef666101aacb751ed57eea75a,0.05758333206176758,0.054793357849121094,0.0549626350402832,0.05405545234680176,0.04608583450317383,0.04279947280883789,0.03378176689147949,0.24564146995544434,0.07859492301940918,0.08221793174743652,0.08101963996887207,0.18066668510437012,0.6428718566894531,0.19476556777954102 +10,refs/remotes/origin/pull/120,d8952758be36cca3d760dc922f17b9a135edaa64,15bf60c80feff7bb26a864994f6fbd388070efa3,1f265481de513c1ee1cc744c4d9c18627014cee1,,True,True,78c6cae5752349d535258efafca720a21ae37ef2f932a31304951d24812ce1bb,Tests_passed,f72a2e1e109897ef270ea21c143791aad14d1128d73b8769deadf0117c649750,Tests_passed,True,True,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,51ebf42a2f8d9d37091a6725527b15bf7c8a78aff4b2706afc1e5806a503a638,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,ca833d6a6a8637cab6a18807b82fc6c98b50242c5260f23f6451b3b53fb2f3f4,Merge_failed,ca833d6a6a8637cab6a18807b82fc6c98b50242c5260f23f6451b3b53fb2f3f4,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Merge_failed,8858bcb81a5e757fe4738d3d64d53a9dbd8ec84ef666101aacb751ed57eea75a,0.05758333206176758,0.054793357849121094,0.0549626350402832,0.05405545234680176,0.04608583450317383,0.04279947280883789,0.03378176689147949,0.24564146995544434,0.07859492301940918,0.08157730102539062,0.08267760276794434,0.18066668510437012,0.6428718566894531,0.19476556777954102 diff --git a/results/greatest_hits/merges_timed/verbalexpressions/javaverbalexpressions.csv b/results/greatest_hits/merges_timed/verbalexpressions/javaverbalexpressions.csv index 55d84ca067..43f4d57f5a 100644 --- a/results/greatest_hits/merges_timed/verbalexpressions/javaverbalexpressions.csv +++ b/results/greatest_hits/merges_timed/verbalexpressions/javaverbalexpressions.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -13,refs/heads/master,59fbccd1d6d4eaef4343585610ec225ed81553e0,8d5949499c77ff1a053375bbd66811ddadc8a93f,0003de4e181872c704994faacdd48c32eda9f183,,True,True,315b55d9ba6f864b27687a6c39065a2b2127b82b49372cffe13bfe22a1f49567,Tests_passed,36a3d5e39aad10a29421fbe238c632eeaa3ee69dfe6ac9d6926f3efa2c385dc5,Tests_passed,True,True,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,0.04606914520263672,0.044884681701660156,0.044451236724853516,0.0402071475982666,0.04472708702087402,0.04655933380126953,0.04401350021362305,0.28654050827026367,0.04399824142456055,0.44864630699157715,0.4500422477722168,0.21962833404541016,2.4249777793884277,0.18673181533813477 +13,refs/heads/master,59fbccd1d6d4eaef4343585610ec225ed81553e0,8d5949499c77ff1a053375bbd66811ddadc8a93f,0003de4e181872c704994faacdd48c32eda9f183,,True,True,315b55d9ba6f864b27687a6c39065a2b2127b82b49372cffe13bfe22a1f49567,Tests_passed,36a3d5e39aad10a29421fbe238c632eeaa3ee69dfe6ac9d6926f3efa2c385dc5,Tests_passed,True,True,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,0.04606914520263672,0.044884681701660156,0.044451236724853516,0.0402071475982666,0.04472708702087402,0.04655933380126953,0.04401350021362305,0.28654050827026367,0.04399824142456055,0.44330716133117676,0.444995641708374,0.21962833404541016,2.4249777793884277,0.18673181533813477 diff --git a/results/greatest_hits/merges_timed/vipshop/saturn.csv b/results/greatest_hits/merges_timed/vipshop/saturn.csv index 426f486f3c..3c68043f59 100644 --- a/results/greatest_hits/merges_timed/vipshop/saturn.csv +++ b/results/greatest_hits/merges_timed/vipshop/saturn.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -17,refs/heads/develop,95c49b595d04b1ee4ab283c7343848df7e9addc9,5cbade739601574332622484945fc1a5f9848465,bf6445a36b7ff34335f42a961d1dd7a97c159711,,True,True,5890adc72858c4b82dcdd741de4233355be12185dea28cecaf9a1452792a60ec,Tests_passed,ca62ca1379b3f2fb4720a42bb109753516ec2c001b060668ffed375ac026a120,Tests_passed,True,True,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,0.07315945625305176,0.06657218933105469,0.07694482803344727,0.06779861450195312,0.05364632606506348,0.048409223556518555,0.07526493072509766,0.19193506240844727,0.04662895202636719,0.17983102798461914,0.1768970489501953,0.11674165725708008,1.4250233173370361,0.3868832588195801 +17,refs/heads/develop,95c49b595d04b1ee4ab283c7343848df7e9addc9,5cbade739601574332622484945fc1a5f9848465,bf6445a36b7ff34335f42a961d1dd7a97c159711,,True,True,5890adc72858c4b82dcdd741de4233355be12185dea28cecaf9a1452792a60ec,Tests_passed,ca62ca1379b3f2fb4720a42bb109753516ec2c001b060668ffed375ac026a120,Tests_passed,True,True,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,0.07315945625305176,0.06657218933105469,0.07694482803344727,0.06779861450195312,0.05364632606506348,0.048409223556518555,0.07526493072509766,0.19193506240844727,0.04662895202636719,0.17653131484985352,0.17246222496032715,0.11674165725708008,1.4250233173370361,0.3868832588195801 diff --git a/results/greatest_hits/merges_timed/wakaleo/game-of-life.csv b/results/greatest_hits/merges_timed/wakaleo/game-of-life.csv index 4da9e4e241..0934e1e9a8 100644 --- a/results/greatest_hits/merges_timed/wakaleo/game-of-life.csv +++ b/results/greatest_hits/merges_timed/wakaleo/game-of-life.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,True,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,Tests_passed,True,True,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,0.058582305908203125,0.050942182540893555,0.05884504318237305,0.06287312507629395,0.04906654357910156,0.06416487693786621,0.0633401870727539,0.18934416770935059,0.05824422836303711,0.15970420837402344,0.159987211227417,0.13115763664245605,0.6045498847961426,0.3135826587677002 +146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,True,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,Tests_passed,True,True,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,0.058582305908203125,0.050942182540893555,0.05884504318237305,0.06287312507629395,0.04906654357910156,0.06416487693786621,0.0633401870727539,0.18934416770935059,0.05824422836303711,0.15863704681396484,0.1580982208251953,0.13115763664245605,0.6045498847961426,0.3135826587677002 diff --git a/results/greatest_hits/merges_timed/wildfirechat/server.csv b/results/greatest_hits/merges_timed/wildfirechat/server.csv index 8abe0175f4..071c91a145 100644 --- a/results/greatest_hits/merges_timed/wildfirechat/server.csv +++ b/results/greatest_hits/merges_timed/wildfirechat/server.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -14,refs/heads/wildfirechat,b4b736c0c4bb6cd344dd9a659364030aa7dc17fa,c4e8c5811c189be2d0c1eabaf6022aefd49e58bd,804b2fc610bb048c05097cf714f4577d64c83bf2,,c68c12abe918e65aead45ea1c7291c88fd1d757d0ea1bdc726e22faeb04b0b36,Tests_passed,a3cd98d9492cab858ab0bf8d310c4f05dea84e175fbe12c0c348622ac2cec037,Tests_passed,True,True,True,True,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_passed,1e47bacdbc503c75372453e519e46fee6fd3b60c19d6c9433a782b46daf66f7c,Tests_passed,1e47bacdbc503c75372453e519e46fee6fd3b60c19d6c9433a782b46daf66f7c,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,0.04774594306945801,0.05331110954284668,0.05517220497131348,0.042325496673583984,0.05661821365356445,0.0507044792175293,0.05615973472595215,0.13201403617858887,0.04528498649597168,0.2254490852355957,0.2295365333557129,0.11960005760192871,0.04873180389404297,0.24543046951293945 +14,refs/heads/wildfirechat,b4b736c0c4bb6cd344dd9a659364030aa7dc17fa,c4e8c5811c189be2d0c1eabaf6022aefd49e58bd,804b2fc610bb048c05097cf714f4577d64c83bf2,,c68c12abe918e65aead45ea1c7291c88fd1d757d0ea1bdc726e22faeb04b0b36,Tests_passed,a3cd98d9492cab858ab0bf8d310c4f05dea84e175fbe12c0c348622ac2cec037,Tests_passed,True,True,True,True,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_passed,1e47bacdbc503c75372453e519e46fee6fd3b60c19d6c9433a782b46daf66f7c,Tests_passed,1e47bacdbc503c75372453e519e46fee6fd3b60c19d6c9433a782b46daf66f7c,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,0.04774594306945801,0.05331110954284668,0.05517220497131348,0.042325496673583984,0.05661821365356445,0.0507044792175293,0.05615973472595215,0.13201403617858887,0.04528498649597168,0.21743059158325195,0.2136220932006836,0.11960005760192871,0.04873180389404297,0.24543046951293945 diff --git a/results/greatest_hits/merges_timed/wizzercn/nutzwk.csv b/results/greatest_hits/merges_timed/wizzercn/nutzwk.csv index a488b5e008..78c1e7be65 100644 --- a/results/greatest_hits/merges_timed/wizzercn/nutzwk.csv +++ b/results/greatest_hits/merges_timed/wizzercn/nutzwk.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -6,refs/heads/v5.x-mini,b1b9adb2fd7d22f5e8146fce67dcaa2edf80e0fb,12c3b8678ed5b2ddb4d9deb8e280bcaa63ff8f62,d2d39ce76bd825d806a093bb8e3d020d17a840b4,,True,True,c0680e940eeaac43d62727eb2016dc35b49b8dda6a1092ee1d77c9e55e6a8d57,Tests_passed,9c40d78a349d5157b3929e4f7230d086c9b63bb044cf586cf062d1128397d2e3,Tests_passed,True,True,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,0.05518007278442383,0.05664253234863281,0.07776689529418945,0.04841732978820801,0.0557863712310791,0.07007169723510742,0.06670022010803223,0.21561098098754883,0.05218338966369629,0.15816497802734375,0.15806078910827637,0.12298583984375,0.5718934535980225,0.4128408432006836 +6,refs/heads/v5.x-mini,b1b9adb2fd7d22f5e8146fce67dcaa2edf80e0fb,12c3b8678ed5b2ddb4d9deb8e280bcaa63ff8f62,d2d39ce76bd825d806a093bb8e3d020d17a840b4,,True,True,c0680e940eeaac43d62727eb2016dc35b49b8dda6a1092ee1d77c9e55e6a8d57,Tests_passed,9c40d78a349d5157b3929e4f7230d086c9b63bb044cf586cf062d1128397d2e3,Tests_passed,True,True,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,0.05518007278442383,0.05664253234863281,0.07776689529418945,0.04841732978820801,0.0557863712310791,0.07007169723510742,0.06670022010803223,0.21561098098754883,0.05218338966369629,0.1554276943206787,0.15343689918518066,0.12298583984375,0.5718934535980225,0.4128408432006836 diff --git a/results/greatest_hits/merges_timed/xuxueli/xxl-job.csv b/results/greatest_hits/merges_timed/xuxueli/xxl-job.csv index 1e5a698fd1..181d6b164f 100644 --- a/results/greatest_hits/merges_timed/xuxueli/xxl-job.csv +++ b/results/greatest_hits/merges_timed/xuxueli/xxl-job.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -283,refs/remotes/origin/pull/529,ae3ba5571a06adf8fd231cea40241a11d4c3f651,60bfd95c8f4c60a17b326a5d7885955e66d521eb,f24df15ddb82b839ce2e1ea0ae16c75bb408617a,,True,True,d24396fdf7e038af858c2f8b3b657fb4357093285d506579e71cb5b920b274f5,Tests_passed,6d5828dde6df6dea4360927268532dec1899ca458a81b058db0de73729b0ae6f,Tests_passed,True,True,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,187b1cfadd12faa2966e3bbb997e14d2be06afade2953b032d0dc76dd71f0673,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,c9ddb1a1da3e5b1fe03bd559c020c0b12ee446e1cd8ae9baaf36938d71295283,Merge_failed,c9ddb1a1da3e5b1fe03bd559c020c0b12ee446e1cd8ae9baaf36938d71295283,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,0.05978679656982422,0.06105756759643555,0.04837965965270996,0.03770732879638672,0.07230377197265625,0.07218217849731445,0.047579050064086914,0.06858587265014648,0.08507895469665527,0.26906871795654297,0.2694847583770752,0.17415165901184082,0.01564788818359375,0.3082849979400635 +283,refs/remotes/origin/pull/529,ae3ba5571a06adf8fd231cea40241a11d4c3f651,60bfd95c8f4c60a17b326a5d7885955e66d521eb,f24df15ddb82b839ce2e1ea0ae16c75bb408617a,,True,True,d24396fdf7e038af858c2f8b3b657fb4357093285d506579e71cb5b920b274f5,Tests_passed,6d5828dde6df6dea4360927268532dec1899ca458a81b058db0de73729b0ae6f,Tests_passed,True,True,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,187b1cfadd12faa2966e3bbb997e14d2be06afade2953b032d0dc76dd71f0673,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,c9ddb1a1da3e5b1fe03bd559c020c0b12ee446e1cd8ae9baaf36938d71295283,Merge_failed,c9ddb1a1da3e5b1fe03bd559c020c0b12ee446e1cd8ae9baaf36938d71295283,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,0.05978679656982422,0.06105756759643555,0.04837965965270996,0.03770732879638672,0.07230377197265625,0.07218217849731445,0.047579050064086914,0.06858587265014648,0.08507895469665527,0.26608705520629883,0.26655149459838867,0.17415165901184082,0.01564788818359375,0.3082849979400635 diff --git a/results/greatest_hits/merges_timed/yaphone/itchat4j.csv b/results/greatest_hits/merges_timed/yaphone/itchat4j.csv index e26d2616a9..8c1555e864 100644 --- a/results/greatest_hits/merges_timed/yaphone/itchat4j.csv +++ b/results/greatest_hits/merges_timed/yaphone/itchat4j.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -8,refs/heads/master,26a0c2271ccd5a96c27ba6c419c6ae4cb85782b3,a1bc4b4b814df4c3c201f9b69f9d9339bad3d136,12d2c7a7944135b09055470d9ac180f80222c6c4,,True,True,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,1bf9771bcf147b9ca6e53253bb62e973789eeb1eefdd53db8e7df796d21a1962,Tests_passed,True,True,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,0.041831016540527344,0.048271894454956055,0.03961300849914551,0.04330134391784668,0.03619885444641113,0.041841745376586914,0.04855966567993164,0.161484956741333,0.04646754264831543,0.3005673885345459,0.30115675926208496,0.1192479133605957,1.3738751411437988,0.22767186164855957 +8,refs/heads/master,26a0c2271ccd5a96c27ba6c419c6ae4cb85782b3,a1bc4b4b814df4c3c201f9b69f9d9339bad3d136,12d2c7a7944135b09055470d9ac180f80222c6c4,,True,True,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,1bf9771bcf147b9ca6e53253bb62e973789eeb1eefdd53db8e7df796d21a1962,Tests_passed,True,True,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,0.041831016540527344,0.048271894454956055,0.03961300849914551,0.04330134391784668,0.03619885444641113,0.041841745376586914,0.04855966567993164,0.161484956741333,0.04646754264831543,0.30831241607666016,0.30007481575012207,0.1192479133605957,1.3738751411437988,0.22767186164855957 diff --git a/results/greatest_hits/merges_timed/zeromq/jeromq.csv b/results/greatest_hits/merges_timed/zeromq/jeromq.csv index 283c71b064..5b11d9fcf3 100644 --- a/results/greatest_hits/merges_timed/zeromq/jeromq.csv +++ b/results/greatest_hits/merges_timed/zeromq/jeromq.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -26,refs/heads/master,9b2438da8f441bb944068f5b31d5d4557b106dc5,afee4ff361ee15a08bfdfb3f55967d7818933b5e,25b1d4830571edb7396a52d81cd973ff3d82b0f5,,True,True,cccda2b77b9df22401fd3465e83b3b47543805a8879dab3bc9c6be033ae99274,Tests_passed,270cc4a56361c1ac8f6feefd05950e1aadad12037973b0cd7ebe44e64760512b,Tests_passed,True,True,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,685b0878b5a77d92c62c9fd5b542a800c51d8fc635cfc21c9ca97042f9a8cc28,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,08dad481b08626de7a12b6aef40c20f4b7f0f7390c3fe3fee4accf8baa324230,Merge_failed,08dad481b08626de7a12b6aef40c20f4b7f0f7390c3fe3fee4accf8baa324230,Merge_failed,1d3fce72a3c4191bfdd8f33e817849cd206e4905f4f79830c2354aefbd16c8b4,Tests_passed,8753b0edc6e7c6e3b57101ff30628c50695c99a07b66d2bcf69e1f62bb1440ec,Merge_failed,fc110497831593a9d582353cc220e69c0ce9efbca8229e36af1a5ca650568158,0.05320382118225098,0.04629850387573242,0.03946566581726074,0.04793953895568848,0.041855812072753906,0.04004359245300293,0.05485725402832031,0.18752598762512207,0.06866574287414551,0.08682560920715332,0.07035493850708008,0.12229514122009277,1.4947223663330078,0.25125741958618164 +26,refs/heads/master,9b2438da8f441bb944068f5b31d5d4557b106dc5,afee4ff361ee15a08bfdfb3f55967d7818933b5e,25b1d4830571edb7396a52d81cd973ff3d82b0f5,,True,True,cccda2b77b9df22401fd3465e83b3b47543805a8879dab3bc9c6be033ae99274,Tests_passed,270cc4a56361c1ac8f6feefd05950e1aadad12037973b0cd7ebe44e64760512b,Tests_passed,True,True,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,685b0878b5a77d92c62c9fd5b542a800c51d8fc635cfc21c9ca97042f9a8cc28,Merge_failed,fb0de0bb3c0a8e0f06f2035074e7e39b3e563126d57d44e615ef0470b395c3b2,Merge_failed,08dad481b08626de7a12b6aef40c20f4b7f0f7390c3fe3fee4accf8baa324230,Merge_failed,08dad481b08626de7a12b6aef40c20f4b7f0f7390c3fe3fee4accf8baa324230,Merge_failed,1d3fce72a3c4191bfdd8f33e817849cd206e4905f4f79830c2354aefbd16c8b4,Tests_passed,8753b0edc6e7c6e3b57101ff30628c50695c99a07b66d2bcf69e1f62bb1440ec,Merge_failed,fc110497831593a9d582353cc220e69c0ce9efbca8229e36af1a5ca650568158,0.05320382118225098,0.04629850387573242,0.03946566581726074,0.04793953895568848,0.041855812072753906,0.04004359245300293,0.05485725402832031,0.18752598762512207,0.06866574287414551,0.08525466918945312,0.08672881126403809,0.12229514122009277,1.4947223663330078,0.25125741958618164 diff --git a/results/greatest_hits/merges_timed/zxing/zxing.csv b/results/greatest_hits/merges_timed/zxing/zxing.csv index b9c5604804..5fc5d6effc 100644 --- a/results/greatest_hits/merges_timed/zxing/zxing.csv +++ b/results/greatest_hits/merges_timed/zxing/zxing.csv @@ -1,2 +1,2 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,gitmerge_ort_adjacent_run_time,gitmerge_ort_imports_run_time,gitmerge_ort_imports_ignorespace_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time -89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,Tests_passed,True,True,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,63ebc1c73ed31c00778ad59b0933c6e772ca9982af54124d07797caa506d1d0e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,0.06766009330749512,0.05937600135803223,0.05975031852722168,0.08145356178283691,0.07650971412658691,0.05417585372924805,0.05770254135131836,0.46178340911865234,0.22607040405273438,0.5042908191680908,0.5041561126708984,0.21402740478515625,0.07382321357727051,1.4866154193878174 +89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,Tests_passed,True,True,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Merge_failed,63ebc1c73ed31c00778ad59b0933c6e772ca9982af54124d07797caa506d1d0e,Merge_failed,3409ae81572ac2bd6507339919991342f13ed7c6398fef9a471f8c2761afc3dd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,0.06766009330749512,0.05937600135803223,0.05975031852722168,0.08145356178283691,0.07650971412658691,0.05417585372924805,0.05770254135131836,0.46178340911865234,0.22607040405273438,0.510453462600708,0.5034139156341553,0.21402740478515625,0.07382321357727051,1.4866154193878174 diff --git a/results/greatest_hits/plots/all/cost_with_manual.pdf b/results/greatest_hits/plots/all/cost_with_manual.pdf index 44fc7bc3abc5055f4a39f96a4fb244d4bee835db..2e21ce7695105b09d058cc77e77fd59c8d937022 100644 GIT binary patch delta 2725 zcmV;W3R?Bcn*z?80+1vEH!zbx3MhZgn@e*ew-JEv{1tPQDn%?BZ{!qj%HG6PKFCs4 z4vr5hE?1^aNo!J@t^E5mFf({?Fd(@COW7@nWCQHihZ&$T5bYj1+I?8igV#SheEXsE zpBI#HYh?G;y`!D`5sDH+rR=znL{Xtsw_A6Me|3weuK(_j?$__#0y_79_t1ZT_v1@NS}UN~IA|y3M2<23TakbW`1{N7o@H+WlT~A}N1m8V$eiZoJvi@~A#qPPJ2Fwd$B6AT?@Uz@XOsr0;v9 zQOT$`Xj%@cmQmOHyT!X7z;>2c#Z-6q>A>9G$L^Oadj0F&k72Zae>d;iO;p@jD*SR^LYc`kbiEC-Dr^cG(S{ect?1ct4NW6cgSlcAqqpoVY z4-EQzi@AJHy-O2bu-78v3?z|KDt4KSGvI`x@)j8%byYKdV9;k=&1HP*U7GQNy(Ssg zj94&WE|hUiiD05l#s^*XjOPY@#?5TTC*EZlpW17Yan31WhH8G9jB_Rlv$9FXM_tv7 z9~kr*huJA}>Ry`ig28_#DL0xZ!P$idIX8?b*=E`tb=6az8|+g)J9AFm%Thiy*dpbH zC2P|~A+D|{w3$0cUG-&QZm>`J?BqFhFIyQ-4W7Ja(3SvI9WbI_yJQ$tErYJYiXk)S zgZ}5!>Up%X` zI#gnnwYFmg_zr)lU>CWx04E#O2v^iKi)-l82p2noD>_udm9;j+Whntg#YJctMVyT` zxT3OoUPGTo!1ys>(WN4>thpUB#x-G})kT;w&WRR{F0n+}EVHpsBWB_Vv&5wmv%I+> zGb0Go0!>_knQ`v4AvUU-=jD4eq9u>f8r>VOcNtz8&-+3Sz2SC zM!eJ!UWrR3VtMmv1(EG=gtC!95(`;okaXKq)re1_>Odquf3Pf_ORXSz?>nhG|@^~zcc)*y8Ga%T52h3IwVa?m3!4pa#uu=cKny zLjxC-b*j-pDQqPs!0{msj$N!q4FgsRN-~0DlFL3QLj>SG`XH#1^tLrG&7?s06wVRu zVP*fh5*rrB%t#2ajo>P={(k_(K)7WNBS`m{%e{X(o#%|r@m&Qa4td7#63D|VNn3~K z^jbGc@rAidPXOpw4$}-Bb*oB=EA}k5qO^Hz!crF#=Quv`6#)WVa+tnhtj4-6yyOQ{!rzN$q0fI93f;ERUuved{&N2{%xKexpA= zH0GAkxQ@RBm1rJYQTolXu@D=$x)vw)uVayNP$mZ_ z!&8&&%vz9c=cK_$7EaLB%JT9Vx#F?6b2U$&T0YJmv}@vZ@nqjOYYy(6;C1P=q92~C z`)qiEAK7de+1>avKbnJI?f?Z2eVk|kD+h4(vj=6IU-%(N{rN` zSTA#@-oz+#B8A;JW8KQdI!HMasK!kU+aUG(4iYbW$=yEAXooZ9vx0VlM}y4kjNS*S zyT}w?Tg=@W!`Gb%q;!k2U}lub#G_UJ?Oq(+-$pS{0u6>@J_`9<6|>wQ?R-Do_PWd_ zfICBk?rY2`R>OuvKem~1V!W$Gsb7Elc&THRif>OnYe8MKm}-!&o_pnCi$U2k(N;KZ zabVK#_z|M`BkK1wcHDwE6F>sQ;wws0a)S65i!ZWSreD9wL>X5w>! zGNTFJN*e)9w9Nw@JLN!k>(!Ute)FGeX0F!D-!}V~=ZD?><1w&_#Uj|ey$ZJJepSL! zD`M@qm<=q0G-sKL&t{1Q0aiV&SVnCXmP4l+%QG(1#Acah)?TIAZhJ04snCSvBA*qb zG)I|=&qgV671@krP*wri_o;tzeB3;39`CnD83t=*glTh~;Keo}6QaVMJ{$Hx0?<*I z^Gu{?TrvxGFk=R3 zjxrUW%@T_+rJxndsI9_s=u~6*`Tk|Iemdb68x58*X6;ps?Y5T_jtqYY0}C?e7^FGJ zRD3o^&_qM4!XwdE;W%_U;=9C+!J4errw0W5kr8%`! zd^R{Oi5o7Bz(s8pa6_jexN{1O#9A3**4}6b=Ns;vpd=B3n!M78(wt^0KAWZjV!3HW zGis~Q96EWL|JWe9vPmaNh%FFPw_NJRSC#*n00*(k}@=brZD9w?j;DC| zKhah}HgxjHZpZ8IkE6t*?lQ5gz3J}EN%u^yu@(iD7Y$LGBTL0+BjW-Evy;!L{}Z!D*^k;P z=^r}z{Qq?C0em;P-}c8!9fZx(!%+;;P?$&tbFg2_k$4IWjOaGBh@m7>3jbIWjOaGBh@`^M>RFLpL@!GB7hn zL^3%xMKd``ySB6$Fw+lK{kb|Ko`ceH!AqDQZPcJTIH z7e22j5zeaai+@Ku|06XemMYZ=sfeah>+Z1aR{!c&k6r)WAN{Z2yA|vF|HFNM|J^U6 z;AhbNOZRI~_95wg=vGm+|GdvWCsX_W3lqWcjo-S}$8L3V$`R-f|Ggt`KHY!(+uy$f zdHC1eKO^U)AYjDmPB@~BH8Qvf#wk@+Cg~nY1tUUm){CQtvNY2$ah`eSdtZC!Ep|S0 z^iSX0%UL(oy?O8*QlkCuwIGUrQf|QT+wLZq9W9UQljU4HCC=!MYr>QP%_}yj^*{Oh z-e^)X>W!M#gQ|7X_4fVh%@53VjyTPA_x|INx%VHsU#{r&ukU}1qxJju^RC@=HDfmo za?L1owksH)}~n+v(-bGe?lmgjnEtVynwCCo8*p@GeR6ig}3HOcm< ztD5d3gCXB?F5gq{@`M-cwa7SUiYTQtzf8tC6NG~D78xIPRWp8MFl1cMWqj&gp7Dac zCK)%JIA)o>P{s`RN8gZG73$6%vs!7I2 zUDb>q84MX`vrFdGy*%ZA1%pjeZVk~=@CyxcVL8#N&9XV_s;3+q>{C9wa!%btDW4i_ zk@CWpwdtl1c2|_OSvyBv^=%<;8ORx`NV+BjhQ`fu4{D2TSMgDXQZ{mQklSG7*M3QHj} zmnxYf917|hPVAH5&{8^aw<#^B36?vhu}s-4v$0PjX7U8H%%u`D z+}x0vm4q7!CN9CudUx6o8&%Eo3OyRpQm1H*?i5*NjScUAamTyr7a%3LAy%n2tTJV@ zw8lP-cRF8mTjyCjvm|oE%$&3pY9eeg#QpuhDHBhJ zq4N28`{DEEW%u+rTiHyUMy1Wvih$RDNbNa3e^W?iDWQG9|cvC-nQmtxRT(W zhBd-Jtn5EmVuRwCTg75*Be+Ve{~rJ$5aGDT$drG7%;jIb&Lv}Wd{;pUL!NWE1aNpI zY3uO3Ugt+Cyl{W%Nyf}8hbclw{jO5Mjvd8Tls1n|I_hH*0>&r20zk$tIZVG{tk(Hk zc-a)Hsd@brDxGq=56wUtwGv06m87jh8z)fw`pO~7h&3?aLudiJJPxfSZ5^5!MrME2 z!Q=ve>$PY-LN%cSB-)9k@P zo|`)~JXsjod>Gl?_%lD6qhJ021q^*yXc<%v%-7EWl=XhWhbRr_6CL>Iw~vEV+5Rbi zDn#Id%%6Ibqs)smbQ7F+8z1W+6&2@8gVi1lJ)eU?+Ms$b!z~ zeU$o(OvAOs{nQx0?nO)~zbT7mMw!Yy+VtP<#mW7B5{oR*Xei~Qkk3sq%l*;Lx6|8R zm$?bx&k%w826773uoZ0B99S=gSuII_!`>%IJ*!-Nd+u2a>Z65JGv({KS01()l&v#u zh0_*CCc_<{ce|JH=zHz&`pg}?nEHxNUKFg~RGBroyOGhN(yy0>VOmj&Y31U@v|y$2 z+p0#ilC}!1q0@xcdUyZ$bl5(By4!3|l1rA#C$Ggv^LafBFpiAfTfV z^US1+afUxS(ye$VZ55zHrz+8FZm#|t-XES%a!pptU{QO0rfqf0H3KOWY?&oLS}~&( zqs+yNSwaz}HEYE(X{)dtI@MTyx_jAeAJ3R#lfg1Z)LzBd?)GxVku$=7nPUobj8e=o z7cb_>3^A-#;gM;pa2z@vb9{c<_Y_aUOIFJ8Py@nV=% z5Caw)!A#mJFo#Y7=64@{hwaUyhxqcBGb+inhE7FrOA3t4S{Wj0Z*&LeD`rln6_Ju!TxldJrkRTu)6|SOVO!Bm z+A1`MPJ!k>c7SgEQ~2wXQ}B}VGCb7Y^d`<3J5Z(=j0kP{qDr|#ezlixYUA~n+G50n*~eeLHa%Cw2X&LCjUWg$3MC~)Peuy8 Cwl#YI diff --git a/results/greatest_hits/plots/all/cost_with_manual.pgf b/results/greatest_hits/plots/all/cost_with_manual.pgf index cf424c8c56..a0deb79756 100644 --- a/results/greatest_hits/plots/all/cost_with_manual.pgf +++ b/results/greatest_hits/plots/all/cost_with_manual.pgf @@ -596,9 +596,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{3.000000pt}{3.000000pt}}{3.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.392881in}}% -\pgfpathlineto{\pgfqpoint{3.101426in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{3.101426in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.398462in}}% +\pgfpathlineto{\pgfqpoint{3.127444in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{3.127444in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -611,9 +611,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{11.100000pt}{4.800000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.404043in}}% -\pgfpathlineto{\pgfqpoint{3.109639in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{3.109639in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.409624in}}% +\pgfpathlineto{\pgfqpoint{3.135743in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{3.135743in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% diff --git a/results/greatest_hits/plots/all/cost_without_manual.pdf b/results/greatest_hits/plots/all/cost_without_manual.pdf index d1919be7c8bc48dcc516be0e3dc65daff00ba3c2..8b609878ba141caaa57de263170cecd4cb2e86bb 100644 GIT binary patch delta 797 zcmaDei|NBGrU|NyCX*jGz3xb3EF$FSst; z`Y1`{cEqo;*)#Md=1Y~|_Q?`gKE5$)M^dIq<;&>znR+uEcz^Z&`*C5$ZMVmERhMmMW$o@zKt=;(S;9l-M=WID&T+Dwb{N;f=?`t>T%m01)rySJ(Uckhs9dqQvFLj5lZPTU{ z_8E$H{=Hl;wzp*V=D0ie799~-Bc7=npTail*Y<~!XTBIoR&L4Mf48go z_iu$~isufVo6r+uX8u!Ud%y2Kd3jCU;Dp`Ji!apnS|0VfT##|x%y{w)w$S=@a;sdl zGqf+fvg*xPTh8x)zWwdT&wtaZr^RfTqCS1g^!3}0_PH|!Y){|bE1v$2{e%rtP?StZR|jY5xUl4{UlJl4SYVs5j?XrrKNASzr71DNW(> z_0YQ%YUmL>Wn+bzSLf~%St{(QtP^tQ3mrdx_wu`sb@kI8Cg}DX=bMWDv9ON_esr5FUe4_FjG(frN|o5Q)hV{93)yE z&P?6-?^-;gQeg9}FN%eQ7n^@=IZ)HC{$7Ud!1D)tQzmg&=mltM3g%jSs(5M7{SxFc zVba5m@khUIy>`buTe-Q%=;Mxq*~j=Jqu5=!Qu9)ZONvqxb3v^9q%5xDlEk8tilWps RE@M**b0aQQRabvEE&%rWXTtyh delta 769 zcmew`i|NfQrU|M{h6T5F2M%WOa6Ykm0oTnmmRCDQW_`sh!d=sx?~?X?y= z_VXvnJ(79DbMi!L@nrv^-#4E8{y6cH5$m>UJNCQRX9TY?;cd@*XgYZoTWEdW>7dTA z3t*qMaNR5Zl1a9bF16rwQQ}chUlyb zF-uk_O<1Op{4r;WQ2E5G9(<>`6mHw8_Vw>xe)sX;e>#T`M#&}KiBa2egE8JEWQY3h z4gO4<_p)DPWODcBHH63eCUlbV-alA&N>s-OT)kHMm+P769Xh`3yQ zmuOJ;czbA=(S#{BAvZNFJNyN{M9hHz{0P?n2jQ{`u diff --git a/results/greatest_hits/plots/all/cost_without_manual.pgf b/results/greatest_hits/plots/all/cost_without_manual.pgf index d255ef8338..7f91c4a39a 100644 --- a/results/greatest_hits/plots/all/cost_without_manual.pgf +++ b/results/greatest_hits/plots/all/cost_without_manual.pgf @@ -596,9 +596,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{3.000000pt}{3.000000pt}}{3.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.392881in}}% -\pgfpathlineto{\pgfqpoint{3.101426in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{3.101426in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.398462in}}% +\pgfpathlineto{\pgfqpoint{3.127444in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{3.127444in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -611,9 +611,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{11.100000pt}{4.800000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.404043in}}% -\pgfpathlineto{\pgfqpoint{3.109639in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{3.109639in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.409624in}}% +\pgfpathlineto{\pgfqpoint{3.135743in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{3.135743in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% diff --git a/results/greatest_hits/plots/all/heatmap.pdf b/results/greatest_hits/plots/all/heatmap.pdf index c2d324c612ded52629532c87fcb6dd96e1fb59d7..e579e62df3e6b0c2c0fdbf18becf2836f4e926c0 100644 GIT binary patch delta 105 zcmX?bgz3N$rVU)P*)5F>jEzjpCJWBK0%LD}GdqIS$=u8WDCOp2WNGGVZ0Y1;?(AaV ZVqj!oU}k7!WMScEr(i=s$>g?$y8vSl9U1@t delta 105 zcmX?bgz3N$rVU)P*-Z^i3{8wJCJWBK0%LD}GdqIS$s)xzA- b+}y;($impgz|`2>%}&9FfRf2=3wHqkUh*9h diff --git a/results/greatest_hits/plots/git/cost_with_manual.pdf b/results/greatest_hits/plots/git/cost_with_manual.pdf index 2addd91d0c03c62f78cb8c4b081da7199c0efdf2..08fc547ca3275a2a89b6e624f2fe371c0728b409 100644 GIT binary patch delta 106 zcmbQ=%QU~2X~Ty)c1t4zVB bF*GnUGc`3fGBY!Bv9MFHA*5vTo7T+$;G7=1 delta 106 zcmbQ=%QU~2X~Ty)c2h$WLlYB&$=~a)z}TBF)n8|IHgz#Ia&odTHnA`#ndmo46R8nL8O7S{RwSxH!5QyIC5U a8W@{f8XB0nm|3`)*(ul%QZl)xWfK6H6CI!c delta 106 zcmdnj#k8-BX~X1Nc2h$WLla}m$+K#&z}TBh>#ndmTR0mSo12?j8d(@vx;Pn|TDZ74 aI$F4x85^27nwhyd+bP%(QZl)xWfK6MR2|{~ diff --git a/results/greatest_hits/plots/git/heatmap.pdf b/results/greatest_hits/plots/git/heatmap.pdf index 37861822ec8fa4899f67c4be797c38a05193e4e9..6334795f21cf018e12b339e30da005044de19eb5 100644 GIT binary patch delta 106 zcmew}jp@%crVWuT?3P9b#zrRQlM`C5z}TCuTb)^*O=bMWDVcn*Yc~LPwH;0X delta 106 zcmew}jp@%crVWuT?52h$h9<_AlM`C5z}TCuTb)^*Eu0OE&CN|MjVuf-U7U(hECbcHJ4O#p{7Wbt2?mPeQ3t4dDe|I;{cYk(*52*WpBl#4R zT}QolWYMekpSQ{9XlmPhVI*k3@gG@yCX3ZRN3cKsdPiP-yZQXbpD$4!e#p&Z=A0B1 zjaW^Dqsmw#gPUlaF=b_xZZoOiR0!aWxYtmYCK^W0bMJiPYva7lolhM7?t6PVCu7~~ zJKrHD+W%h)su%-2Z`Jz0^nGJAD(Uq0nwG7q zWz_ZRa`EB~cf?VrL6ghR19O+xs%CSYn+v&ysa%g-OLILoRwdWUQtr4r(ZJ>krxfR^WV_Qfo9=;s!H{n`mG7~4 zX~GNkYGfR^qDmd{J886tYl5qpnam($AGHw`^ zAnRnj)is~-++fJKoy_>iyDZ~ldo?mH1fyV?5vR$x07b#6DjDx|&1QUHFl3xhE}3KZ z(v%krR!O-vR7(LT8sx%%0@bR{vf1gHPkC;zN%`c;Id(5g`Pg8Mloz(FRX2sWyJEb~ z+S%!v-xlTuo0Ly3o@4j2o#EKv!FvYdC})~*pys(-hE~3k`KIJ?{IZZ_vje)iaWUOzmxEuXK}PY*kvp%-reQl%iN@ikX}qwwqG4rCZ>wgDM= zzp7cuNK2h{MvVq-KVX~s@3_TKP;DK-D?@Sp%(bvlwT!w7OJQa%Rx$$|5+mgujNh9M zxgKh?={ihK?4#harF7(ORa#C{Ce0~WIl#$F)L|8MO|ojcRAR;Vu!;_qSY@sCSaE#E znS_&ES{xS}T?toz)HR8#?NSLB?7cgWTi_iQ8vk}>r;uD+`}w!sl+UAuE@+v3Pz%dQ!umM zojSxiRnxpek4m)EK3bhSMOH~;#e3ZSUG)=?5@4uRst&7vMA;;*u1_UidJnI}r4q5c z`LKe>HB+tMurq)4EV_g()2tm>61jF}j@k+}QEoBB{rX?V#lxcX<5*V-;gaLAIO0V(a1zbI8V9a4CIxkA|7x&OxB2mu zO^>GlM}f6}qJQnL5Cat5gB2bHFw^P!Ks-bZol=G_5K_%Tx zOdQ9DvN(3J8nwWo6qEvrV^XLlC`%>BIeHLONqSM6mjNZwJ&kLGKdfv%&%}nsF<8a> z*g9}Cu}Y1@fMa!ru>$V;z~NW2sLImXv0CB4W8}(zA9MLvuk)C(*}codlT2^xm z`w0E>A9I_^@)I7#hc=GYJih0CH~E-I6|alWrTnty-n|37EbY5 zkl+0|*t4hK4!8&t3q_K7`z*<-1y%yjXzE$nEhUc+o-`Ue-PfuU`3>kke>F2{~BzqBtj)ijO9zaHCiaT(4|@hFjC8 zi0zn}G}kn&F{%T?=Q_Hp8>+6oCG9i}aT7 z!y_pB_(kPqfLZ(e{8_8?Pk;$Uxt1_o_g~_V%!g zEm|m(%i5Eh1qa=*Nf2Px!6@XDBk09Bf>eAo0)|B{Dyf7ZYMVjOb_xjIUj+s~uC~n? zljm@If3ufFG*l*$wXedhvlZzz2Ip{|!Rx^(1>w98aHDAie$`<;Whb5oH2NPt6PlZ| zLkM}`f!d!2~w3ZH~7v!!2tLiyq8RJ0k0J*B_*P5Cy7L9rITKQ r6jCzm_N%zO)|$s=ZDf#9CY}#?&-ejDhz6;XL5Uy;GYTaoMNdWwUJ+q1 delta 2293 zcmVk^Xz%!sEIyOPYM&w4AAh|eFTUM;{^QS=C=Wm6<}ou)3W`ds zCc;r=tdYS?RL+>PGD^3ZRB$Q;@J8Gtl%)y6$awCJZ)|Ohx4H3&q2GOPFXv>8y}t7u zVxay1rJ#y2FsS$ySp~J7<_>>8YEID^bw(4=lq-YC3*N%|zw~pXG=g-vJ<_s;T1Ko_ zmx~u~xFe1_4Vqkj9;my#CLhn(`KQZw{b+rCIc?gC%qd${h&5-}5u7|ttewRXW2(fu zg_@0Zt}etHreZxZEsgb9S(R8TOS$9jL<5^ETvD8?673FaHrxY+A>My-D&Ax3(tsEA z)rdH7MU_$-P7`t9f-(fJ5%CUdHsS+?A>w)};$!R5h!^x#iMRpkxaIal5jTuVkaZ&7 zV$DZ9R~RC0CnG+xE{phBUyX+R|EKUG6R1Z`kEymBkNZ+D;a62 zv(Bi|pzQ~2Q~w>e849YcBRDe@*U#Jw8>nT(Dr|+Bx>(5!=#c0s@5uPQ>5$`4qfOUg za$z4imu;mZbE~rDG-cA9f-48Oc!@e(MXX7#+Afv2;(NG?29>zVTI+Ge@e^kfPBOJP zZZ^6ST@h=NuC{+mCAwe_UD2QtU0G{Ix*VfiGkFrWtfpQ^9l9deG+%9>N`#4hghi8z zjAhOBC<9?AaHCJc83;j*tTe?Euu0CkK9x9=dpJu>Dsh%KSLDn}3Pz%eQ*dUzIdvH8 zpr-i>Ju0!K_OaEOQ{*aXtoV$(f2w{0rUV#jm8!#40ycliR@bKzUwRK;iAg2K^5(+| zBG)XnK4E8m_AI)9Ez_tSSQ5E*WsYctnkd&8{C@o}NY=~vgz>@ z;3%+G^w)oWh8Un|CdU?E?>k|e^C~V8TKaP|i-cNKyPc9=RCSGer<{jI1C?|$K5-l$ z%Hr6?YSaRUl2ZyOj!B^!r!18m*XV&$CFwad=4sp`{9$GDea1H|j=?J4`_>UR z2M%w^yedm;`)Y*)Pa{|Un9F}(J?1fEv-_00ha0S8&3P)|f+KKv znB2Xhw6=R5*ZEP37w}V0a&DeEOw+mNy|7N>^d9;)mR9#oI_7;60>>xug9V+dJWLJl z6`+iFRp5}dLW9hlDod-6QstsX zb4g|S4UghW8^f(DTzl_|QcYxKUcWuJ(Twi6wlZTNF?W85$-}Gqi z?Ed!-!dD@k8UZ>)#gb@ID+7<&Ti*-A2JSO3z_mHv4o>)vMkQ)G znNBPUn4LJ9zl~xQ{fvrYI12Gx7o*&~nDlB~w4Ek}1ypRDv={))<*eY%*cQx-m4$yq z>~|L)#AYDAIO25HIDfP9ndS43XFb?5K`WonrYb|h^7i&AoZKvZ(K2&XJFs0{i5AcG8^AM0zxv;iY(8i_VBP!)Mzm5c=0GvbTI6UP0N% zUj#1`n6=NZpS4Q=gfO8f*Aj*sUoXxnOT|ZXhUJvjycTB>ZHBY9Q{e2Pn}c8XQWmkx zlx6L+l+}Brk#Gi_0(V>uIO~7KIcKT(XwEzguT?E1XfvF(o!WQ4LY}hOZf_5pY*9m* zxvV{TSa8q-n}h<4Iv9og)93|%Xr-EbvqcDY zc?UHyG%++ZF_Xf9)CV;&G%++ZF|(b5*absHIW;peIW#mfLNPTkH!?XfH!?6WGdDRz zF+w&tK{qx&AUs7mH8U|eG&C|oF*PtZGC46fGB7bSH#tNxLN+)-H#U>Fh&p)**io3)WaMwxg%;6399LGT8h3T19&b98cLVQmU!Ze(v_Y6^37VRCeMa%E-; PGc-6fF$yImMNdWweMv`4 diff --git a/results/greatest_hits/plots/tools/cost_with_manual.pgf b/results/greatest_hits/plots/tools/cost_with_manual.pgf index 7138d4e52b..9ef6fffad7 100644 --- a/results/greatest_hits/plots/tools/cost_with_manual.pgf +++ b/results/greatest_hits/plots/tools/cost_with_manual.pgf @@ -506,9 +506,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{3.000000pt}{3.000000pt}}{3.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.392881in}}% -\pgfpathlineto{\pgfqpoint{3.101426in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{3.101426in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.398462in}}% +\pgfpathlineto{\pgfqpoint{3.127444in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{3.127444in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -521,9 +521,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{11.100000pt}{4.800000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.404043in}}% -\pgfpathlineto{\pgfqpoint{3.109639in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{3.109639in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.409624in}}% +\pgfpathlineto{\pgfqpoint{3.135743in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{3.135743in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% diff --git a/results/greatest_hits/plots/tools/cost_without_manual.pdf b/results/greatest_hits/plots/tools/cost_without_manual.pdf index 8811d2b8aeb15a7791e1eba057af435a47b7c42d..95832f2dc0c8406af3fa824245765055518c77a0 100644 GIT binary patch delta 1828 zcmV+<2iy3Ok^+*F0+1yEG?Q+KD3MM%f5T&!AR{+~k@qV$xc(sc@jVIOSBwg075UeH zV#NPR&8THc5g`@TOlnOIJF@zdtnNv3?+5?yD_L>ke-Ag!z5jNCkBI$=d=6k&5%-R) zdT9TBpL~z1_RS3=L3_vFWOYqen`4GxfBf}^y!w7~{mZYfQ67HC&0}Vq6cm+Me@%p= z%2*?VnW&sGWo4A^GpXQI2;hylM<`1Zgpu*w8{gR47;kgq6GMOa-d@hh7<+r?JH$Zy z|7$@NV_;D68?p&%JIx(@)SRL->Wn6!DOU!OSGwT@VCE?2MK zaYr0=8Z^1Q9;my#BA?FK`RB_I82xB{dpT{|hRiA3RERZa*b$suCf3g4h?AWG9DmTj z<_eb-=c+`z!#~TC_0@>D5R8IlMl2I? z0g8fCRU+PD%|?8nFhrbBZkc2A(tnT_6jlkjHB?Ih3k`B%fofG}+w8FBL!K*aLO!{3 zj?K$LK2}&GV72|dG&JJrnEzA`*A)nkl$L3|3;aK6ba|YumXPR)J=A|h^ z3$^aC3K>JDE;#-B{r2H-*lnNA*FuQ1yWQbtcfRIlkInb(!(-cW{bl>~aA)uldi4$< z1qDfsueln)Z<86w(AO*h8Ck!nS;K!-$6c}K?2O@|zZ8g04`lMDOExoj&PnOl`Drzw+W39cOA;*%Z&9Rq4{ z+><^7LjjtTf&)~4g2**XtxwpQpFOKCVCyt$&n$^tyD~?#LQRxw41T};i*fOAXe*zO zyQ_b;Pqz>Elak|e^C~WrRsvMQy$eD2e82+#~#9W%GT;H!P09D&G6n5jW$j)Hn<{R%hrd zVAcl?Z^^tWOKbaTg#%9`SN@pGUp?k2W3&5|yCZ8>8CwR#Us+oD=3X0``MSFs4;5Px>1$540QCi!zZvD)!FC3w$0e5yDe6tQ$ z8qA||--^=SH|XE3m`m8oZ%-6oh&UB_{5<<^@)e9KRu|uY`S{<+y?M{Dy7V4Ppnm%$ zqn?LR1MP$$-QV;`>FolC%aKz!FmUh~qquE|vfeICv!Xb>y5i7Czp`{<-8^7N7qA52 zK&9k<_%$*Y4pI$HBp_SwY%3KY5ys~|`(7GSQiXF$37_J3dIabY7E7W@tt?>n=J&#| zJNonn7uw{L>;)u$CDAeoA~=H zx4r!E(}S%OwDRd^sxp)V?{A;Nxyag=1TzPr16zkDp+oJPS<YAREgwa?GD#S;9;s88RW z1Z8tZqc~$U6Q9Z`SVM6+t;A@8HqB_)DKPr_>MQbhe-8HS>8EE*!bC%n$-I4*$*Sc` zLY~poxi&jY$m_*9d8znh@-W55a-x&z1|K)#EMZQg3MJ%V-;3g$xm0{Ia|%<%YQ*(m zGrTo@inN`wl15!+2Gizw0vD@56GEkb^`Lo@knoc}2Pl92tW{Vigb78tmN4A-dT~x! zDn6MrEU2{RwK$7tGn}=Z0%sT99Q<~avWQ)#ENh>otlk5Igfrk2xZ`TTSuf5xOT{O1 z=3#iPY9T?J;jHb{zEKtOl-+)R`@G2(HI$jl+Be}*&xZ7f!73cx$bwS}!Wj-=dSe9M z>M)D96K@BP{0I5iEiJR`2X=V}IWjOaGBh}oX@S%SIWjOaGBh}|M1t4_P%uM5GdM*w zI5j~;Gc!0uG&e*vF)%hZH8nFbHa0RuI6fdeFhfBzI7Ku#H9~L S2b`1Xh#&|y3MC~)PeuxDsc&8Y delta 1828 zcmV+<2iy3Pk^+&E0+1yEGLvwKD3MM%e_H?xf{fe{M&7U3;QE8$$M+?8xd*vbrbDy&wF)uVlrE|2^C^_x{@nJ|gxf@;QKAMcg~G z>Y@Gjeeyl3+BY|h1nnJvlhrj@ZH^g&{qffu^6LA|^)J7^MtS%lH;D+~ zDr1cdW}?rd%0BUhx*z|D~TBr4gjV?UB|k)H-6lxm>+^ z#~pFhY0%{IdZ6y|ihMd_=btY>81&it_Hx>^4VhE6sSs<CROst*7jFX)K9Dh(^ zbA?lib5)|v6`f5a62u8s&BbJG{ z07b#6DiQCnW+OgO7$VLmm&~zwX@AHI3afgHao2Okmm}UkWa3h zWAn0*j}_Jkd7)&jS`=b+#dw{yv%{J%3v-1{$R`)iv3Xf#I9B-Vn!z~AnI;^ld1=Ye zLalqOLdB4&3r_!jzkN6ycH5`(wGiU$Zg;rZov-=XWAlCc@YuFof7w1g9A|ulUcCcI zK|xaE_goF&x5)}*=xbJhjI7_(+{s8wopnZylD1FSX8(8EVkoG#j^M~pT)%KFY@pT= ztFRPi>f%mjK!-$6c}K?2O@|zZ8g04`lN0;MxojyNnOl`Drzw+W39cOA;8aO^QJXIVN}_oh*9d=D*?gbz4L8SN74LoPh@0_MYD@!;yEF6^ zu<8Scw`5+GrL}#v!hxreD}T)8uO9Q1-0VK(?%@LKSaY5VIN=CP50krBl-737<2s+E zcmY53B+>u{#Q zIx6?ADD8cN{@seXg01}aMDc})Q<2Bdv+pKf!Kh+&@tu!<|Bc+6_YA8`@392xw_h^q zdB_@Q2L$Qz!?-0wlutx@X@@LrJP|Oex_@{7#Pm9l~NsG^v#Z%-;N77*
N?*$@%TcTwOL~sTzkQO6=m68>_$!@{CSXoHKe(vT$YzE?s6V5)3^EWGB zx4r!E(}S%OwDRd^sxoW`-rqijbCI>*63iTg4s0EsgbuZDW=X43`X+QS>6atJ2Xyt~ zoUT-SGF`Yz`Rb(-T@h`DuC~*NuJ!HB{lj7R`2EXvca*wXsHsd{);>Sp7Ax>0qrQB1 z5|qsujpB^aOnfS%U=79Tv=XBU+BBnGr@-jztFOr4{W;jPr=OlN2onuOCiC`LCaZ2= z67r0u&b8HHLS8S<$xFp2lZPd?bgGl;1|K%fS;Cw~6-vm#x);ScbE)`b<`kBS)rjlC zW_WA*6lptUCXKqv45rQV1TMA%O$e3#)dTF4^OHaaD1ZK}wXseJ6N+*zVYu-1;+(Qn zd@^Uaq0*Yy;w+-gaMpGToLzKd@Y_+!B6gXwtbLZUdJhZ|&VWI7To&T?#KuWo~D5XdpN>lWvGCQOgxTKoo=FWEkT;UM1+mRv`*;Z1kl9O=ttT zi|_nd1i3_S-QBmSvVWG ZIhtCy0y&Q67H$T13O0n4Ob(j369B~>9!UTI diff --git a/results/greatest_hits/result.csv b/results/greatest_hits/result.csv index e6d76c79c1..209817214e 100644 --- a/results/greatest_hits/result.csv +++ b/results/greatest_hits/result.csv @@ -460,7 +460,7 @@ idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,test merge,diff contai 7097-2567,7097,2567,refs/remotes/origin/Issue3112,89c83f2cda338e57d5b0d6339c76acfd159b1a15,4b45bdb4b613e8e9e68640f387019c479b595927,0e768bfe7fb1b96ef4a1e32f5a369170e18a1efa,,True,True,03884b955ad72befbc339e0612a8345f7c1cf3baadafbd32ba13238b01c971bc,Tests_passed,5c4a1ab696a07b85c75a55d5f1319256ec5bbde562adb60cc045fbeaca8eef9d,Tests_passed,True,True,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,3b80ec0b193c678a17e3368637f901cacfccd7185e67171da5af934d01a3daa5,Merge_failed,236dbf5f8380f02caad7e2ec48c22d5eddb664cb83eac16765c4433c48c619b3,Merge_failed,baa9567c0099a9cbf8daf621184addc80dfc5844f73bd0de99f9049585a0ac0d,Merge_failed,baa9567c0099a9cbf8daf621184addc80dfc5844f73bd0de99f9049585a0ac0d,Merge_failed,ab2b2b5da9aec43e70f88377c45e9bc0d5ce6800733ba86d809ccadc3ddf70ce,Tests_passed,72c3913c8b7a1928e223ca41cb04f22a11d3f2a7931e60d54fd9483f02909bf9,Merge_failed,08c65e2f8ba36a17742b3d8f2d055a9eb7f4b8a5fbdbfaee286020a46112aab1,javaparser/javaparser 7097-2575,7097,2575,refs/remotes/origin/Issue3112,92a17baadf0066a1d326744b8c47478f2f67b69a,2229ec2e8d0d7fe4306ea0dcc4624f01ee9c2d91,1b6d2d11e2ba79c6299470b4842ebe04ae619e93,,True,True,877af0a05be6f21e510466261a02115cd0ca7be557ff36a9966650facd84f642,Tests_passed,902acb76e5b1c99646187c4f8662a1b91ebfa49132e9471a7ed79926a69d9661,Tests_passed,True,True,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,1deb92fa0cbd8b762a85dd11639483246e5975551a8d85393b346933d13c8cb6,Tests_passed,1deb92fa0cbd8b762a85dd11639483246e5975551a8d85393b346933d13c8cb6,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,Tests_passed,0f9cb7dd770b295f4b739fa19c27c7e6e8d5b9126fce435400baff564e20d6a4,Tests_passed,7e0c212d654f75f1a82d7c31cc892c995b1971609587681ca140e7fcfd787322,javaparser/javaparser 7097-2633,7097,2633,refs/remotes/origin/Issue3112,31cf9e1365d59cade0bce29bd22eb58d0cf2c113,2ec600c5eb514e35d3c0c24986f192d1397639ee,8045627142e190a41767094c91d3328781452d1f,,True,True,83c57eb44fc8d80edf63ec5e0d8d1f71fe5a1dbaf7691cbf60fd0e4f53a9eafc,Tests_passed,61c3a01148b5a74972541e76bbf3a92b74c3b5bfeebbeee083b33d67e364479d,Tests_passed,True,True,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Merge_failed,ddeec205fa871d40e89e391990d1e14030e136e40373fb3c3e9029c8d98f48cf,Merge_failed,f96b180000252e430ca0136dde0a3c897fbebd429e9bc73cd84006d60b1c6a77,Tests_passed,dfd36a0f7cb1c7b4c79848e8bf8155719f40c4c39989ae62fdfaa133ce1b9cbf,Tests_passed,dfd36a0f7cb1c7b4c79848e8bf8155719f40c4c39989ae62fdfaa133ce1b9cbf,Merge_failed,f6bcef92175c2fc36aba054a28460060adaee31555888d69ea46a740f3934d7f,Tests_passed,d62b38bebd95c5c556d3e1ae6ee5ceb178cfdf2c2af28c594c3e30a53185a1dd,Merge_failed,163c3df56fd8d3987004c45b764b74142b7f546630cf209bd609fe4d6df9ed7c,javaparser/javaparser -7097-2647,7097,2647,refs/remotes/origin/Issue3112,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,True,True,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,javaparser/javaparser +7097-2647,7097,2647,refs/remotes/origin/Issue3112,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,True,True,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,javaparser/javaparser 7097-2651,7097,2651,refs/remotes/origin/Issue3112,fda4e4c52ee61a099533aa4d489f899591769d02,e0d5efee2e83c5bb1ecbaf60e00458dc384f04ad,ea5c9c1d7da1d88ad23c32af2de3db2daa279aee,,True,True,d0d4278ac4883ca82c6b63413a63f19397da1c861e86fd6ae0514ee602218bf9,Tests_passed,6901a58e8cd212b196c2979654a29631952db6dd94d43171ce82fb23b3cb9c52,Tests_passed,True,True,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8fdef3410d848e7de9e0e50c50d174e5088bdbfc8d992cf1fd966609dfd6b297,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8fdef3410d848e7de9e0e50c50d174e5088bdbfc8d992cf1fd966609dfd6b297,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Tests_passed,8ac62bbf3033821ac2c44f497579449a0df6d3fa6dfcddef022cfc15d79be54d,Tests_passed,8ac62bbf3033821ac2c44f497579449a0df6d3fa6dfcddef022cfc15d79be54d,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,Merge_failed,01775427a382a22204d0d9d86940603b94cb268f3d1beb6f6fc25d514c42df86,Tests_passed,2ff055821ef0fad6e1575eaa58b7dfbbd743a5c9deac2ff3f9199d1690397d0c,javaparser/javaparser 7097-2663,7097,2663,refs/remotes/origin/Issue3183,226365c30ea42f7a9bb83f1d0fe7fe23d75774a7,1339ae280956354b765d779f509b0dab89c5f57c,8e88daa7ca1019bb9337b1e10440d2fd03aaf391,,True,True,018e850fec6a361fa48e8d76d496fb4fad16a057023646bb75cd713f02a78904,Tests_passed,b7452039838e155eb9cc26be933af2b5bc807655daa46a64d6f75626ea16cf9c,Tests_passed,True,True,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,Tests_passed,2e78f00365f1e97a17448c66490866a4b36da6c0b27c12265d6491aa67a5c9a9,Tests_passed,c26cd7dc0551483fada44247d48266e721c8f98c13fa64aa70c9bf29c7d3d134,javaparser/javaparser 7097-2720,7097,2720,refs/remotes/origin/Issue3183,19d15f4dbed959fe2c837532f0155a3e41ed0456,155768b66aca4e5dc4c2b575e52f386dbf2508d8,1aad07e18f628eb6c2bebd53e16917b2c02576f7,,True,True,2966711f6291f8687a588cffb3bf51b913b5e2c8c7bf7d1ab520d51f6afd42ce,Tests_passed,d359343cc6555eb19a8f7194bea5267d70b48760473189e06f5b910a435fbaee,Tests_passed,True,True,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,f3f2c08172bf7f832dfbe36d91439cdc77e3ba002b5bdbcfe0e767823d1167a1,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,f3f2c08172bf7f832dfbe36d91439cdc77e3ba002b5bdbcfe0e767823d1167a1,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,803b513c2d5869402b2535a742025450a6bbb7ca1692e2dcd1a28a5a4b72a762,Merge_failed,58e36206fa27addf7bed6d9874e08c15e42083da5f8651d3148c78ec5953034b,Merge_failed,7b212de88dbb77166ab64490eca38228d87754e24f4984cf4937579701b3aedc,Merge_failed,47ca2c30a9e0e4fabc490d048e7020c48a36c5291184014eed6994913dd90fc9,Merge_failed,181c9c26f9835ce2689a2cb4009a9070266b4c10cbb27c189c38bda63900595f,Merge_failed,5f803467858708e557d495bf8565b913adaeaa667fc9e071afe7cc18ee292ec8,Merge_failed,71f6077791eee222e9824b531aba9c5afef1fb8456d3f0fcea8c6229a482a337,javaparser/javaparser diff --git a/results/greatest_hits/tables/all/table_feature_main_summary.tex b/results/greatest_hits/tables/all/table_feature_main_summary.tex index 721715718f..8239d69907 100644 --- a/results/greatest_hits/tables/all/table_feature_main_summary.tex +++ b/results/greatest_hits/tables/all/table_feature_main_summary.tex @@ -22,8 +22,8 @@ Gitmerge-recursive-patience & 285 & 53\% & 204 & 32\% & 224 & 42\% & 414 & 65\% & 27 & 5\% & 17 & 3\% \\ Gitmerge-resolve & 280 & 52\% & 200 & 31\% & 230 & 43\% & 418 & 66\% & 26 & 5\% & 17 & 3\% \\ Adjacent+ort & 288 & 54\% & 204 & 32\% & 220 & 41\% & 391 & 62\% & 28 & 5\% & 40 & 6\% \\ - Imports+ort & 281 & 52\% & 205 & 32\% & 203 & 38\% & 385 & 61\% & 52 & 10\% & 45 & 7\% \\ - Imports+ort-ignorespace & 281 & 52\% & 207 & 33\% & 203 & 38\% & 383 & 60\% & 52 & 10\% & 45 & 7\% \\ + Imports+ort & 281 & 52\% & 206 & 32\% & 203 & 38\% & 385 & 61\% & 52 & 10\% & 44 & 7\% \\ + Imports+ort-ignorespace & 281 & 52\% & 208 & 33\% & 203 & 38\% & 383 & 60\% & 52 & 10\% & 44 & 7\% \\ Hires-Merge & 310 & 58\% & 249 & 39\% & 191 & 36\% & 360 & 57\% & 35 & 7\% & 26 & 4\% \\ Spork & 312 & 58\% & 280 & 44\% & 142 & 26\% & 317 & 50\% & 82 & 15\% & 38 & 6\% \\ IntelliMerge & 286 & 53\% & 197 & 31\% & 222 & 41\% & 399 & 63\% & 28 & 5\% & 39 & 6\% \\ diff --git a/results/greatest_hits/tables/all/table_summary.tex b/results/greatest_hits/tables/all/table_summary.tex index 12ea43b649..2b30e26395 100644 --- a/results/greatest_hits/tables/all/table_summary.tex +++ b/results/greatest_hits/tables/all/table_summary.tex @@ -15,8 +15,8 @@ Gitmerge-recursive-patience & 489 & 42\% & 638 & 54\% & 44 & 4\% \\ Gitmerge-resolve & 480 & 41\% & 648 & 55\% & 43 & 4\% \\ Adjacent+ort & 492 & 42\% & 611 & 52\% & 68 & 6\% \\ -Imports+ort & 486 & 42\% & 588 & 50\% & 97 & 8\% \\ -Imports+ort-ignorespace & 488 & 42\% & 586 & 50\% & 97 & 8\% \\ +Imports+ort & 487 & 42\% & 588 & 50\% & 96 & 8\% \\ +Imports+ort-ignorespace & 489 & 42\% & 586 & 50\% & 96 & 8\% \\ Hires-Merge & 559 & 48\% & 551 & 47\% & 61 & 5\% \\ Spork & 592 & 51\% & 459 & 39\% & 120 & 10\% \\ IntelliMerge & 483 & 41\% & 621 & 53\% & 67 & 6\% \\ diff --git a/results/greatest_hits/tables/tools/table_feature_main_summary.tex b/results/greatest_hits/tables/tools/table_feature_main_summary.tex index 0902699721..10544d1c90 100644 --- a/results/greatest_hits/tables/tools/table_feature_main_summary.tex +++ b/results/greatest_hits/tables/tools/table_feature_main_summary.tex @@ -16,8 +16,8 @@ Gitmerge-ort & 285 & 53\% & 203 & 32\% & 225 & 42\% & 415 & 65\% & 26 & 5\% & 17 & 3\% \\ Gitmerge-ort-ignorespace & 292 & 54\% & 214 & 34\% & 221 & 41\% & 400 & 63\% & 23 & 4\% & 21 & 3\% \\ Adjacent+ort & 288 & 54\% & 204 & 32\% & 220 & 41\% & 391 & 62\% & 28 & 5\% & 40 & 6\% \\ - Imports+ort & 281 & 52\% & 205 & 32\% & 203 & 38\% & 385 & 61\% & 52 & 10\% & 45 & 7\% \\ - Imports+ort-ignorespace & 281 & 52\% & 207 & 33\% & 203 & 38\% & 383 & 60\% & 52 & 10\% & 45 & 7\% \\ + Imports+ort & 281 & 52\% & 206 & 32\% & 203 & 38\% & 385 & 61\% & 52 & 10\% & 44 & 7\% \\ + Imports+ort-ignorespace & 281 & 52\% & 208 & 33\% & 203 & 38\% & 383 & 60\% & 52 & 10\% & 44 & 7\% \\ Hires-Merge & 310 & 58\% & 249 & 39\% & 191 & 36\% & 360 & 57\% & 35 & 7\% & 26 & 4\% \\ Spork & 312 & 58\% & 280 & 44\% & 142 & 26\% & 317 & 50\% & 82 & 15\% & 38 & 6\% \\ IntelliMerge & 286 & 53\% & 197 & 31\% & 222 & 41\% & 399 & 63\% & 28 & 5\% & 39 & 6\% \\ diff --git a/results/greatest_hits/tables/tools/table_summary.tex b/results/greatest_hits/tables/tools/table_summary.tex index ca73996fca..e2d49ae22b 100644 --- a/results/greatest_hits/tables/tools/table_summary.tex +++ b/results/greatest_hits/tables/tools/table_summary.tex @@ -9,8 +9,8 @@ Gitmerge-ort & 488 & 42\% & 640 & 55\% & 43 & 4\% \\ Gitmerge-ort-ignorespace & 506 & 43\% & 621 & 53\% & 44 & 4\% \\ Adjacent+ort & 492 & 42\% & 611 & 52\% & 68 & 6\% \\ -Imports+ort & 486 & 42\% & 588 & 50\% & 97 & 8\% \\ -Imports+ort-ignorespace & 488 & 42\% & 586 & 50\% & 97 & 8\% \\ +Imports+ort & 487 & 42\% & 588 & 50\% & 96 & 8\% \\ +Imports+ort-ignorespace & 489 & 42\% & 586 & 50\% & 96 & 8\% \\ Hires-Merge & 559 & 48\% & 551 & 47\% & 61 & 5\% \\ Spork & 592 & 51\% & 459 & 39\% & 120 & 10\% \\ IntelliMerge & 483 & 41\% & 621 & 53\% & 67 & 6\% \\ diff --git a/results/reaper/merges_analyzer_histograms.pdf b/results/reaper/merges_analyzer_histograms.pdf index 5a3e2dcc39c4cbd35c651102315ba05395e22104..66bf7ea86622b733e76a7e765b8c96a22c524903 100644 GIT binary patch delta 29 lcmaEGj_1KSo`x327N#xCOBLBIjSP&9O)R&sQDol23IMPR3Nioy delta 29 lcmaEGj_1KSo`x327N#xCOBLBo4NVM9O$@fLQDol23IMOR3Mc>o diff --git a/results/reaper/merges_tested/helun/ektorp.csv b/results/reaper/merges_tested/helun/ektorp.csv index a45a8bf3e4..454cb36276 100644 --- a/results/reaper/merges_tested/helun/ektorp.csv +++ b/results/reaper/merges_tested/helun/ektorp.csv @@ -6,7 +6,7 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_t 79,refs/heads/master,345afd6ec12dea70d76c5bd5bb47b7ce742b3e1c,be0a79db1d2a22eae390e8b9de685de251970f65,753ab4ad68ea6256efccca4075ba57321bf30910,,True,True,71ce7951bb39ced4bb3f30bdf89f50521ff542c0df66e6a89a674e22f424a579,Tests_passed,22149e14a0166579cf98af7fd170c4ff6925112f8c755421c9dd2ce4952e53d2,Tests_passed,True,True,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,c66222be93f2389a23bc2c014ae0e122fcde8bf49863b5950fa011fc145e16dd,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,c66222be93f2389a23bc2c014ae0e122fcde8bf49863b5950fa011fc145e16dd,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa,Tests_passed,34fa7f56cdca66b3a47e6fd0c5dd14d357a765fcb4b820128c0b66de63552372,Tests_passed,d6e0d68fd1fe7b7f7ef380e136ce17bfd77e29f075b71625b7a4c4f93efbdbfa 103,refs/heads/master,f4c9132355bd663e323801f480281ed66c565cb1,cd8065680a19dcb75651905522822b45ea91664c,baa5d0f934fa7fd8123ff223b3ef93eb0903c1c7,,True,True,6090d4fa7c35aec0605f8f65af89032e3f995574164ab0ebb7435560e42e6d1b,Tests_passed,c87eca59a16a18a51455034dfcad5eb2f6ea182c51b818be95383134f4c0d7dc,Tests_passed,True,True,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_failed,d719badd1fe3a0684b54618594a0232e8cc3a357343b8f28c7b727db1fcc5d6b,Tests_failed,d719badd1fe3a0684b54618594a0232e8cc3a357343b8f28c7b727db1fcc5d6b,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd,Tests_passed,eac9be4b009dfc52188b17030ae381745697c291368291a2ee160e5475075a38,Tests_passed,4d550f0826d2df5cf97854e62baf4b4a5321a118306361f5786b2ba0077d40dd 113,refs/heads/master,65e477cb21c8ace53b8b4322b93330ca2584b949,d6692417c338767f81a78f7a4fe261d5be0244a7,5a10854ce7f0a14a7bec61777ee00d17bd065d5e,,True,True,be2b757c77fb954520b734234af794f7a3b2062c5041449eadcaff76688037ab,Tests_passed,c7f37351eb8bafa66689e6624d79248f7a61119f19e61bf9a9be1b7d1c6750eb,Tests_passed,True,True,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,2713b0ed640932408ef941e1e596e0e8bec2e19180913c25056c16c7f094ff1e,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,2713b0ed640932408ef941e1e596e0e8bec2e19180913c25056c16c7f094ff1e,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a,Tests_passed,5753f220134d656ae68bcaf9c42a791962ed4225113ee98a52263c69ed8610ab,Tests_passed,00fe79a845ba03cfc81c7c684f6977ea79b03143af06f0cff2512518b741d10a -128,refs/heads/master,be831799cf7bb0f27c544e77e2db6caa6e5e9a2b,9ac133542c7e534d818926bc92efb2370b312184,cc4724ae4c52b7006c0d9e69ad7edf9de4f6bb98,,True,True,edbf1d9cfc94046f2969b2d6822cfe0a2161b781e73d83487f051166a616aede,Tests_passed,bf3bf4ddcaea9f690e00daedc5b86f6ba5546bbe69ea2f69477fe09d5b2b52ea,Tests_passed,True,True,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_failed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_failed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,be9fde368a3b74bdfe6f43a21e7d3ad479804c22a95cd3d91c30eecde1c6f07d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf +128,refs/heads/master,be831799cf7bb0f27c544e77e2db6caa6e5e9a2b,9ac133542c7e534d818926bc92efb2370b312184,cc4724ae4c52b7006c0d9e69ad7edf9de4f6bb98,,True,True,edbf1d9cfc94046f2969b2d6822cfe0a2161b781e73d83487f051166a616aede,Tests_passed,bf3bf4ddcaea9f690e00daedc5b86f6ba5546bbe69ea2f69477fe09d5b2b52ea,Tests_passed,True,True,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,dc3ae543cbdb11c6f7411591dc889991d07f0ca710fe4ba1c1fb5f60a7cbb78d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_passed,fe87d736962b279f0fc75508206d1578670401ee1b27db47e0f8a261ad69656f,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf,Tests_passed,be9fde368a3b74bdfe6f43a21e7d3ad479804c22a95cd3d91c30eecde1c6f07d,Tests_passed,18ec110a8c94e4d4a721b3ba064a7fdee310e6e84acdd958ba53323cd3149acf 132,refs/heads/master,ecc17e03e4b4879293d2d8ef55ff5d29e7c11735,4b7c1f352ce1b2d7de36f4f4bd37528c5f9c4ea2,262208f7a653371ac353b3f23d48511f4439cf56,,True,True,c45385779fc92e8ef90f37afc7e945b3d66555a33ed8696f6f9b9c46ba2d7cfb,Tests_passed,6046b3ea6b58bb8fe0968d093fd31950bffa784ef405d8fbd75e7dd55e021f0d,Tests_passed,True,True,Merge_failed,35e90c8aebf4080d4c9b4d3a4c4dd6036a522ff392a61d8f303a353ff816ebe7,Merge_failed,9a54eabeced0180dd25de9b5bec50e7914c9d4495fb8844a45689073e6c50cf9,Merge_failed,35e90c8aebf4080d4c9b4d3a4c4dd6036a522ff392a61d8f303a353ff816ebe7,Merge_failed,5b55708567e80aedb0e8469b89ec88ec148f3ad41ba58cd7004bd4971e029e60,Merge_failed,4da4d71896c3b2ab23ef0cb9af290100a91fa8079ee214eb7432138628f8016c,Merge_failed,4da4d71896c3b2ab23ef0cb9af290100a91fa8079ee214eb7432138628f8016c,Merge_failed,4da4d71896c3b2ab23ef0cb9af290100a91fa8079ee214eb7432138628f8016c,Merge_failed,b74189b36742854668bcec6ee36610a8b8616ac7c541ae928a897fe669f5a4ec,Merge_failed,35e90c8aebf4080d4c9b4d3a4c4dd6036a522ff392a61d8f303a353ff816ebe7,Merge_failed,a505e485b62f46eaac402a6831c80412003609d4f55b6c60539f99ebba8c26c1,Merge_failed,a505e485b62f46eaac402a6831c80412003609d4f55b6c60539f99ebba8c26c1,Merge_failed,c3b81acfb62744378b333ce39c7f57e744e0666e77e32bc82a2f0cf21bd81398,Tests_passed,df29a5fe8e21567655554c4e5b1dd03f910341e0536cbd6677c3a7e9580096c5,Merge_failed,91aef1095eef616108742fce499c9e18721a61357ac1a855fa7c7388857f4676 143,refs/remotes/origin/pull/271,3f8848a9133da7fad3bb55fb4f0c7cafbf8103d8,36cea424db31c1292a1c985469e2c5e1e5367f53,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,,True,True,bc68d33bc1dd7e94779577ac88d2302bb7dcd54d72e3e764472a02c972aee266,Tests_passed,8cead63e6744d51c52f2ac338b27733a0b752fb76b7bf25c4660c3dbfe99ff19,Tests_passed,True,True,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Tests_passed,bc68d33bc1dd7e94779577ac88d2302bb7dcd54d72e3e764472a02c972aee266,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Tests_passed,bc68d33bc1dd7e94779577ac88d2302bb7dcd54d72e3e764472a02c972aee266,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Merge_failed,dbf53a9d0e7b12edf31610e6f249e51620237b2ead360d45671dcbc6aebbb1e9,Merge_failed,36559d8d331f9d3c39f475e8212fff0387dd408abf6540dc6fdc208d798053e4,Tests_passed,269a67b9199bb0fae191fcfd6a94bbead6884779a812859c21bad5fa9b16a7ef,Tests_passed,269a67b9199bb0fae191fcfd6a94bbead6884779a812859c21bad5fa9b16a7ef,Merge_failed,9ffa90396bb51477b4f2cf3e9429a8b464c99c41c85053eaf7c85056ddca3bd8,Tests_passed,1f42a2d4e0f6a8bef6353208c2ac8c35f0bcd6b71849a6a47636cef828d00fe8,Merge_failed,da263ddec94b9078f9f481e546499af1cc8592e534939680db00f38b396c3c43 144,refs/remotes/origin/pull/271,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,147a38fd89a5f2cf0d6bc54fc538f1cb95031ee5,66abcdc152ce8f4d61d882958e42c88b59ade06b,,True,True,442a9475b54cf8061d09c0d8ccce1cabbcc7709f559ebe3245b88194b34dde0d,Tests_passed,a55529ee7282f95d271c336ef0f35cd28cdaa358af48b5db6c5f664e9cac166f,Tests_passed,True,True,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,b2deb46a7c7fa5a8065ee98b03469decad46bc02205b7383fcfc4b110d461d34,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,2bd91ebab9d163dc9aa1146aa65e5e3ff9a5e1030880d4fc9be5abb1f7a3b8c2,Merge_failed,2cfb627e4af8023be7a87be20831379fe39851bfa989cafa3c0c64fa84fd1ea4,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,e5a43d5d3d3a5b333f304fc6667733b2034925d4c82ff1a5b343f35afef64d5f,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,bed19c3d97b2a25ae8e90d14b25fd5b97227d02d1e884e76c4221a1a892282d1,Merge_failed,e5a66a2d365954acfc6791d6a8c124b6470db8f83e543d2eeee76cf46ce6fa91 diff --git a/results/reaper/merges_tested/javaparser/javaparser.csv b/results/reaper/merges_tested/javaparser/javaparser.csv index 3845130307..d73aab4f64 100644 --- a/results/reaper/merges_tested/javaparser/javaparser.csv +++ b/results/reaper/merges_tested/javaparser/javaparser.csv @@ -33,7 +33,7 @@ idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_t 1415,refs/heads/master,ff91564b7febe26de0279380ca24685e07e9725c,93ed83c0d17841fcbcddd7bae17437755124782f,ed062d3f20ead16cacb77b3fc99c45ece9daca8e,,True,True,16b8023fc450478821453e660d9890eee42d3063a22a2a223f7bd809cdfeb657,Tests_passed,d3c35ed9703c3551bfacf5e25611864158662a2658474fedaabd9d8717eab899,Tests_passed,True,True,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,5af09b815b161c92259a09c870f287f0eb2fba11152c685112e531ffe23b43ba,Tests_failed,5af09b815b161c92259a09c870f287f0eb2fba11152c685112e531ffe23b43ba,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1,Tests_failed,a08d07b345a14f1af3f41aa264a873b504fee4bf6146b2ccf37d611ea38196a4,Tests_failed,2cdc1aecfd9552dc34d0c465485d6a0cda19c7a8802c076d7b58566d828623c1 1432,refs/heads/master,7b7b795346618b5cb8943bc19d5db763ab764d52,1e0baa8af17cb2031dd7a2f572fc5581a64c9299,43ac5e648af1138c5d83a33b8e97aea1a6f628ed,,True,True,b8a650cad8d768fbd308f5a137b8b8f0271a08779871eb864584f9b2a3fa49ec,Tests_passed,9f88aad483715b9bfa302068f58606acdd62fb1a4f2c1b59fd47a62d39056627,Tests_passed,True,True,Merge_failed,15996aeeb53cc549d18158aa5d0b0310cd032191eb7f5b55db963c48f2c92f3e,Merge_failed,15996aeeb53cc549d18158aa5d0b0310cd032191eb7f5b55db963c48f2c92f3e,Merge_failed,15996aeeb53cc549d18158aa5d0b0310cd032191eb7f5b55db963c48f2c92f3e,Merge_failed,15996aeeb53cc549d18158aa5d0b0310cd032191eb7f5b55db963c48f2c92f3e,Merge_failed,15996aeeb53cc549d18158aa5d0b0310cd032191eb7f5b55db963c48f2c92f3e,Merge_failed,15996aeeb53cc549d18158aa5d0b0310cd032191eb7f5b55db963c48f2c92f3e,Merge_failed,15996aeeb53cc549d18158aa5d0b0310cd032191eb7f5b55db963c48f2c92f3e,Merge_failed,c5f673dec6cd33f333d2dd9b6bed6b98ad177592a862cfde9eb23758599467a3,Merge_failed,15996aeeb53cc549d18158aa5d0b0310cd032191eb7f5b55db963c48f2c92f3e,Tests_passed,5c34d9f48ed6a4e460d75b1e94343e38be8b04d2f1ffe4b77389283426ecf1cf,Tests_passed,5c34d9f48ed6a4e460d75b1e94343e38be8b04d2f1ffe4b77389283426ecf1cf,Merge_failed,0834cc8bdd82afa9b172dd151a1db1d579c8dc5f9de031de76bcca0225f1911c,Tests_passed,f596019e6bc862965e6add651cea943696afafed4c4d444ae0d4f594b756001e,Merge_failed,9a72ca25af584c0ec41263d1dad641f4bc305fbb61875cdbf5230030a66adcd7 1603,refs/heads/master,dc6254f1bfec6bb2a657fb618f93cecda23c16d8,19f65395bfe1d88dbddfe566dc4d69e22e477700,a9cc993039d3e315d80dbe1f952afd23486d0f08,,True,True,935f0d41979a00d15585edb233a3cf91bd128eaaa060b81e2e0ab0735e12c368,Tests_passed,3e05bf93cc4fed0d861f75b50a2590cf983aa16125d71816bfdb32dfe28ab9b7,Tests_passed,True,True,Merge_failed,a4abcae0ef2f6b8a23f0a8f6854ef1bcf5ac3c7f97e2422c3e5e1a0e94639629,Merge_failed,a4abcae0ef2f6b8a23f0a8f6854ef1bcf5ac3c7f97e2422c3e5e1a0e94639629,Merge_failed,a4abcae0ef2f6b8a23f0a8f6854ef1bcf5ac3c7f97e2422c3e5e1a0e94639629,Merge_failed,aab3d42af86ec01c8eecb9bc2f61aa3992fc937e10282d82902ff9abec7cca68,Merge_failed,643be2d36704dc0201924d513ab6c96db1cc4245e7036265452e281698212c9f,Merge_failed,643be2d36704dc0201924d513ab6c96db1cc4245e7036265452e281698212c9f,Merge_failed,a4abcae0ef2f6b8a23f0a8f6854ef1bcf5ac3c7f97e2422c3e5e1a0e94639629,Merge_failed,31b9e64447610292b09115b579ed632691e8ef92a33c6ebfbe51ceabf418f5fc,Merge_failed,a4abcae0ef2f6b8a23f0a8f6854ef1bcf5ac3c7f97e2422c3e5e1a0e94639629,Merge_failed,eabb52098f572b1c28ec2007b99aa0e6636a17d33bd983dc3e1fa9125b42ecfb,Merge_failed,eabb52098f572b1c28ec2007b99aa0e6636a17d33bd983dc3e1fa9125b42ecfb,Merge_failed,be9fb123fb7b333991a4a44122354d68c506ec2ced1b3c6c8a4a57d4c80ae0ad,Tests_passed,7538d5395ee41964caf0b5a752b6c52756a27b45d544b415e8e9e85a39671b59,Merge_failed,9a765471d3e5004971ff676b77afb0739e8ddadc9c8e527d6d95b2f56a4ffd1d -1604,refs/heads/master,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,True,True,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_failed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b +1604,refs/heads/master,d3f0f3d0a4c59c8db2fef8799514e929b09afd57,5a7dc225b496ee4784c5b005f26f0253feb0e96a,c61e5be7ade932bf2c387e5264588be79da32e16,,True,True,5e0dbb1ee67bde71b7990776b9d3cfc4eb1f1fc9cf149c2f8645952d19be3cbd,Tests_passed,410b6fdd533fdb14b57475e39c9965176189d357a241e1d6f1c96c94b241dd76,Tests_passed,True,True,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,3e7b53390860e2769b22a4d301e50f34ed67fae0f0eba08a1810deeafc580c84,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b,Tests_passed,7593d0568a288f5fc98854416ccdde742240c2a1b170b924898c35d938223bfc,Tests_passed,33141a7594f6711fc98920d4e0ea196a047437a1cb6dffe2471c51891147856b 1638,refs/heads/master,91ebf36c066190d49ef4ddb9b49d281f0763b417,98ea761ff04b0226ca0511aa5d735fdae829aa3a,20c326ea46667a89e7bb3b5c9c2e099dfaf289c4,,True,True,17ab6c56d9685e438c7450014cec3ea0297464137062c0db6e962f68cac47880,Tests_passed,a26f4d613ddfd10710c9a45e6dabdafe8106d54ac706ac012122378afc3841b6,Tests_passed,True,True,Merge_failed,bfb3e41bcd7a9d3bf5da8d958e94a3db39f7487e7d7f6fa6384d29bc31a7b021,Merge_failed,bfb3e41bcd7a9d3bf5da8d958e94a3db39f7487e7d7f6fa6384d29bc31a7b021,Merge_failed,bfb3e41bcd7a9d3bf5da8d958e94a3db39f7487e7d7f6fa6384d29bc31a7b021,Merge_failed,bfb3e41bcd7a9d3bf5da8d958e94a3db39f7487e7d7f6fa6384d29bc31a7b021,Merge_failed,bfb3e41bcd7a9d3bf5da8d958e94a3db39f7487e7d7f6fa6384d29bc31a7b021,Merge_failed,bfb3e41bcd7a9d3bf5da8d958e94a3db39f7487e7d7f6fa6384d29bc31a7b021,Merge_failed,bfb3e41bcd7a9d3bf5da8d958e94a3db39f7487e7d7f6fa6384d29bc31a7b021,Merge_failed,1db580aa266e97ba980f33c6ca9f14d9b0e1b9047fed54e1a7a5746fbc7fd156,Merge_failed,bfb3e41bcd7a9d3bf5da8d958e94a3db39f7487e7d7f6fa6384d29bc31a7b021,Merge_failed,fc36da844aa1488599c128438b94916dbafacd9c77e1477def5c09597198be55,Merge_failed,fc36da844aa1488599c128438b94916dbafacd9c77e1477def5c09597198be55,Merge_failed,548c9553058bfc346b9fbdcb11242a56fb33a6ccd3d1a2c162be85e717acf1b0,Merge_failed,f5b1c8f372e441be7d7303ff0fcde8bbb1da61eb00f33e6ed3d9330e6ee4b716,Merge_failed,ecfa685d3a4d7f8d18daee48b9e063d4b81412ac62d95dc268f80a06676f0d4a 1818,refs/heads/master,8125a4b1b97f07586693d15fce865f316d294cab,5085af8e7fc625672ca90605efbcc9e335f4e8c6,b7b8ee6e55671364e4a09abaf0501e49b6771585,,True,True,8fad0bf5d80e47176297872dae225fdbd282f6512ad9499cb4497a823c90224e,Tests_passed,2986b25f122d6ee16f9f894cd84a64ae31b6aa0fba7dbbf03b467adbb5c699e4,Tests_passed,True,True,Merge_failed,751e7f39ffd84ec323d92ddea1f463824e78f6df54f81a1bf9fbcb937cb03e24,Merge_failed,751e7f39ffd84ec323d92ddea1f463824e78f6df54f81a1bf9fbcb937cb03e24,Merge_failed,751e7f39ffd84ec323d92ddea1f463824e78f6df54f81a1bf9fbcb937cb03e24,Merge_failed,751e7f39ffd84ec323d92ddea1f463824e78f6df54f81a1bf9fbcb937cb03e24,Merge_failed,751e7f39ffd84ec323d92ddea1f463824e78f6df54f81a1bf9fbcb937cb03e24,Merge_failed,751e7f39ffd84ec323d92ddea1f463824e78f6df54f81a1bf9fbcb937cb03e24,Merge_failed,751e7f39ffd84ec323d92ddea1f463824e78f6df54f81a1bf9fbcb937cb03e24,Merge_failed,c4e04d07710c6e34f1b476bf5c032c1ca5545a7336b0b4c7afdc0cf2ffc786d7,Merge_failed,751e7f39ffd84ec323d92ddea1f463824e78f6df54f81a1bf9fbcb937cb03e24,Merge_failed,100a22d77f4aee601467490407cd5b3b63f343b112561d8802545e3c0a7835b7,Merge_failed,100a22d77f4aee601467490407cd5b3b63f343b112561d8802545e3c0a7835b7,Tests_passed,2b88de63de7e803f80b81acca3f3eb7b12993f01ee18ab476716acf19e5d9d96,Merge_failed,8d4dbcbb34c53040ebd528db4762a8c82522e4abc5935807ae8ccce2580f579b,Merge_failed,1234021e61fa7c8fd2bbb8e5912de48226cea049b0c2333a102a87475676a86f 1845,refs/heads/master,9577d1173bec447e99da51363f7ce1ac1ff4d5d9,b55c4deba0686400ddce77a90c8b2eeaaa52fe18,1094353d64b0ce042207355f04cbc6c8178f16ab,,True,True,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,632eafde4197d6b200bea1863dced2db390a2a033858ab44c179b6a1621e0986,Tests_passed,True,True,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9,Tests_passed,47f9645004f0aad6acd0f579d85e82f6340a430c4c4f37b4fa5651fe4f18fbf9 diff --git a/results/reaper/merges_tested/jenkinsci/deploy-plugin.csv b/results/reaper/merges_tested/jenkinsci/deploy-plugin.csv index 0f5c44ed00..7485ec1892 100644 --- a/results/reaper/merges_tested/jenkinsci/deploy-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/deploy-plugin.csv @@ -1,3 +1,3 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -4,refs/heads/master,c58791723cc93e49d7430e51478ccd3d5fab8637,1d8fa627276dc4c63522d2f60c391c84211bd56a,71a4889710cfa96ee4ed356a696dbdb8a0d66615,,a39565f84f2a26d90542eb2e3307687bee2c087103959451775aad51bc28a3a9,Tests_passed,536c26a1583c10b4025b47c8100288487b96bd9627c59801d5ff3dd254d2bfa7,Tests_passed,True,True,True,True,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,1c54b3e59e72297131cc947f9783814f7ba61cde2db09d3b3e692aa6c21cc891,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Tests_passed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Tests_passed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,e2b41d2fd42a72d2b26d94a4a316239554cfc5ca32a5327e04d1f86e0deb346d +4,refs/heads/master,c58791723cc93e49d7430e51478ccd3d5fab8637,1d8fa627276dc4c63522d2f60c391c84211bd56a,71a4889710cfa96ee4ed356a696dbdb8a0d66615,,a39565f84f2a26d90542eb2e3307687bee2c087103959451775aad51bc28a3a9,Tests_passed,536c26a1583c10b4025b47c8100288487b96bd9627c59801d5ff3dd254d2bfa7,Tests_passed,True,True,True,True,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,1c54b3e59e72297131cc947f9783814f7ba61cde2db09d3b3e692aa6c21cc891,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Tests_failed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Tests_failed,0b787edf4f9ad6c86ba4577de118fdf73f3db44b89322e453db07e2ac0c284f2,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,e2b41d2fd42a72d2b26d94a4a316239554cfc5ca32a5327e04d1f86e0deb346d 23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,Tests_passed,True,True,True,True,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,536cf1269c8905cf34e5bfcd1d916fe6d2b27868e745e7cf211d9e65c7440364,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,a72cf44162f0c612e3c2220cd90af30e204218d8cc10e876b683990ed7bbe02b,Merge_failed,236d01e14786b8c9a2f24fd6b5f12a617055362a8aae646e37e6cf6686d89751,Merge_failed,2b0123ac923208bb3ae6c43a0834a3477d86ecd62d49df8043cea31b4c12055a,Merge_failed,75ebaeaf049491c6e9f3978f4f2ccee3b7788e8b316855ffd1f6f997ab37bd8e,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0 diff --git a/results/reaper/merges_tested/openhft/chronicle-bytes.csv b/results/reaper/merges_tested/openhft/chronicle-bytes.csv index 9186037668..c216e65a29 100644 --- a/results/reaper/merges_tested/openhft/chronicle-bytes.csv +++ b/results/reaper/merges_tested/openhft/chronicle-bytes.csv @@ -1,5 +1,5 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,Tests_passed,True,True,True,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_failed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_failed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba +26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,Tests_passed,True,True,True,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba 40,refs/heads/ea,e3ac571d253f5fcf85f24e64833bb488092d58d9,2caddfea71d4a3291923e5932bf994076318b9cb,4d42f73c641704d7902aa284121ab19e3c082243,,84cc90e53681ca3be51813ccd0fa6573ecfbb2a76a204b32822d33bfe371e839,Tests_passed,6f35fce28168ab0482ac3702347930cba2f1ae10e297ec926ccfaa2640fbffa6,Tests_passed,True,True,True,True,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,669e8909cd3af663789ae3721ce7470622bfd7e35e02b6ba67792cbf4a05e35e,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,669e8909cd3af663789ae3721ce7470622bfd7e35e02b6ba67792cbf4a05e35e,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,7c916f37092b8f8e24ef8b0d0d4bde7a7b61889978632c3b37c70c682a9ae457,Merge_failed,4eaca51790441abbbb9b02a8005d15c46a9b5ae8648b2690869db48f1333a5cf,Merge_failed,68a3032d06a0e2e05bcb37f26d8e6fa5488db90109e274d87274e5673a31a7f9,Merge_failed,68a3032d06a0e2e05bcb37f26d8e6fa5488db90109e274d87274e5673a31a7f9,Merge_failed,97e8829c4ccc4e632b02f3c721993aad8935741eaad61b2dc60b1374c05643b1,Tests_passed,b422e8d651ec939af5d4cba19f1cbb4a5d56bd0b9f0893f467bf9a39ca0a2731,Merge_failed,022708a8eae12696937384aa613a4c172d517cbf70b26da11a604faf03ec550d 50,refs/heads/ea,5bad7e86eaeaf961867ab32657bf3d9c5f4a55af,420ea2a65d88fc2661a898a5bd25ff7b4efb1a27,b92648cfac1e07a32364e98ae1214fae8ec44e56,,13f16a5d7750798b50b36cdcb3dccf80f54be2b171e306ea170267eb35982dcf,Tests_passed,e580028e81c720573643b18b671b25df9c1403f37853e8779af7b034a3f3cd9f,Tests_passed,True,True,True,True,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,33c74e6748d06bdf0d9ea6570181c9c74abebd7035d281e3e450de9189ecc918,Tests_failed,33c74e6748d06bdf0d9ea6570181c9c74abebd7035d281e3e450de9189ecc918,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,d8a4b9e85d89abab6949ac9da5e88efcabebe884f9cdd6709966ee6cd1c38ef5,Tests_passed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc 91,refs/heads/ea,8790063989f100d1dbbef74c717017c707fcc895,1a104fdabcbdd83df23ed505a50b02d7358e42ed,c75795b6aed917f3ae8b15a092782236c2e2adfa,,a445cf16d3b4fd38273ca6b618133f2c432c4bcd5e270c372cfb7b68f5b7102f,Tests_passed,8516c95a7fc650a1ddd17d11a0ff4be05a773dd0a6c036c0d964d1413e1b13a5,Tests_passed,True,True,True,True,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,59453f7d172684b48db0f1f474379714e4943012b38afe6c6c953d64ff1a5c68,Tests_passed,59453f7d172684b48db0f1f474379714e4943012b38afe6c6c953d64ff1a5c68,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b,Tests_passed,85a9013e772b863ce7ecba58000331f2c87483bc55471da8e770a0d6b0ca24cf,Tests_passed,82166924e19ea98ae2badec704a125660662cb86e24847715da03fca9c8c446b diff --git a/results/reaper/plots/all/cost_with_manual.pdf b/results/reaper/plots/all/cost_with_manual.pdf index 3ba26f445d3946bccde1058926cd6205ca8e263a..468fac9798143b263dff44fd2544e42846ea3e2f 100644 GIT binary patch delta 2590 zcmV+(3gPv@n*zq00+1vFHZdTRfF>uAPB?#tY+$+@{o&P^5kU`#pm!@Wy8ema<2&TP zuL$PWNc7o#BFOy+MX(`KA}%CWL@0$0TeSKYT0Noe-XGns-_eR9_y6$F-TQeE{0zE( zLBD!s@1x#FvpQ&xW!T%ExemxoDgY5lIe{nOQU za*C$9H;=AD47B^b=2#NKG#Gx1ZoJvS@}NFiPPG$kwL(l`Dm7?c(O#|lNk4Z+qmn^y z(6sJVt)s5DcdIu)P>U?KiYavWVPt>q?mhbDid_GC_haa--`~|;yFqitZW_dz5~#?m zxJ<0AfgYoq#JX2C8|&Phk2R~sdg59d>#4COv6co?OYMa^HkB}?SlcApgRa?dj|}>F zi(0&=-lYLA*lQ7SMkSU~Dt4KOGs-amp=p$~b5ubRMMSNHt^Wg^a*#LUVj5g&BTMto$@ zN1Rrd%&B{6$O{IWgxqMX1ZNlOdHBFFAMq9V2h9!wyaGz zg|NFKw9VQ%=$hXa<_5cvR~LWJse9SZaBA@EJ%hHG5``$k`n6kzUe!A2D(o0CbH364 zeA+x84%^Mk^_p{j^|(DeY_He!>ezkXJRkd#5BHmw=YxyTn;#fUl`?^~%egv*e^hrM zMDOMg_*gS$&7Fa zXek|FeA89P^&Xf(tUWmRTFokq;W31*2)C1!bXLuN)` zrUjU|1T*8@X+vyKRp;evG@>O>(Hh(-vPudYo^gj$^$U>VOk*Qu8&-+3Dy^YTBVOtR zuf(MivAp=agvfSNt=q5@H+oh>z}9Kh&P<7HKQl*dg`6n2=-Yq&{l5w2&xbzq`FZ>P z)8=LO{8Y_sCQfIm&D4t!jp?HnK`53SauviZg}jP$n>-$iJ)ZjqPP}`tMj4d~f&#jf zyK2bPP5yYwq>rZ<^a5jexP}p;83s2glqijbA>c;#yoz!LsV-&t^Qu&O+q7xaHOdsPUn)|IeaUE3-Sn?+tFi77FPTIY(XXFG zmE=N=n+82V3980zOT?`kH%y}W^_87eV8WHA`sAp1eB>j3@nJ?&`#=rt(M`O`SYy=UbjZG^3+WVT* zlPD+3EwS2bY5mTG^VKD&IZzHZmV>*D);U#vN}cZS!c zcNTs3+}vl~llq>``ksx3pL%Z&en~euYr&8Zu5HTtaY+s4RJkc@kh*c{QeWwgP21SQ@ znOA=rd=Em`d#&3qD4E<1-56pIyT53p6Pd&t&^HK!#$^fl$QVla+lvgRY zWz$2RkwJgR^KSRzpLVa^K~LpmXX#pVFoD?E@cGM zjJCEBqo}OTsIN0&wB9{DJs-BmkN2DHDPGY|kylncKe#S-P7^UQn8-cqjAM{yAXDj5 zlGL5XszxNEvO3AWPEPW$-F!M6cmKI&=4!kCZFhWmemLAeo+29U6^UlWvqYPoMn!*! z1kzi|rN|)$X$CQsE`>-qwv;x47?sr__I2hUE*O~6Vi99jJd3g2sas%3t=n>0nJ;@$ znlj9!3mH=5qO996Oq5j_4t3@jKJK1&kN5i%{1R&=etGdczl)tLMxO43n2CHy24O}s z5iW(PVTb6ptW97>Wp$W+omrUIOkaQf*MB}7Pa%yqi%7HL`I)uV0cs?uq#x+{(io)~ z!&JHyBItI$wt*Ox)gktE<{*B&f7xxHPEM(bxgx);c$QzgGvWwPQmi-(tsG#GW&l&^ zQh<5Y>1SI3yBpGN}NgQhE^ZY>gJRqP#^v~N8WsV`0(xDzXQ4dhkqW9 znR9|;Fk%$q7E5ik@NR-}LZlHdW>!o>t5AttaEcd)~pumiEC-Br^cGZS{h6(wHNBxRKk>EZIfsZx@N;YGU($i zYVn?Wmj=9GuSLWel~_ut*kvNlD8~epw}|+lYc}E|gFfP_7V)WfX~YZmntw!GGi<4$ z=0XwI1PdnGM7-BEAMxCvkGQEueBxae@u|HQ5$Bv>W{BpOi8yBxGb@`!e9$!;@sU9v zaavt6r|zX8FBohRa-*>loL#7sbHlKbZI;bJ*L=uxgI&n0E9ca`EaX#zEka({vNqim z!tRRDHf!ggYkpgp8|*?}U4J~M?qxf}sll`N4BBE!6rv34*KQelRqLRuuw%%~`9}Zq zY4dzIY&S30YtH%Athkoi=pXF8^D$7;>zPMKCfXRj*tNJ5}qbtADT*X69lhGr}RD zrF4MtO;;h;gSFB_h3dpUX>@*p!eXNu;flJdxcVxMaIq7(qC+KIS!qLDmSC!gxCkwyu(QzyS5#K# z)z@hRjGqD)T`CgGihtW7V_aiKwYms1#yQra(GW|NRhbQS8Zi?mm?bWinB~O{nHhnZ z7GUBM%#3rV4Y5I0otLlCh?YD>YjCH?Dk*Gu#vM-8FF=Yjjg6FTSS8A;w1zs3c&QV- z5|>KE^5XLnBHK;1Zo^L8=vfT`Tc=SwGbOV9%pA29a-!U#Z-4jq|0a|_ANtJa=k5DX zo0r}5Q#G@hIGv?7Q!hd^rdKV3P%Js*Du`JMc@^h2xgLu>p8E?Y-d(IwMx}zFfG*`; zHDu~0zn(Jb^%R3%UkjdfNmLR2`bktt zF4VYb&;yj9YTUL&+`4hYB$~gzvXcr-xYBeyn*vXv_;>`S;?}LxefR8!9?USXZ1dLL z6t)adm^aocXcUv9wx-h7O(lIVg=K@dR|73>FquN@K#`TMdCY1|nBU(S*uS}svad;R zzw%DztbcwQ$-(@E6>;|?dDBYLueX!=g5GHitUq=%6s^QY5HZ@Vu(p35GL=!T9GnbS zCz+2yy01xtk1RY!H1l`hT=t6R(Sp_kFSE;NBTtmmXR4-E(uF zbx-PhHtTyf8h+}%Irt^r+^hvdLb$dm>&GQEm{aAZtU>C=rOSM!J3;BC&?gz}C8-9l zp&?AT%cDUgkx;G{V`$^X^dN-^1Qt83WH;1@?=z_|F~sQ%W}FPFQiGyHz04~Oz6YV} zy?@qi7nDrC4c!=G51YSeq!XFM8_+ihgX8-_2Hy=03&`F48Rb(!2> zGN;2r8^L2HG?W2a<)j*ByeQrK*#V?ZODerR^N`2*rowk6#8SNObgb94PLxg0ct!^O z8PB`ji@)q%yK|n(!Oqmt^kAo8`eqhZlYi5Uh>1(gUANCD4Z;jkB3#M{rWtK*BSukK zol#$B!f3sFczQl;k00+h+f%%vog%NScz$qQ?3gBEWH6C?)EUPh%|NEor6j34j8%_Dr+A9*xif4&7J&cMF31qjFOMj6= z4AKl@DqRYZaBL}U1TiYBL+tC!L0m8}qs1b|tauhjDMZli zd~E|UDyu{6>&!v?c>l87KAoIW6LUp=S@A5tc1Oe!prlxF7+N{NAk6@#(xm_)>w+As z5x}Ud4zRB?26%klclb_Gi#CeXvf^24mpl576uHI<1~{~b0kPmbQp-%jU*iT)zNtaz4S(-Zv&jkzbA6wR3p!VFm=TuO|=%H1l1 zPn6Y(^>w;O*B?J#uK^dpI-Wx;>Ms(@iklv}oHJ7r>%L=E&MQbWV5xK|F`{s*d2&!y zr{!xDSuIE!f}J9@q_EM+%YX6-(%q;?W%I-#2vc;aa3ML%AoZ7R&_!KUc6}8O?;krL zwf@QfX~;aQsJH|xD{Xr2a(XXms7ozPhG>wbgc8|8K-xfB-zXD^x~hQsDjv}7Fu49W z!6)i1@ySY?o}!#F11jxuN1gBWgD^#u3Kud`!oM_O6m?Y@^;P;mv=s7Ni|u~DJ7*+C z?IluKX>zS}*42}a2`4lMIbGa$PY)*|AB~hEpOxPDOVt|`w0XCfasAy&$@~Mg?!gz$ z(VD@kZA|4)dHx4KbGO&C=?Nly2Q@J?GBh(VlM;s12Q@J?GBh(Vv+aiD1w%D9K`}%# zH!?IrMldxvHZ?akI5asmMK?G>K|(h$GcrCPJT*2!F+?*rGBiR)Ff}+fH8(amG&waz zH#k8-LN_ooGLsaIM?*BkW2vN|iiIfUU`@ZpsoRSN@Hu!dndAbVJ5)+aMB7dhiPB0Z ty%Z9pWO(gYabB!7*UQ?-Afrq?9`N4q19%AtER&v%AP6%GB_%~qMhc|E>sSB) diff --git a/results/reaper/plots/all/cost_with_manual.pgf b/results/reaper/plots/all/cost_with_manual.pgf index e4393bb4da..80bd41849d 100644 --- a/results/reaper/plots/all/cost_with_manual.pgf +++ b/results/reaper/plots/all/cost_with_manual.pgf @@ -596,9 +596,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{3.000000pt}{3.000000pt}}{3.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.737695in}}% -\pgfpathlineto{\pgfqpoint{4.125321in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.125321in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.740087in}}% +\pgfpathlineto{\pgfqpoint{4.146098in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.146098in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -611,9 +611,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{11.100000pt}{4.800000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.749656in}}% -\pgfpathlineto{\pgfqpoint{4.091700in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.091700in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.752049in}}% +\pgfpathlineto{\pgfqpoint{4.111979in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.111979in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% diff --git a/results/reaper/plots/all/cost_without_manual.pdf b/results/reaper/plots/all/cost_without_manual.pdf index 2efc623f20e6a4f28d889fe5ce2cfcd7b8f00029..2ffe9ce4c7745739bf981560a04124685875b4d4 100644 GIT binary patch delta 2616 zcmV-83di;2ngZ^c0+1vEH!_n>hbVu|n@e*ew-JEv{1rG#l_D1JM^5pk>`h#igDh3~ z;P{~8a%I|-w5H^^^6%4)c>tIJhNK00vs==T4NP~VKfD?WOssev7|;CM! zf&3VheT;e^$!b)M-}lM)XlmcxFcb85{6tot$m-^pBTygyqa*J=KYaSz-@gKR_(vXI zGUt?}V8j_BJ=NA(72E{ljA^H$be~Bjr&0>uiAN1(X`*4~JV)m{Upwbr?tJ3tuUH%9 zoXmA^9d&48MOTH^J;+c~BoMr`j3y)(~MR*A_Idc&`?J($AgIsASMP zYFhWI)=}5{yVbjIxF?=^BMiCwG%TR-_>2aAxp+?8pN72s3^R; zOsu_w9%Gxtx>vOr>)c$3wW!5<=2{x-xv?g(){b(|{e?O<*D$4c-z0z9gRaGJPYi~5 zt6IG0-lYLA*lQ7S!8O%d8*!P43oa=Gd~UBr#HD0ZIA-N#A})od!s{jxA9O87d}1&} zoL863xqE5I3kI8n+*yBWloS{0dHBHFAMqHV2h9!wyaGz zg|NF~yv^D<=vv+u<_5cvR~OH@d)dx#Zt&zigY}d%L%5*!ty_j()q2!b*fC`0LZkor zw0S-pwwu@MwUqMeaeH{!Ua$GpOZR>A{L+_vy5GD$A234iz7c;SRVoyEe?x~X@o24s^aRaG{Pm0;EE2FaAlqnB}BfPYH`EPaP+K(fUVQ0otP5&erAr^3OP}3F|_;Ze={zh4}IqI-S*>e zo7dg*Q#G@hIi008b1%kd%pbKV#;KN&s}SKiS%R#0%0Ly56eIRnXxJs)dAzN(cKl>?r%1 z^!5wyWKLT3amiuEb!{^+$PC<&x2+`oa$A`{&^?`l1;|gvqSw?ZrY0MkRQjd&HOD7W z$qX*BHjF$WJe3|2>l|NE`lYuqC$96_SZjY~vx=~s%h{|lO2@W|@g23L#JBtwTJgoQ zb2ZPO3qDp~WozPf@!h#Uta)_r1g}f)0|xY)`wTq~y+-uCh73RTo-+ESapJQ|5T&qf z#)m%79hKbRbTCM<&tqDt@pz(_LSGiJQR5c8hK2}*Pi6*@CdyzfA;<>D%ODjBUFm<9 zs(8Op&_ksWjzlvkgOP>YpPzqB42JWQ54+d!AbE{vD3wE#xufZ!Nx}5ZBB>@P z1(A_}2_V$TAdS+DQYt+c6UP%W(+E>kR>#!WnPFP*9-f{L+n3Mxo9!`V(M}OrR=hm8 zE_MnMNixVgxYQ~qIZ88Zhkww?EZ5t+|_?}{nPH{ z_4(m&|9FgOv{xjW6)zHPde$>ShlL^h}7{VVG?jh>5Z)#G%d-#M1|6 zVzGoVFJ8ph?o2B(#Pd3#@^Lr{GlGfmT!0o5Io#wl0T`9l0rqv406y-Xc8~Y_WALK2 zBD}148Q#SX?IKL0Lm$c4$0&czaHi68d4g^{g=@nzDy#GC>n!rT7WV4D;q&3;7}aRA zNHr^7o>^NRPezEEQzK!d;3&-irqXi(N=3PAluRVb>HzyXQ-Cke`woBKF>299ky=)~ zNbPbb%aNkMcTfz^Ar8WfVIn*iA>{VBq_#mAmDLgUbppb#KK=~5mnTH``j_K5VWPi? zFDqWe*YvbJ5@Q~3^Cm|&N;77u^jv7n&{ostpsEfm)ac#`fBbyC23A1o|eK`6m?ZG^;L?T&PWxar4qEPw9%o<`4gk# zn0300-XKfiC9*TwSqJ%kqiiASsk4M0E`gyETGvHsTISzMH$D1As= zBzjPv9+>a&n%9|<=w3MC~)PeuxN`31ND delta 2610 zcmV-23eENIngZmS0+1vEHZ+sr2`GQfn@e*WHxhvF{1rG#wM7{3$DR^zB~DVc2SuvN zA?t&RrWGcXb}05oRA$OB>I-HMG~e<$$v9cezV z7?s{>@+ZDy1b>ua)G@7zRGJ#5j3I|DS^Y#-Po(|s5BTd>vf>2)A0FE8{@H&Eegxe= zllP6X4?*uESq-Z3^FI0+#e;^tG}16}o}=@vudVYgbv|`lPbQE4) zCfDARsj(`#){b(|{e=cL*D$4cUnPIry{_4Gj|?{X zR;7GTy^9l`u~#GGf@`X^HsUfF7hF;X%4=l2*EO5*k-;Y8rj+ricX7ru_Nrvu3hKGz z?m`*2j4Gk(WW3WgpYhaSlW|wf_{6&;<5PPzGA<>f!Z9l^lW{3D6<$}#c&}?V<0FGj z#(8ncoVpjMJY%p*%AJ3uMoDp@K`x!3M%P(3dtLJ>PYt#yFRq+Z_mY%P4c16`X3JW2 zQwX~&#_Oz|y{`FfVQR2Vd2#Wax|i$>rv}g7GgwbKGlUCjU%O@KRILYHnH@u7t_k}4 zr_J->u-&{|ucee%kK4n;_Ik~)j_v2o^Ra9Bc)xjhK46C4d@FxMtW+p!vF2(O{#M+9 zjAKnUAQSIzYF0AJQSZFflR-NS*tY&#wirrkoF{N)Xl`D)7PhL^L04ueOw5H!W`sjQ zq`Zgm&$dIVhgxI%4#kOm5?r#BPTZ|Z%Nxp+y#y;SVDgf6SOr~0R$Z4$toR95!J!S7Kg>gRKgW>6>)W4D&Z0*a0Q2QxRTb2xIClWFm(}H&QP>b2Uk#5 z=GFD71WcX+7F@~_OPcE;6Vg(_t+@y@Atkk{(j^utD>Cc*RAQ!1FpFHuF-w~(GINRw ztH8u1m^pN(4zXTUnOD=J5-oj-R_{)hRn%DVjC(j$zW{$JDJ*qb*I^YYE7I!wRN`e$ z@QPf@5lfrTD~NnM)#8So;nlP16Sj`Cc4kTByO}v?%hW`v#U}1={=>L@K6I7OkJ}G_ zY+iQHPsPe+;&f8lOuZPgF}>BI7^hl7twMz7P*+LmquXO)#LMP}lWcFSaly5Lq<}7i zuNEqGm)?J#a`Ejc0i(b21}}I0oe% zd;kZv@-s1U7$4ff*oA7;32-J86cm}@fDxmh1Ppqwp*q|b#kaMIS)mm;XkeAV+m-F- zndqQA7Ebdax*pw3w0{qT5Qy{wL2`{Zy6_csE*XEF{kwBuLZ+0o)7MuHQbn0GmXBvs;HiupUxBf>c67EIp6#UvGYl--vi2~A zEdzfvronmxK?yyIHI~*6m35;OmJNol4kE5FnL>1+$ZHHwcuSdR_ID2UZ#Yo)CF$)K z-pQObP6IiZzo=n&e!V&cXWQN0*}4)G4M$`gp6!p_pg|2ifRrtP8FhYN& z5sm~iD1$2tzce`1%M5BAoDWhQzaAH3qoeOb84THntyM77id^ImDC~uU>-$~?-yK36 z3=DagW^t2CZTr0B+v!=-Wh!eeP=|*YrKS=y3TzDuElekaaNkT1AVeLJ@b=8}6W7EE zUxj(i`_~;jb-LD(vgz^3$Y67P@@{|k(%eU0;}J^X%w+0ld}fj{eKSj{%0WS3Bwzw) z`XrDBX+kNMF2%(0fXr0F6qJ=Qb$uq7*1LzN=fn2+>3*|4g)G>~B1@X*FRqInf&`Kb z$__5IN=XjVgk&sTN|H(Hp){^TGAJvP?E0i658KTjhvV+Q*TP+G*T3wJFVBAuhx^A< zM1#F7(WH5nXw{>h0V4OfV0$eSh(Q`dOr#4Ta))WQbs$E{iV*uga}dwJFe8gOjA`>M z#(GCufgv8(36)-lgD@c&36}!225MAM31CoG2H5qP1NgXm+CARyPr(b;vhb4Td3YB) zvkNedZpKKuJ_c!mGnOvp3A%sr5Uvi-psdWZ>od#qTG*@qHSZ6{Q&fY^EY+lWerBz8 zIvF5pPK|^sErmEp6Ns^NDMZ+`!xp^~#GtGUvFkGj@zedwZu@k4N)6_+{F3Hbe)SGu z13+o1fngz1fP*vv7)zG|l!|g!shEhAl>v5r#sH7c`xf6RYQaX9TGD?!OYL$8%YmZ6 zM^Fq;A@;(AVI*9N5Ndl|QtKcL%E}14J`KXJKl}>2mnTH`@{iLsVWdBcFKM2|SM{(w z5Mv&{=1q!hkS5Gx=~8IS&|1@Guc{2J>CrwC{`l#74Xl9F@f=*e?kudRvFbs~8S^6^ zbZg_&s$meulw#pRNM3(H^{?wt3c8Azx-MBx3rdAxDF-cSt#s(Jd}4GQt4^2D>t!*# zNVbrjbx`kDsuqH-BD=0j!|uBsfLi~%`D=@LR6%hLRnl7Zu;ugy(pan~ZCV5j!WdC3 zT*%0%=A{awpsUEJ>(Vf~?Juw2P9O?;bBL1Gs;4Js%z;{A*=S7CrD_nyjAG$JMjDFF zT2*(@RbHd7F*;Q=!``tMgQ_!9xm9*Y8Hv@0Tpsn#oILx}&S~L$!;zJEqlC^+U z-nqh`Y5X6_ic7q+kO?Au2Q@J?GBh(VlevY|2Q@J?GBh(Vvy_J91yVIOK`}%#H!?Ir zMldxvHZ?akI5asmMK?G>K|(h$GcrCPJT*2!F+?*rGBiR)Ff}+fH8(amG&wazH#k8- zLN_ooGCo}jFHB`_XLM*FI5Z$2li>*{QWeU(4S+BdLs2^rApF8lhy^Gaj6IOjFah(i z2ly37*M$Lm4&F;4rGROJO38_6+es!-dKqMtN`ll3kNq0%ueIfQSUZ_ymW5XW?-f5$ UVh0J6MvWf{HZlq&B}Gq03dncoBme*a diff --git a/results/reaper/plots/all/cost_without_manual.pgf b/results/reaper/plots/all/cost_without_manual.pgf index 8b2486fc92..3e9b8947fb 100644 --- a/results/reaper/plots/all/cost_without_manual.pgf +++ b/results/reaper/plots/all/cost_without_manual.pgf @@ -596,9 +596,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{3.000000pt}{3.000000pt}}{3.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.737695in}}% -\pgfpathlineto{\pgfqpoint{4.125321in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.125321in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.740087in}}% +\pgfpathlineto{\pgfqpoint{4.146098in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.146098in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -611,9 +611,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{11.100000pt}{4.800000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.749656in}}% -\pgfpathlineto{\pgfqpoint{4.091700in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.091700in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.752049in}}% +\pgfpathlineto{\pgfqpoint{4.111979in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.111979in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% diff --git a/results/reaper/plots/all/heatmap.pdf b/results/reaper/plots/all/heatmap.pdf index 5df5f9a7aa68ebc654c5e9d2e5445223d3bdbbd0..61010ccb1e6e7779ea5d8011a56831f3deac3a99 100644 GIT binary patch delta 2060 zcmai#X;>2I7RPf-G#7A9O~ue$(-bxAf(in;mC>Z;l#pCSYg8nyBp1}EFgMyWi}HmX8)+KWOn0XoBhcEn#GOvfVJs6Y`v0^$F=htxTR6s*X9NiIbe8-Psnw+ zye`8ClK3aFHr_Qp2-TG6stJtRw=epJXDIEc)id<;V| zH;Z?RU*da~$c6j7JS}VrR#n+xMjX8^)X)^8+e~{hEG_lkYY>+PMgO?+V8f0L|Iv;Q z1DkJbJ1x=?5d}F803zl}cD7@&IT+Q#nwi}!;zV75!J|`MU=r#pvAdN;QVX@CODO5g)c2CW| ztqxmM7mpYK)RLom+*o8fq972WLujo6`RYjmA-7Deo*W+8@+i0{B^WMQ&V;;6h)vvn z)C9K~O-Tde?iMXgx(3xG)54aDs!T0QJD*`6{r;{)*a7J0~ zPpAHG`KGNwAw?g6v&!}R#7^*7u$ zXy-X_j3i9)DXh@7hxX>|+AxoXEF)Q`iQk6NdfUI;%h&JYEa6O9xFw$Jq|_}NPdxgE z1!%-v;Zgx+EKA(CyE+>%fVIH zb=WMENGmNgV+iW3FB1s4X8+X&XY{UQT`U*3K~A0~i7RMhryRT?N^wA?ID-pk&Pj`h zXG-IpT8S7vWnm6DbBo%JFn zur?NoQkqDqb-!gm-Z^Q}@QfDfSY3BKFX*%v0j!h-7uoePBoD+xvqF3i2L_9wJsq=E zcK>b{pkpaM4UPK^vwL=VilP2bS-_Av=x5HfiiXYm$XH6tWM>DFcAmViYX$LZhC%qP z76kX5-Pt~xinlZCAI_b-TW{>b#@}^SG!t<$?zRI3CegRQDY}dzwY63mL%)3*(rdn; zsJ8A=;#@yL8%dJQi{a1LKWT)c^{>8JA2^85{&@W2opEr95MZ7ql;&fYDTHh3VU8_i z;~#I~z&RtKF;%REQ>)usWX?ew2a@$`P`%RaylDIhM-1eBQ6y?7zzLih26O{DCW)PB(=wn9VweORHvlOyBwz{QBOl9D>7U`x1{#gaPs}G-?E|6(IW{(TN3*00 zQIWqCeNL=ub-AP5#ruUWHSUH=CmYMKUa0zN0FRLe9*lR0qFCPaSFR`*c$Y*I3{Gqm z9rG=5&>=QSJNrTg91@-!D7tNhe^|g;_{xg1Z`@BPH15}Q9qK&b(P~gcq&tg-rTHqv zp1|==l3J`g!QV(7cktowHfp|%kk3U`t!pm_veIEmlNOQBzO0VP=f5sAAbi(PWvrNG zZmOD{L+wpnIjG9ZJL|bb5(U!!6!`w+KL1g3{=tzeb$D|x%dt>fJv9rzaTaT35z(1O zj>DQkTd!(4ee@>ESJ$TU69!i@Jz{CMzSb9JQ;9rEMt1e@f-nCHB!5%%^)it^`)e?T6fEb-N{>S`=x+rCvs_{h5?QjG6__T z$zag2P`k-yuIIuO!Z5`mOKUaR0HcSmIe$x(yRZ8G_S%MvP^Wwu)$%=yYx`*#A-&sR z_kp#i&?mELYiiu+8KllVja0k*?xS`elo0t8q7&QUAs^e;v8Cm3iBF^7juGOv=>x#- zI7^8Vu(*s!EsL7dLN{;vZ05p}4ocuYD z?@&JIBnlpgk(q^f5GHuzFcG~o$t~Wa>D(d?v;N-YUe!Fj!TYBO*~U@PzL0zN}N$|M!_UT^6me zAGQ+%MPr~y=nhX0cPttf;Df=qd%EvbMo=hsB-R%U|Gz2G+HRq7$?<6kU>`3q`1_X} zZTz}Pm%afQfGb-Q1OdvKNoSoHj2Tretz9GLfQPE^7k$>hY-rI__@naG;U*8>*F{+_ z=JzH?!W}EG1)CSs*4i%xcFfe@rUlBX-R+O-wFNs@aZfi!Yn8!2qbXogF3& GtNj-sp4gcH delta 2059 zcmai#c{tnY7RO7AG*lBirGAxmY8n+{pIRCvN=-GYmMXbYskF6kCD94#PlYfQstvTYpA4eUoVdeaK4)xI)J&!b7I@ef(%tq&M;^`t3TRJ zy&F>a;_X6yzfaaBL*I<_v4o>I4Tp$m0M{vhwdzd?0({r~Nc^Gc6e7^fGgG(G;Ahxz z>=v%E>W#_n5roH~L2NIfHBlcz&^%_a`^j0`Y;l@O;03+6bbdHA2s=F^Pp1KW^y%_| zbLteEB$5VX!O_Hlu`SI3=&HEtI~a~E9mWg#;SARFwr8o=TD(I5OkS^jc*#%2Y;lFa zI|)1Js1ata&ixbgAKdW~wyd_}Av;COO|mr8Cd8+i)>?o9pfvs3_K4oZ!_&fG1l3jU zA{daN6~HG~!2KtyS$Mrk2t|#F)o3MqAriE^m{?1cb$C;)l}E0Y;9*?X!Zx;XsQ2yF zVFQj4eR}RJ2YW=Io}O99s6^Y>KQcwxh5Kk9JD*NMTnhpXY_30tSJ#)uJ78c75KWhi za439wBLVRNI`lqk1}=kn2&Z=AN;1NA94_$R{&Q(S55(UBFH2gTJtDx;B~XUG0s&L% z`V0Ib(9yyQ1AUKO^&PgBs1l=6<&Jo4560PyK$_i*gHuSx__HbpjP3N9^I%C{z)5Yf zwG_!{B>NtBpG4k78URHmTLx}Dfmijfv7-dGo7CXf&)&)T#chtTqpMnPPIsCj?~W!1 zsq9wDZ|yMHx!zjqSg>B!?t)}$FXLPp{b>jEBpMuUC4nTdcG{i@!+<>vYxk9-SX`G9 z=0Nh@A9zp(V{os$tUJd^TGH=8-@Rs3MDYE;Ydg$Yzl%RkYWzZf!t#lul0-UbgAhq^ zAPqGhp)z)OJF)$PM z`phi}Yif@bt}%>!m;Rd2dR8C8@#x7c5|AY*TBcU;+PmN^|3P(#q%61S)O8@O;3?eU3pEun~_Yqee6Pncn9sI8tcL}j-9`h7+3q$l9Boz!n8u4r7&{zc7` zTGs7!S4n8hOZm*ZBP)4dMg)GAGxXZ7h!g1@(_JNd|M5QAi`llZxR*wp33}G(e!kbK z<>;ff*tb_ch3&?9{xlWIWH*^9_t1IL%ekm>J#u;UGVhg8crKUmbzL_8IQI1%!r#q+ z28ye@C@zA#&x^Vfq;N2Y03DSSs=^jv$PW|5;GNOsv6MI)@%)c13xzW=(Kpq3K}r*^ zxIvLklnX}MF365s zvjKWZA^9>0E1PZDsMo6vtr=8?((;^OsHMdprR)<}{~aGs<5y3ZKcLFpzr<0NNncvw zcHEeNk3)X17nol-sX%yj?gAx2Il+iMduO{|x_0@+;C>0gVy9vlJE;P6&2DpBx%;@3 zur-O_g)#~UH7AyRQ}{2g-tG$WT_SEDz*L?gdPHR8p9SN%;T9EePKaZkqsoCQ+jGA$ z7GCf9J2hFuY>is?hdJHz&n?sMhiCa$U@@IfZ!NBWaq(LRMWTTpnsRmsl|{DUP5#fa z=5t6Yh-;~@{M{5_6s*wS{0Q*Z;_7g*QPli`xz-VOZE3>d*X7R6oBJmlcgFZDEUGAl zx3oInHr~vi^7ST$sYezx_bBD58k81WFtF}a(MEn+ypvs=lS~P?FkSQa($d7YhlNeji}?G?L*0Oae&dt>ll_3iYWHLYIV)iVV5kP+Tb!bpn!ItF$)ZU9c@=<;TZAr2Gw# z8LJ;rs&$mA^Gx-uP>kYxXKnAWHeLm!HU%kPSH!b&YPj!yz8d_X_U=m0yl70+V*Brm z(JOieA#&<@6CRwkAfmKYPXsil!EVEunX{GcdTVrWn_ z39vE&fW1H2SM|4M_}P6hP~f*B^3^MXKb^DJ^GeoC${Gbm4^Y}IzAb4d@{@GW>oXH) zp*h;I&k?q`_e*IfpN_gacdpjs4N^-V8;)z{_7p@Fa+7O^o%tW7cqZ=0bKV@3g(*OVf diff --git a/results/reaper/plots/all/heatmap.pgf b/results/reaper/plots/all/heatmap.pgf index 654a309d2f..043dc07334 100644 --- a/results/reaper/plots/all/heatmap.pgf +++ b/results/reaper/plots/all/heatmap.pgf @@ -4384,55 +4384,55 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.297306in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1018}}% +\pgftext[x=2.297306in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1017}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.623935in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1535}}% +\pgftext[x=2.623935in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1534}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.950564in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1018}}% +\pgftext[x=2.950564in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1017}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.277193in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1535}}% +\pgftext[x=3.277193in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1534}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.603822in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1023}}% +\pgftext[x=3.603822in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1022}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.930452in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1023}}% +\pgftext[x=3.930452in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1022}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.257081in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1024}}% +\pgftext[x=4.257081in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1023}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.583710in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1042}}% +\pgftext[x=4.583710in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1041}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.910339in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1025}}% +\pgftext[x=4.910339in,y=3.012667in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1024}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% @@ -4444,55 +4444,55 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.297306in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1044}}% +\pgftext[x=2.297306in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1043}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.623935in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1517}}% +\pgftext[x=2.623935in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1516}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=2.950564in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1044}}% +\pgftext[x=2.950564in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1043}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{1.000000,1.000000,1.000000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.277193in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1517}}% +\pgftext[x=3.277193in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1516}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.603822in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1049}}% +\pgftext[x=3.603822in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1048}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=3.930452in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1049}}% +\pgftext[x=3.930452in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1048}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.257081in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1050}}% +\pgftext[x=4.257081in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1049}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.583710in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1068}}% +\pgftext[x=4.583710in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1067}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=4.910339in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1052}}% +\pgftext[x=4.910339in,y=2.714000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1051}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% @@ -4564,13 +4564,13 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.236968in,y=2.415333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1243}}% +\pgftext[x=5.236968in,y=2.415333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1242}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.563597in,y=2.415333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1266}}% +\pgftext[x=5.563597in,y=2.415333in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1265}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% @@ -4714,13 +4714,13 @@ \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.236968in,y=1.818000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1026}}% +\pgftext[x=5.236968in,y=1.818000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1025}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% \pgfsetstrokecolor{textcolor}% \pgfsetfillcolor{textcolor}% -\pgftext[x=5.563597in,y=1.818000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1053}}% +\pgftext[x=5.563597in,y=1.818000in,,]{\color{textcolor}{\rmfamily\fontsize{6.000000}{7.200000}\selectfont\catcode`\^=\active\def^{\ifmmode\sp\else\^{}\fi}\catcode`\%=\active\def%{\%}1052}}% \end{pgfscope}% \begin{pgfscope}% \definecolor{textcolor}{rgb}{0.150000,0.150000,0.150000}% diff --git a/results/reaper/plots/git/cost_with_manual.pdf b/results/reaper/plots/git/cost_with_manual.pdf index 084acb7a76417818cd468e256310c239717cb349..bf952e63563247648e750b9914e6bd3321a5c3f6 100644 GIT binary patch delta 106 zcmbQ!%QUB#X~Ww(c1t4z6JrC5$zSTOz}TD5*I#FKHgz&}Gjuj}voLluaWQc;G;}ew YG%_)E1qnMEI9b>!*bq`O`DN>70PFZ4F8}}l delta 106 zcmbQ!%QUB#X~Ww(c2h$WBNJo8$zSTOz}TD5*I#FKHnVgzGc~p_HaBoJvM_ToH8nIc aH#Tx~G`2LbFfcTBv{SGlq-65T*3AINzaB{d diff --git a/results/reaper/plots/git/cost_without_manual.pdf b/results/reaper/plots/git/cost_without_manual.pdf index 7a0efec7f1ad51a057b9a63853bf2f0f8f53dc9c..e9d72225c04556ec2586b122af681af2d161d1b9 100644 GIT binary patch delta 106 zcmdnh#k8x7X~V=?c1t4z6JrDO$unxNz}TCM>#ndmyP6r9Iy*WWn;N=Wx>%Syxw)8` ayE>Yi8aWwSIJ-F++bP%(QZl)#Wdi`LLLNi_ delta 106 zcmdnh#k8x7X~V=?c2h$WBNJo8$unxNz}TCM>#ndmn^`)VnHpOdn;W%Syxw)8` ayE>Yi8aWwSIJ-F++bP%(QZm`EcNYM}{~lZb delta 106 zcmeB}!_+Z{X~Uy7c2h$WBNJo8$uHZkz}TCQw7au9n^`)VnHpOdn;W6mYm5ZFEOiU2vU+)J&+&^bQnrHWd~ zH^ljsQTZY~8XSc=OQ-y5CK{CsM`h;)^N2thsmZ0Iy3g+l219zRJ2M4?P>&K})*7>E7J?1vq`+dMkt`m8Q^R-a4_HAvY0wikj zd$VmX4clf#wN}EXA)OfkIz+{i=us;Jue0~Q7lu_pVywZhaQ*GzM7wQ?W;&TpJPJBH zaddwh#VWQl8j9g4#B*JYa`R@=t8vzLnmsI_VdJF50C1dD1#kMcU|y_nKYtX(=owx^ zV+Z1kBaUZ{^EWGs>CW@dXT7pzqOE*Do0<$6%iG(haCEcuS?ZDUJVeQcRY8G0R z-FbqGNouVze1NML=eSbw(YSD}5mwg16}8RaYAcO!EpKn`A9kC^Z&&NhUUbn?8C_OB zKi*E3fkdL<7M470XUV0O`s!LNIfMcrj&S@|rodXF>` zX22Vb)e^U-}CBl+AW~d)Q!$7RuzZ^5kK`K@V&a z1Q>NNio*awFU}F9;-e8TOmb04B?M9141%^&K=A%5F!*t`Z4Q|{huiy`y(FTcGKs8w z6&{_fNUt$Chw}`M2d5N-13$oxrV)6n!+gq4ylV76jyIZL3bR27b$JIlGB7kVFgcUG zfz$^%GB7kVFgdfBg4hL6HbOEuH8D0ZMKm-vMKm-pGeb2uHbyo?H84dvMK(DxJ|H|c zLNYitF*Y$pG&D9vG&C?XLp3)xMm9t>Fhw~_yI*A2DOtsi603xH3}sqMNdWw6; z<`4jzfEzuBla|x26M2dAwNSM7ZEd9jBx>Ef?of!c-M8%TmQ7Z$l zv-iFiwyS{DfOB)a9h_))EzwLT(}_nxXD5#CZ=+bnc1A-n9EEtUi&1V~OnNncPTEeh zh4rhxanfP{IL@kqH+@?$FIKpyMlpJZ*U;F3_~MAuS>yc8iek3&{Nq`#Y?){)pUj)EPc{4b5uLcu&(RD3ipTx*1twQxmk zGq~DHBV5bdoBM~|=JDIrdb1aQU9?n2mzB?tx059xktjGu9i|mFCmO{W(M)_SQLvb= z3Rj6}qHUUJS1AyEdHn_X-JgR!d;0BwL6}%5lFZ9zNmk9T5_m>ahnrI~fY*z2c&Yek zcn0?jPSt`Jwavh5D>Y}}ci+x2;%CV1@gR87LK$9GJ`1m2_Lz{TdSn3*)%DichL=K-E9M^1oB|8fM@$$56t9A_dunr3(@Uf04I zwaxHsD+Qo`-6Fl^`|t|NK7LVo8DLgEKY!Lr{S#n9QLZHn7rtJcBTL0cGsARBYhH_4 z)HcJctrVDDbYt-AUSv^!cNtk$K8vj0BaMU^a0=XUHDK0@b7radXl7mwuazw%+Gd!w zmD+c{!ailQ-QFHH*rJ6pxvV^SSa8q-n*;$y9gN~IK+ubG1gZFF1Pqg0R8k2+)HZ{l ztrQTvzX}X~Ty2{(CePva{$?+UXsApgD_@02XDiZc49?*^gX6&$DFxxY4{)Pt1m5Z} zpRyBg8vPIGsG35vM+kO#2Q@J?GBh(Xlf;442Q@J?GBh(Xv!8<41yVyqGchwVG&wdn zIYve@I5I*-IXOl}IW#jfMMXw4Loz-fJVQh?F*7nWIW{;sMn*C?GD1Z;IYvb}G&3_r zMMg72GCo}jFHB`_XLM*FI5Z$2lVO7>QWeU(4S+BdLs2^r2;cA%6J!b2U$nwk^+{J0+1yEHl*h-`r5-QntKxA3)N#x0LLN7aN|1Ft-eS#r zJXaVzZYMoHvM%%ZSYHi~3&AK@X2dcc7oaFORmI~S)~v?|3WLY_j=&a#q|sK!Uk#`u?kyZrY=@813Dy*ly_wO+;qrssL`hDFuAag z2A6H6BXg^=r;s{d4#jXq!MR&b4AXqq+lefSb{U_&8fp!2Q|%C z=uwF+b&RdfoFZ3AW5s9O{ZsXS1(*_Gs8y;CR|(i8TV0<@eCZ>6B_@>^%bTB95V>Zl z^$9!kvuD*gY@K@TnI(~HSLTRTsEKloVcc*3Vq82N+REqS?&_cI)9u6kWMwllIxB6) zR`lK&AGJuvsS;SL5O5spDj{5QJQgEfgaaqh9ISERN~2Q{OZ%(AO5Nsv$5S>vo&t;l zYej$UXNUocW^!!NhDyuOjO@IM3&2vBLw;VBN-wGojr&14i(k+{CEd)JIL3#v7`s@F zT0mn8gTf*c4bU(c6kyOhh1KDHQhZUHF#}4Xff{!Se_YvopBWvN$6yujN7qp|Gg^&7 zj*aM%U?a_DZ$x&8jcRE6X8G=oTUl`79qmoisR#D zKP9a_Jdf*qnBoQe+>@M}m&U3064SOB8&<zMvFIUWEY~|M{if=@miadUxeK+|IMir}zFMa%PA}_sTKV`hRT=7m_qR{sU}WuUf|--hfvv-% z(4qFtENNA8--IqEskO%N0bRW~rz;hoOc(A_!pd57MYI{Z+D;?7*0(qJ4~O03_b-3j z-BIeIrZRO|`}}-cEWeM8f@9QS)^2k~qc~$U6Q9Z`SS$yHtHfx6HqB_)DKPr_>MQbh ze-8HS>8EE*!bC%n$-I4*$*Sc`LY~poVd`fF%}=`srY2hu%ObK*WxUq&2ZLs3Y?RN2NX|$ zQ{axP0cX89=PVVU%$bMbwW@^#ZHBY9Q~OF)$WwOv{q6H6ThvfyE^FU}M?D+TBL=H5 zx{(E^6of+@!1TrlywzbAZzocNDWahDg*Nq=~8wakF=!hT)ISM5uMNdWw5%bxU delta 2084 zcmV+<2;29Tk^+#D0+1yFFd&nTBqxzh4+9o&^pRj;e}MSk!%cJVzn$PCVt*o^1K3r> zy(6n0+JE0C-=nI1bHhl`-tjkCU6a-3m?797f4w2EzTaH`^6P7qhaYnDm>DMpMI}}f z;ixj!$Y3TaXG~ccrTa`OfC|B(5%&mXX@W2^9=!35t&QK*reHJKrHX z+W%h*f2tVc1{J>{o1nJS+`&i9DLSLhXu>rGWe|AsGx-Q^YebjHpwZ;_?l1odSqJa>#?#bzE+lk1Gi9MgTf`nf4M5&?yzRvJy00@EvNiFwk~yeL0=7z zb5K+%rTH=*=O8FU@ERWPux33zP#8R}r#wEkF7E)~ZP%W>*aA?42Ffd|H?* zY+OFMd5+D?GQ+XLXXgyYQDB+?r{<+8LkqR;u?iVOrY;Qn_xtU`;jr62ov(!uXLq~9 z&F*{+XOGSI?Zac+a{Xod^l6mvwRHq%h64S5?649t7uS(tE{yiSAd^@NxsO`e*)ZW zbS1hX)+AkRmr8W;BXmWBN_1td73p$}f@X3NwydUJM;*E%*fd{lpGt&@V}wPMii~B= z^(f=QP!2{f!WkEW8d+(IC18`Bb$u#vCXaBIm{j5{Z?4Fhm6RKaDwg2PdUNV9)!CBF0#z7ms4jOESGD~MdP z)cS;-`PsAT9JWrq_RNyVwJUQ(E7U}}#xU-;e=!gbhqm(hxV!pi`*izoKUvv~jLu4% zu@${H#z!rZ0aXHP6~Y~0T_uD|j>lrei*Vp1nu9gqpfoxKv9!M$tki9Oe>`Q=<0+0& zV6Et{{R}ajqM3j#+E8g3nvtDXf#6u`0?*H@Qt3t2p@AQiv-kxKRMO3i2{1mC#n{Da z)N(YYFeofC(E!Z{gW?$UPGNPppA=uzX3TIU(Ljy6gg>rqzR!#f%VTa8^rP#jn;EUf zAjighuvlA3%+?1CrqbF&f3?DK&m$;*&gHKj^OWH1J`G0)fc*I3ac3ywVMVgI;`n&k zPf2SJ&*M5Drg-6g?nyN3g>jlNhd!g4`6qh$&`Q$kLz9mAAqj!eiC5GLP&r7gMb9}H z1gWA{GC7!#skC~KI{ySOSwS^3FIzzc(>^v#!yiH~9)i6|0NyeEe_Z-n?g6U3!lt zP`~|>Q4b+%csn6T_ct9WyOQj$0A<@M~l)e;lM5BXK5e{a{qh)vvqaBDZPB{BC&flykf7TK&Km7Dy>jbTQ`kAT> z<-q&fr*JN^_9em0LFmBN;YsLF`(~E3DyeTm7n9UlV_-m6FV5*o#V6B+yOgl97F`i- zhOV~Lh_3bR&Hck+_xSzGc6XGzsHsd{);>Sq7EA9Vquep-Flo0rqfwkOnu$+klv}I@ zg{#D9f;P=)f7dB6`ugfC@^^pE?b*{$&zOXXh9Z-B`z(`HtCxg4qp8Ex&kV@x#W{JY z_+;`7W(`i&A}^xNkk@uIoO70nPv*?SK&@&a zL7U;MH|^BEQ5Eu(-F|=jyvY_dl$p!gH{nswhV+QRDvWMq!70VV84kzv#t6LCVHR&E z-X8f6W!Eg!v+)OZc?UHyG%_?ZGLvqB)CV;&G%_?ZGP6m7*ac8SL^ClnGBi0hI5|c} zGB`3qML9V}ML9GxGet#4Gea^yAUs1vGchwVG&wdnIYve@I5I*-IXOl}IW#jfMMXw4 zLoz;H3NK7$ZfA68AUHOYafmEZ%Mn086hzVPVT}Lyg&+-EkqAWDNJ|8gkcKMyEl%BD zG=R^+d&wjSc-&AaDG_ZuNhC@uo%E7RAtl3Wzl!r}t+_qcMg|#W;=X|Ag&&?=2!oUE Oh#&|u3MC~)PeuwHMEVv0 diff --git a/results/reaper/plots/tools/cost_without_manual.pgf b/results/reaper/plots/tools/cost_without_manual.pgf index daba3a3738..d23f88595c 100644 --- a/results/reaper/plots/tools/cost_without_manual.pgf +++ b/results/reaper/plots/tools/cost_without_manual.pgf @@ -506,9 +506,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{3.000000pt}{3.000000pt}}{3.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.737695in}}% -\pgfpathlineto{\pgfqpoint{4.125321in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.125321in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.740087in}}% +\pgfpathlineto{\pgfqpoint{4.146098in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.146098in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% @@ -521,9 +521,9 @@ \pgfsetstrokecolor{currentstroke}% \pgfsetstrokeopacity{0.800000}% \pgfsetdash{{11.100000pt}{4.800000pt}}{0.000000pt}% -\pgfpathmoveto{\pgfqpoint{1.002051in}{3.749656in}}% -\pgfpathlineto{\pgfqpoint{4.091700in}{0.539691in}}% -\pgfpathlineto{\pgfqpoint{4.091700in}{0.539691in}}% +\pgfpathmoveto{\pgfqpoint{1.002051in}{3.752049in}}% +\pgfpathlineto{\pgfqpoint{4.111979in}{0.539691in}}% +\pgfpathlineto{\pgfqpoint{4.111979in}{0.539691in}}% \pgfusepath{stroke}% \end{pgfscope}% \begin{pgfscope}% diff --git a/results/reaper/plots/tools/heatmap.pdf b/results/reaper/plots/tools/heatmap.pdf index f7e469fc7c16eedd7856be0b32eb7bf1b562d557..cabc8121e65b8c47f83447e842ff43718b39e1e1 100644 GIT binary patch delta 1337 zcmV-91;+ZDqXL|x0+1#FIFs>^D6vmZ2!G+qgKM5L9$Q(+i#pTO4%6=+Lj%b&*g$XB z;({^)ryaP*T4s&|_RNhc&q!HGu9)xg|Is^K$Iyi+DL&@?*(&X_f7z%9Zos!2n%7njQDZ@!a-_dH-Qzlf}RDaO% z>s)2CAe(Guk^U^?U@XF}8cTsb5w(J~9MeOlfxaZsJc*%)7_sUuv_w?YJ^tdDf=%gB z5)JSx63vq6B+?5WljV#}CXe}afs~Xi2!E77BmA;J^CXr%m`EAjE+#_m-*CrkdtRx- zHrxq*dBZ)P)afIgT-$IbpyY-dAAf)HuBrF5qZAq~b6KHT664xetQmDlA|mP@qZZ7| z!#dFjzbw%_iM38dB#nJK54y*v6^lCKq3=Obm-Wd~#x9+O++otfF|EQ; z@{I7y`plCU1hS^+(|Oj&r-`ULB(fG(-0m=m2KW_;W=X8fV|mI*A0p)DrGN6U%#L?O z;xF*pw^Sb2>+e_ePZKsf+k~;-_{HmQo9r~B4V3GbTWJh0d;a4Z10(~Ot zR{G--x(fZvdVG=oJmgUQ@AZ{NlJZ zs89a9#C;xeAYb0y5INGb!haL!TLHf9E72doR_M<{4)nP%n|_ufHvK&6(jY-ViG(L z@GBC{l2}>Z!MGXr0D2yMbVXre`_;{BYL{x;D)M_ zjVEA5(Z_T8MSt3QPfsu@(edG$qFZotZv7EGJzhWKN>mbk0xOF?oYRZG-qRCIQgn2< zqUaj7W}F*$L{Ha3ZG9YgUGxO3DEfHLc(rv+^aPU<9UtzQ%gbUrTVmtiX8FGRJjU+# z2R^=kIK;QH$BPi&u=t05TN#-5r3*Cw1~dX#V+v(%WU~|vUwsETGB7kVFgTNXiqr== zGB7kVFgUYSi%JDUH9|E;F+(**I5S2xL^MG$F+?>vGBh(qLN!J)K`=r%J|H|bLN!J) zLp4S?Ge$H-G(j;jL^U}wG&4m)HAXQ(FhV$!;*dlSL?9O@mnR8vI4T!;$VwuUHIX_j v?lK6A3T19&b98cLVQmU!Ze(v_Y6^37VRCeMa%E-;Gd4LhGzujpMNdWwEWLju delta 1310 zcmV+(1>yRfqXL_w0+1#FHP$~NOuv5&4J6B81HD~~ z3(5$bcHkasnK=&FGdIeV2hBV|JZ7?xdxlK>1#IG=elemisxwPr=oiwIN6kECJZiF# zJJg9+4?;LfodJDW9h}07p=9|YY4Ug#3qc@oPWOr(r%7ZV}(Z@A;NJ+IVZ z8}0hzILu5GvzP;$eKkAFXT*VKF3Q3{QgxvbDEiE-^K){MF&5fOEdQ48kf zVV!7%UzTW|#9AjJlEyxr2i@b-ip3|64-%+HU(pAr(DxvzRoSNJDPxz;LhdkW;h0w8 zD0xQsWqsyJ3<6nO^yxfng^?Pv$j)6P|2MFK7Q3sp$`4aRIo^Y7P6zSmM*^JInoo* z_4LOjbQSuS_4p$FdB~yq!mjNC3iPR{o9Pe6T!sB;Uqem%rA~x zgZkvpOWfxn2lD0J4Ur=~D}OwJz7^oxz7qWbY=!oZGY>kYAzLPXHrH^dGSXuLtSsLw2g%N-=mI7=={ zgHsr9eAu;#xu8xSvci_`76?hUV|imV=-xxopRruPPbaWo&Si%a-8g;)kv^Sd|5|G`w!QrJESf)lINimMrpjZX zluq-CzzDx z_;5|pVMA-cRs0d68w<0EsU-RYRu+9YXLw#>UGxc)6dfI|D7q5yZ*2x~L{C>7+)!1r z@dT_W`gl&iNPk=J=?Nw!IzC)ebPI0Itv{lt$LnWYiAthRU}e#Vb9&L&dwPONijEFf z6kWsCjC13T=;>Oht&an*i=KcLMIX-@uePp